rpms/wqy-bitmap-fonts/F-8 wqy-bitmap-fonts-0.9.9-fix-mono.patch, NONE, 1.1 wqy-bitmap-fonts.spec, 1.8, 1.9

[Qianqian Fang (fangq)]

Author: fangq

Update of /cvs/extras/rpms/wqy-bitmap-fonts/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13687

Modified Files:
	wqy-bitmap-fonts.spec 
Added Files:
	wqy-bitmap-fonts-0.9.9-fix-mono.patch 
Log Message:
avoid using Latin glyphs in monospace environments


wqy-bitmap-fonts-0.9.9-fix-mono.patch:

--- NEW FILE wqy-bitmap-fonts-0.9.9-fix-mono.patch ---
--- 85-wqy-bitmapsong.conf.orig	2007-11-04 01:28:14.000000000 -0400
+++ 85-wqy-bitmapsong.conf	2007-11-16 02:36:44.000000000 -0500
@@ -21,6 +21,7 @@
 
         Updated by Qianqian Fang on Mar. 28,2007
         Updated by Qianqian Fang on May 9,2007 
+        Updated by Qianqian Fang on Nov. 17,2007 
 -->
     <match target="pattern">
         <test equal="any" compare="eq" name="lang">
@@ -37,9 +38,6 @@
         <test compare="less_eq" name="pixelsize">
                 <double>16</double>
         </test>
-        <test compare="not_eq" name="family">
-		<string>monospace</string>
-	</test>
         <edit name="family" mode="prepend_first">
                 <string>WenQuanYi Bitmap Song</string>
         </edit>
@@ -59,12 +57,24 @@
         <test compare="less_eq" name="size">
                 <double>12</double>
         </test>
-        <test compare="not_eq" name="family">
-                <string>monospace</string>
-        </test>
         <edit name="family" mode="prepend_first">
                 <string>WenQuanYi Bitmap Song</string>
         </edit>
    </match>
 
+    <match target="pattern">
+        <test equal="any" compare="eq" name="family">
+                <string>WenQuanYi Bitmap Song</string>
+        </test>
+        <test equal="any" compare="eq" name="family">
+                <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend">
+                <string>Bitstream Vera Sans Mono</string>
+        </edit>
+        <edit name="family" mode="prepend" binding="strong">
+                <string>DejaVu LGC Sans Mono</string>
+        </edit>
+    </match>
+
 </fontconfig>


Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/F-8/wqy-bitmap-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wqy-bitmap-fonts.spec	12 Nov 2007 02:07:01 -0000	1.8
+++ wqy-bitmap-fonts.spec	18 Nov 2007 03:59:50 -0000	1.9
@@ -7,7 +7,7 @@
 Name: wqy-bitmap-fonts
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.9.9
-Release: 0%{?dist}
+Release: 1%{?dist}
 # for font embedding exception please see
 # http://www.gnu.org/licenses/gpl-faq.html#FontException
 License: GPLv2 with exceptions
@@ -18,6 +18,7 @@
 BuildArch: noarch
 BuildRequires: bdftopcf, mkfontdir
 Requires: fontconfig >= 2.3
+Patch0: %{name}-%{version}-fix-mono.patch
 
 %description
 The Wen Quan Yi bitmap font is a manually fine-tuned
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q -n %{wqyroot}
+%patch0 -p0
 
 %build
 make wqyv1
@@ -84,6 +86,9 @@
 fi
 
 %changelog
+*Sat Nov 17 2007 Qianqian Fang <fangqq at gmail.com> 0.9.9-1
+- avoid using Latin glyphs from this font in monospace environment such as in consoles
+
 *Sat Nov 10 2007 Qianqian Fang <fangqq at gmail.com> 0.9.9-0
 - include the complete CJK Extension A glyphs (6,582 x 4 point sizes), provide full coverage to Standard GB18030
 - first round standard-compliance validation for all CJK basic characters between U4E00-U9FA5