X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=blobdiff_plain;f=fonts.conf.in;h=a17c01eeba07a95e55894376da49301716bd72ea;hp=47a2cbb381613136f9318fbbea9b2ce163004106;hb=a53553b4b65d6230b1a91b1a7433c8c5852ab055;hpb=9cc935765e6f74a1712b04b6cbcfc5e77d1d38e1

diff --git a/fonts.conf.in b/fonts.conf.in
index 47a2cbb..a17c01e 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -1,38 +1,32 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts.conf file to configure system font access -->
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
 <fontconfig>
 
 <!--
+	DO NOT EDIT THIS FILE.
+	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+	LOCAL CHANGES BELONG IN 'local.conf'.
+
 	The intent of this standard configuration file is to be adequate for
 	most environments.  If you have a reasonably normal environment and
 	have found problems with this configuration, they are probably
-	things that others will also want fixed.  Please send any suggested
-	changes to fonts@xfree86.org so that future releases can include
-	such changes.
+	things that others will also want fixed.  Please submit any
+	problems to the fontconfig bugzilla system located at fontconfig.org
+
+	Note that the normal 'make install' procedure for fontconfig is to
+	replace any existing fonts.conf file with the new version.  Place
+	any local customizations in local.conf which this file references.
 
 	Keith Packard
 -->
 
-<!-- FONTPATH_START -->
-
-<!-- 
-  Common X11R6 font directories
--->
+<!-- Font directory list -->
 
-	<dir>/usr/X11R6/lib/X11/fonts</dir>
- 	<dir>/usr/share/fonts</dir>
+	<dir>@FC_DEFAULT_FONTS@</dir>
+	@FC_FONTPATH@
 	<dir>~/.fonts</dir>
 
-<!-- FONTPATH_END -->
-
-<!--
-  Enable sub-pixel rendering
-	<match target="font">
-		<edit name="rgba" mode="assign"><const>rgb</const></edit>
-	</match>
--->
-
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 -->
@@ -69,172 +63,15 @@
 		</edit>
 	</match>
 
-<!--
-  Mark common families with their generics so we'll get
-  something reasonable
--->
-
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>Times</family>
-		<family>Times New Roman</family>
-		<family>Nimbus Roman No9 L</family>
-		<family>Luxi Serif</family>
-		<family>Kochi Mincho</family>
-		<family>AR PL SungtiL GB</family>
-		<family>AR PL Mingti2L Big5</family>
-		<family>Baekmuk Batang</family>			
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Helvetica</family>
-		<family>Arial</family>
-		<family>Verdana</family>
-		<family>Nimbus Sans L</family>
-		<family>Luxi Sans</family>
-		<family>Kochi Gothic</family>
-		<family>AR PL KaitiM GB</family>
-		<family>AR PL KaitiM Big5</family>
-		<family>Baekmuk Dotum</family>
-		<family>SimSun</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
- 	<alias>
-		<family>Courier</family>
-		<family>Courier New</family>
-		<family>Andale Mono</family>
-		<family>Luxi Mono</family>
-		<family>Nimbus Mono L</family>
-		<family>NSimSun</family>
-		<default><family>monospace</family></default>
-	</alias>
-<!--
-  If the font still has no generic name, add sans-serif
- -->
-	<match target="pattern">
-		<test qual="all" name="family" compare="not_eq">
-			<string>sans-serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>monospace</string>
-		</test>
-		<edit name="family" mode="append_last">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-	
-<!--
-  Load per-user customization file
--->
-	<include ignore_missing="yes">~/.fonts.conf</include>
-
 <!--
   Load local system customization file
 -->
-	<include ignore_missing="yes">local.conf</include>
+	<include ignore_missing="yes">conf.d</include>
 
-<!--
-  Alias well known font names to available TrueType fonts
--->
-	<alias>
-		<family>Times</family>
-		<accept><family>Times New Roman</family></accept>
-	</alias>
-	<alias>
-		<family>Helvetica</family>
-		<accept><family>Verdana</family></accept>
-	</alias>
-	<alias>
-		<family>Arial</family>
-		<accept><family>Verdana</family></accept>
-	</alias>
-	<alias>
-		<family>Courier</family>
-		<accept><family>Courier New</family></accept>
-	</alias>
+<!-- Font cache directory list -->
 
-<!--
-  Provide required aliases for standard names
--->
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Times New Roman</family>
-			<family>Nimbus Roman No9 L</family>
-			<family>Luxi Serif</family>
-			<family>Times</family>
-			<family>Kochi Mincho</family>
-			<family>AR PL SungtiL GB</family>
-			<family>AR PL Mingti2L Big5</family>
-			<family>Baekmuk Batang</family>			
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Verdana</family>
-			<family>Nimbus Sans L</family>
-			<family>Luxi Sans</family>
-			<family>Arial</family>
-			<family>Helvetica</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>AR PL KaitiM Big5</family>
-			<family>Baekmuk Dotum</family>
-			<family>SimSun</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Andale Mono</family>
-			<family>Courier New</family>
-			<family>Luxi Mono</family>
-			<family>Nimbus Mono L</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>Baekmuk Dotum</family>
-		</prefer>
-	</alias>
-
-<!-- 
- Artificial oblique for fonts without an italic or oblique version
- -->
- 
-	<match target="font">
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-	</match>
+	<cachedir>@FC_CACHEDIR@</cachedir>
+	<cachedir>~/.fontconfig</cachedir>
 
 	<config>
 <!--
@@ -244,11 +81,21 @@
  -->
 		<blank>
 			<int>0x0020</int>	<!-- SPACE -->
-			<int>0x00a0</int>	<!-- NO-BREAK SPACE -->
-			<int>0x00ad</int>	<!-- SOFT HYPHEN -->
-			<int>0x115f</int>	<!-- HANGUL CHOSEONG FILLER -->
+			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
+			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
+			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
+			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
+			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
+			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
+			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
+			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
+			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
+			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
 			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
 			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
+			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
+			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
+			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
 			<int>0x2000</int>	<!-- EN QUAD -->
 			<int>0x2001</int>	<!-- EM QUAD -->
 			<int>0x2002</int>	<!-- EN SPACE -->
@@ -259,32 +106,39 @@
 			<int>0x2007</int>	<!-- FIGURE SPACE -->
 			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
 			<int>0x2009</int>	<!-- THIN SPACE -->
-			<int>0x200a</int>	<!-- HAIR SPACE -->
-			<int>0x200b</int>	<!-- ZERO WIDTH SPACE -->
-			<int>0x200c</int>	<!-- ZERO WIDTH NON-JOINER -->
-			<int>0x200d</int>	<!-- ZERO WIDTH JOINER -->
-			<int>0x200e</int>	<!-- LEFT-TO-RIGHT MARK -->
-			<int>0x200f</int>	<!-- RIGHT-TO-LEFT MARK -->
+			<int>0x200A</int>	<!-- HAIR SPACE -->
+			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
+			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
+			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
+			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
+			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
 			<int>0x2028</int>	<!-- LINE SEPARATOR -->
 			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
-			<int>0x202a</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
-			<int>0x202b</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
-			<int>0x202c</int>	<!-- POP DIRECTIONAL FORMATTING -->
-			<int>0x202d</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
-			<int>0x202e</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
-			<int>0x202f</int>	<!-- NARROW NO-BREAK SPACE -->
-			<int>0x205f</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
+			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
+			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
+			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
+			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
+			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
+			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
+			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
 			<int>0x2060</int>	<!-- WORD JOINER -->
 			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
 			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
 			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
+			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
+			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
+			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
+			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
+			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
+			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
 			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
 			<int>0x3164</int>	<!-- HANGUL FILLER -->
-			<int>0xfeff</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
-			<int>0xffa0</int>	<!-- HALFWIDTH HANGUL FILLER -->
-			<int>0xfff9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
-			<int>0xfffa</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
-			<int>0xfffa</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
+			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
+			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
+			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
+			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
+			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
 		</blank>
 <!--
   Rescan configuration every 30 seconds when FcFontSetList is called