Missing bits from previous patches.

[fontconfig.git] / fonts.conf.in

diff --git a/fonts.conf.in b/fonts.conf.in
index ef988eef5bffd4f44ac7a51746d1cad408185edf..2ff162ac8057f7fd61733877643401c0afca8ca0 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -72,6 +72,7 @@
   Serif faces
  -->
        <alias>
+               <family>DejaVu Serif</family>
                <family>Bitstream Vera Serif</family>
                <family>Times New Roman</family>
                <family>Thorndale AMT</family>
@@ -84,12 +85,14 @@
                <family>ＭＳ 明朝</family>
                <family>Baekmuk Batang</family>
                <family>FreeSerif</family>
+               <family>MgOpen Canonica</family>
                <default><family>serif</family></default>
        </alias>
 <!--
   Sans-serif faces
  -->
        <alias>
+               <family>DejaVu Sans</family>
                <family>Bitstream Vera Sans</family>
                <family>Helvetica</family>
                <family>Arial</family>
@@ -104,13 +107,14 @@
                <family>Baekmuk Dotum</family>
                <family>SimSun</family>
                <family>FreeSans</family>
+               <family>MgOpen Modata</family>
                <default><family>sans-serif</family></default>
        </alias>
 <!--
   Monospace faces
  -->
        <alias>
-               <family>Bitstream Vera Sans Mono</family>
+               <family>DejaVu Sans Mono</family>
                <family>Courier</family>
                <family>Courier New</family>
                <family>Andale Mono</family>
@@ -140,33 +144,24 @@
        </match>
 
 <!--
-  URW provides metric and shape compatible fonts for these 3 Adobe families
-  Mark these as effective replacements by binding the replacement
-  family names strongly
+  URW provides metric and shape compatible fonts for these 3 Adobe families.
   -->
-        <match target="pattern">
-         <test name="family"><string>Times</string></test>
-         <edit name="family" mode="append" binding="same">
-           <string>Nimbus Roman No9 L</string>
-         </edit>
-       </match>
-        <match target="pattern">
-         <test name="family"><string>Helvetica</string></test>
-         <edit name="family" mode="append" binding="same">
-           <string>Nimbus Sans L</string>
-         </edit>
-       </match>
-        <match target="pattern">
-         <test name="family"><string>Courier</string></test>
-         <edit name="family" mode="append" binding="same">
-           <string>Nimbus Mono L</string>
-         </edit>
-       </match>
+        <alias>
+         <family>Times</family>
+         <accept><family>Nimbus Roman No9 L</family></accept>
+       </alias>
+        <alias>
+         <family>Helvetica</family>
+         <accept><family>Nimbus Sans L</family></accept>
+       </alias>
+        <alias>
+         <family>Courier</family>
+         <accept><family>Nimbus Mono L</family></accept>
+       </alias>
 
 <!--
  AMT provides metric and shape compatible fonts for these three web font
- families.  Bind them weakly as matching here is not as important as
- with web fonts.
+ families.
  -->
        <alias>
                <family>Times New Roman</family>
@@ -267,6 +262,7 @@
        <alias>
                <family>serif</family>
                <prefer>
+                       <family>DejaVu Serif</family>
                        <family>Bitstream Vera Serif</family>
                        <family>Times New Roman</family>
                        <family>Thorndale AMT</family>
@@ -274,17 +270,19 @@
                        <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>DejaVu Sans</family>
                        <family>Bitstream Vera Sans</family>
                        <family>Verdana</family>
                        <family>Arial</family>
@@ -293,18 +291,20 @@
                        <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>DejaVu Sans Mono</family>
                        <family>Bitstream Vera Sans Mono</family>
                        <family>Andale Mono</family>
                        <family>Courier New</family>
@@ -313,10 +313,10 @@
                        <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>
 
@@ -346,6 +346,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>
 
 <!--
@@ -355,16 +359,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>