File wqy-zenhei-font-config-fixes.diff of Package wqy-zenhei-fonts

---
 44-wqy-zenhei.conf       |   32 --------------------------------
 66-wqy-zenhei-sharp.conf |   40 ----------------------------------------
 2 files changed, 72 deletions(-)

Index: wqy-zenhei/44-wqy-zenhei.conf
===================================================================
--- wqy-zenhei.orig/44-wqy-zenhei.conf
+++ wqy-zenhei/44-wqy-zenhei.conf
@@ -6,41 +6,19 @@
   <match target="font">
         <test qual="any" name="family">
                 <string>WenQuanYi Zen Hei</string>
+        </test> 
+        <edit name="globaladvance"><bool>false</bool></edit>
+  </match>
+  <match target="font">
+        <test qual="any" name="family">
                 <string>文泉驿正黑</string>
+        </test> 
+        <edit name="globaladvance"><bool>false</bool></edit>
+  </match>
+  <match target="font">
+        <test qual="any" name="family">
                 <string>文泉驛正黑</string>
         </test> 
         <edit name="globaladvance"><bool>false</bool></edit>
-        <edit name="spacing"><int>0</int></edit>
-        <edit name="antialias" mode="assign"><bool>true</bool></edit>
-        <edit name="hinting" mode="assign"><bool>true</bool></edit>
-        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
-        <edit name="autohint" mode="assign"><bool>false</bool></edit>
-        <edit name="rh_prefer_bitmaps" mode="assign"><bool>false</bool></edit>
-        <edit name="rgba" mode="assign"><const>none</const></edit>
-        <edit name="embeddedbitmap"><bool>false</bool></edit>
   </match>
-        <alias>
-                <family>serif</family>
-                <prefer>
-                        <family>Bitstream Vera Serif</family>
-                        <family>DejaVu Serif</family>
-                        <family>WenQuanYi Zen Hei</family>
-                </prefer>
-        </alias>
-        <alias>
-                <family>sans-serif</family>
-                <prefer>
-                        <family>DejaVu Sans</family>
-                        <family>Bitstream Vera Sans</family>
-                        <family>WenQuanYi Zen Hei</family>
-                </prefer>
-        </alias>
-        <alias>
-                <family>monospace</family>
-                <prefer>
-                        <family>DejaVu Sans Mono</family>
-                        <family>Bitstream Vera Sans Mono</family>
-                        <family>WenQuanYi Zen Hei Mono</family>
-                </prefer>
-        </alias>
 </fontconfig>
Index: wqy-zenhei/66-wqy-zenhei-sharp.conf
===================================================================
--- wqy-zenhei.orig/66-wqy-zenhei-sharp.conf
+++ wqy-zenhei/66-wqy-zenhei-sharp.conf
@@ -5,51 +5,25 @@
    <match target="font">
         <test qual="any" name="family">
                 <string>WenQuanYi Zen Hei Sharp</string>
-                <string>文泉驿点阵正黑</string>
-                <string>文泉驛點陣正黑</string>
         </test>
         <test compare="more_eq" name="pixelsize"><double>12</double></test>
         <test compare="less_eq" name="pixelsize"><double>16</double></test>
-        <edit name="antialias" mode="assign"><bool>false</bool></edit>
         <edit name="embeddedbitmap" mode="assign"><bool>true</bool></edit>
-        <edit name="hinting" mode="assign"><bool>false</bool></edit>
   </match>
-
-<!-- ZenHei now has 13px bitmaps, the following rules are disabled
-  <match target="font">
+   <match target="font">
         <test qual="any" name="family">
-                <string>WenQuanYi Zen Hei Sharp</string>
                 <string>文泉驿点阵正黑</string>
+        </test>
+        <test compare="more_eq" name="pixelsize"><double>12</double></test>
+        <test compare="less_eq" name="pixelsize"><double>16</double></test>
+        <edit name="embeddedbitmap" mode="assign"><bool>true</bool></edit>
+  </match>
+   <match target="font">
+        <test qual="any" name="family">
                 <string>文泉驛點陣正黑</string>
         </test>
-        <test compare="more_eq" name="pixelsize"><double>13.5</double></test>
-        <test compare="less" name="pixelsize"><double>14.5</double></test>
-        <edit name="pixelsize"><double>13</double></edit>
+        <test compare="more_eq" name="pixelsize"><double>12</double></test>
+        <test compare="less_eq" name="pixelsize"><double>16</double></test>
+        <edit name="embeddedbitmap" mode="assign"><bool>true</bool></edit>
   </match>
--->
-        <alias>
-                <family>serif</family>
-                <prefer>
-                        <family>DejaVu Serif</family>
-                        <family>Bitstream Vera Serif</family>
-                        <family>WenQuanYi Zen Hei Sharp</family>
-                </prefer>
-        </alias>
-        <alias>
-                <family>sans-serif</family>
-                <prefer>
-                        <family>DejaVu Sans</family>
-                        <family>Bitstream Vera Sans</family>
-                        <family>WenQuanYi Zen Hei Sharp</family>
-                </prefer>
-        </alias>
-        <alias>
-                <family>monospace</family>
-                <prefer>
-                        <family>DejaVu Sans Mono</family>
-                        <family>Bitstream Vera Sans Mono</family>
-                        <family>WenQuanYi Zen Hei Sharp</family>
-                </prefer>
-        </alias>
-
 </fontconfig>
Index: wqy-zenhei/66-wqy-zenhei-sharp-no13px.conf
===================================================================
--- wqy-zenhei.orig/66-wqy-zenhei-sharp-no13px.conf
+++ wqy-zenhei/66-wqy-zenhei-sharp-no13px.conf
@@ -6,7 +6,21 @@
   <match target="font">
         <test qual="any" name="family">
                 <string>WenQuanYi Zen Hei Sharp</string>
+        </test>
+        <test compare="more_eq" name="pixelsize"><double>13.5</double></test>
+        <test compare="less" name="pixelsize"><double>14.5</double></test>
+        <edit name="pixelsize"><double>13</double></edit>
+  </match>
+  <match target="font">
+        <test qual="any" name="family">
                 <string>文泉驿点阵正黑</string>
+        </test>
+        <test compare="more_eq" name="pixelsize"><double>13.5</double></test>
+        <test compare="less" name="pixelsize"><double>14.5</double></test>
+        <edit name="pixelsize"><double>13</double></edit>
+  </match>
+  <match target="font">
+        <test qual="any" name="family">
                 <string>文泉驛點陣正黑</string>
         </test>
         <test compare="more_eq" name="pixelsize"><double>13.5</double></test>