Get the DLL from "bin" where modern libtools put it, not "lib".

[fontconfig.git] / fonts.conf.in

diff --git a/fonts.conf.in b/fonts.conf.in
index 712cdda352b650ef182bfce5eb12a9361d4b396e..ef988eef5bffd4f44ac7a51746d1cad408185edf 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -81,6 +81,7 @@
                <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>
                <default><family>serif</family></default>
@@ -99,6 +100,7 @@
                <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>
@@ -169,15 +171,15 @@
        <alias>
                <family>Times New Roman</family>
                <accept><family>Thorndale AMT</family></accept>
-       </alias
+       </alias>
        <alias>
                <family>Arial</family>
                <accept><family>Albany AMT</family></accept>
-       </alias
+       </alias>
        <alias>
                <family>Courier New</family>
                <accept><family>Cumberland AMT</family></accept>
-       </alias
+       </alias>
  
 <!--
   Some Asian fonts misadvertise themselves as monospaced when
@@ -275,6 +277,7 @@
                        <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>
@@ -293,6 +296,7 @@
                        <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>
@@ -372,11 +376,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 -->
@@ -387,21 +401,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 -->
@@ -414,11 +428,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