Bug 73686 - confdir is not set correctly in fontconfig.pc

[platform/upstream/fontconfig.git] / fonts.conf.in

diff --git a/fonts.conf.in b/fonts.conf.in
index 99f2ee5..6a8753d 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -25,13 +25,10 @@
 
        <dir>@FC_DEFAULT_FONTS@</dir>
        @FC_FONTPATH@
+       <dir prefix="xdg">fonts</dir>
+       <!-- the following element will be removed in the future -->
        <dir>~/.fonts</dir>
 
-<!-- Font cache directory list -->
-
-       <cachedir>@FC_CACHEDIR@</cachedir>
-       <cachedir>~/.fontconfig</cachedir>
-
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 -->
@@ -39,7 +36,7 @@
                <test qual="any" name="family">
                        <string>mono</string>
                </test>
-               <edit name="family" mode="assign">
+               <edit name="family" mode="assign" binding="same">
                        <string>monospace</string>
                </edit>
        </match>
@@ -51,7 +48,7 @@
                <test qual="any" name="family">
                        <string>sans serif</string>
                </test>
-               <edit name="family" mode="assign">
+               <edit name="family" mode="assign" binding="same">
                        <string>sans-serif</string>
                </edit>
        </match>
@@ -63,7 +60,7 @@
                <test qual="any" name="family">
                        <string>sans</string>
                </test>
-               <edit name="family" mode="assign">
+               <edit name="family" mode="assign" binding="same">
                        <string>sans-serif</string>
                </edit>
        </match>
@@ -71,7 +68,14 @@
 <!--
   Load local system customization file
 -->
-       <include ignore_missing="yes">conf.d</include>
+       <include ignore_missing="yes">@CONFIGDIR@</include>
+
+<!-- Font cache directory list -->
+
+       <cachedir>@FC_CACHEDIR@</cachedir>
+       <cachedir prefix="xdg">fontconfig</cachedir>
+       <!-- the following element will be removed in the future -->
+       <cachedir>~/.fontconfig</cachedir>
 
        <config>
 <!--
@@ -131,6 +135,7 @@
                        <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 -->