X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fonts.conf.in;h=b8855ba9308264aea863fae5378e127b70a3f19f;hb=7295c6f5faa595422e0825aa2e91883147d5b50e;hp=446c0a09b1a4b88a8d8441dbe257dbbef3dc6764;hpb=46a10637cde656967b60f1e028b24763022358bb;p=fontconfig.git

diff --git a/fonts.conf.in b/fonts.conf.in
index 446c0a0..b8855ba 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -27,6 +27,11 @@
 	@FC_FONTPATH@
 	<dir>~/.fonts</dir>
 
+<!-- Font cache directory list -->
+
+	<cachedir>@FC_CACHEDIR@</cachedir>
+	<cachedir>~/.fontconfig</cachedir>
+
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 -->
@@ -73,15 +78,19 @@
  -->
 	<alias>
 		<family>Bitstream Vera Serif</family>
-		<family>Times</family>
+		<family>DejaVu Serif</family>
 		<family>Times New Roman</family>
+		<family>Thorndale AMT</family>
+		<family>Times</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>ＭＳ 明朝</family>
 		<family>Baekmuk Batang</family>
 		<family>FreeSerif</family>
+		<family>MgOpen Canonica</family>
 		<default><family>serif</family></default>
 	</alias>
 <!--
@@ -89,17 +98,21 @@
  -->
 	<alias>
 		<family>Bitstream Vera Sans</family>
+		<family>DejaVu Sans</family>
 		<family>Helvetica</family>
 		<family>Arial</family>
 		<family>Verdana</family>
+		<family>Albany AMT</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>ＭＳ ゴシック</family>
 		<family>Baekmuk Dotum</family>
 		<family>SimSun</family>
 		<family>FreeSans</family>
+		<family>MgOpen Modata</family>
 		<default><family>sans-serif</family></default>
 	</alias>
 <!--
@@ -107,10 +120,12 @@
  -->
  	<alias>
 		<family>Bitstream Vera Sans Mono</family>
+		<family>DejaVu Sans Mono</family>
 		<family>Courier</family>
 		<family>Courier New</family>
 		<family>Andale Mono</family>
 		<family>Luxi Mono</family>
+		<family>Cumberland AMT</family>
 		<family>Nimbus Mono L</family>
 		<family>NSimSun</family>
 		<family>FreeMono</family>
@@ -134,6 +149,70 @@
 		</edit>
 	</match>
 
+<!--
+  URW provides metric and shape compatible fonts for these 10 Adobe families.
+  -->
+        <alias>
+          <family>Avant Garde</family>
+          <accept><family>URW Gothic L</family></accept>
+        </alias>
+        <alias>
+          <family>Bookman</family>
+          <accept><family>URW Bookman L</family></accept>
+        </alias>
+        <alias>
+	  <family>Courier</family>
+	  <accept><family>Nimbus Mono L</family></accept>
+	</alias>
+        <alias>
+	  <family>Helvetica</family>
+	  <accept><family>Nimbus Sans L</family></accept>
+	</alias>
+        <alias>
+          <family>New Century Schoolbook</family>
+          <accept><family>Century Schoolbook L</family></accept>
+        </alias>
+        <alias>
+          <family>Palatino</family>
+          <accept><family>URW Palladio L</family></accept>
+        </alias>
+        <alias>
+	  <family>Times</family>
+	  <accept><family>Nimbus Roman No9 L</family></accept>
+	</alias>
+        <alias>
+	  <family>Zapf Chancery</family>
+	  <accept><family>URW Chancery L</family></accept>
+	</alias>
+        <alias>
+	  <family>Zapf Dingbats</family>
+	  <accept><family>Dingbats</family></accept>
+	</alias>
+	<match target="pattern">
+	  <test name="family">
+	    <string>Symbol</string>
+	  </test>
+	  <edit name="family" mode="append" binding="strong">
+	    <string>Standard Symbols L</string>
+	  </edit>
+	</match>
+<!--
+ AMT provides metric and shape compatible fonts for these three web font
+ families.
+ -->
+ 	<alias>
+		<family>Times New Roman</family>
+		<accept><family>Thorndale AMT</family></accept>
+	</alias>
+ 	<alias>
+		<family>Arial</family>
+		<accept><family>Albany AMT</family></accept>
+	</alias>
+ 	<alias>
+		<family>Courier New</family>
+		<accept><family>Cumberland AMT</family></accept>
+	</alias>
+ 
 <!--
   Some Asian fonts misadvertise themselves as monospaced when
   in fact they are dual-spaced (half and full).  This makes
@@ -214,22 +293,6 @@
 	<include ignore_missing="yes">conf.d</include>
 	<include ignore_missing="yes">local.conf</include>
 
-<!--
-  Alias well known Type1 font names to metric equivalent TrueType fonts
--->
-	<alias>
-		<family>Times</family>
-		<accept><family>Times New Roman</family></accept>
-	</alias>
-	<alias>
-		<family>Helvetica</family>
-		<accept><family>Arial</family></accept>
-	</alias>
-	<alias>
-		<family>Courier</family>
-		<accept><family>Courier New</family></accept>
-	</alias>
-
 <!--
   Provide required aliases for standard names
 -->
@@ -237,49 +300,60 @@
 		<family>serif</family>
 		<prefer>
 			<family>Bitstream Vera Serif</family>
+			<family>DejaVu Serif</family>
 			<family>Times New Roman</family>
-			<family>Nimbus Roman No9 L</family>
+			<family>Thorndale AMT</family>
 			<family>Luxi Serif</family>
+			<family>Nimbus Roman No9 L</family>
 			<family>Times</family>
 			<family>Frank Ruehl</family>
+			<family>MgOpen Canonica</family>
+			<family>FreeSerif</family>
 			<family>Kochi Mincho</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
+			<family>ＭＳ 明朝</family>
 			<family>Baekmuk Batang</family>
-			<family>FreeSerif</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
 			<family>Bitstream Vera Sans</family>
+			<family>DejaVu Sans</family>
 			<family>Verdana</family>
-			<family>Nimbus Sans L</family>
-			<family>Luxi Sans</family>
 			<family>Arial</family>
+			<family>Albany AMT</family>
+			<family>Luxi Sans</family>
+			<family>Nimbus Sans L</family>
 			<family>Helvetica</family>
 			<family>Nachlieli</family>
+			<family>MgOpen Modata</family>
+			<family>FreeSans</family>
 			<family>Kochi Gothic</family>
 			<family>AR PL KaitiM GB</family>
 			<family>AR PL KaitiM Big5</family>
+			<family>ＭＳ ゴシック</family>
 			<family>Baekmuk Dotum</family>
 			<family>SimSun</family>
-			<family>FreeSans</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>monospace</family>
 		<prefer>
 			<family>Bitstream Vera Sans Mono</family>
+			<family>DejaVu Sans Mono</family>
 			<family>Andale Mono</family>
 			<family>Courier New</family>
+			<family>Cumberland AMT</family>
 			<family>Luxi Mono</family>
 			<family>Nimbus Mono L</family>
+			<family>Courier</family>
 			<family>Miriam Mono</family>
+			<family>FreeMono</family>
 			<family>Kochi Gothic</family>
 			<family>AR PL KaitiM GB</family>
 			<family>Baekmuk Dotum</family>
-			<family>FreeMono</family>
 		</prefer>
 	</alias>
 
@@ -309,6 +383,10 @@
 		<edit name="slant" mode="assign">
 			<const>oblique</const>
 		</edit>
+                <!-- and disable embedded bitmaps for artificial oblique -->
+                <edit name="embeddedbitmap" mode="assign">
+                        <bool>false</bool>
+                </edit>
 	</match>
 
 <!--
@@ -318,16 +396,26 @@
 	<match target="font">
 		<!-- check to see if the font is just regular -->
 		<test name="weight" compare="less_eq">
-			<int>100</int>
+			<const>medium</const>
 		</test>
 		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more_eq">
-			<int>200</int>
+		<test target="pattern" name="weight" compare="more">
+			<const>medium</const>
 		</test>
-		<!-- set the embolden flag -->
+		<!--
+		  set the embolden flag
+		  needed for applications using cairo, e.g. gucharmap, gedit, ...
+		-->
 		<edit name="embolden" mode="assign">
 			<bool>true</bool>
 		</edit>
+		<!--
+		 set weight to bold
+		 needed for applications using Xft directly, e.g. Firefox, ...
+		-->
+		<edit name="weight" mode="assign">
+			<const>bold</const>
+		</edit>
 	</match>
 
 
@@ -339,11 +427,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 -->
@@ -354,21 +452,21 @@
 			<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 -->
@@ -381,11 +479,11 @@
 			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
 			<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>0xfffb</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