Fix segfault (reported by fcrozat) caused by incorrect input on cache

[fontconfig.git] / fonts.conf.in

diff --git a/fonts.conf.in b/fonts.conf.in
index 869fec1a77a42db1fd7503b0169c3185994b87e8..c9014f8bb53cb2cd848478340d0b832c6c3bc952 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -341,6 +341,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>
 
 <!--
@@ -350,16 +354,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>