rpms/wqy-bitmap-fonts/F-13 61-wqy-bitmapsong.conf, 1.6, 1.7 wqy-bitmap-fonts.spec, 1.24, 1.25

[Qianqian Fang]

Author: fangq

Update of /cvs/pkgs/rpms/wqy-bitmap-fonts/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13892

Modified Files:
	61-wqy-bitmapsong.conf wqy-bitmap-fonts.spec 
Log Message:
remove all preferences from 61-wqy-bitmapsong.conf, will rely on 65-nonlatin in the future


Index: 61-wqy-bitmapsong.conf
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-bitmap-fonts/F-13/61-wqy-bitmapsong.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 61-wqy-bitmapsong.conf	23 Apr 2009 18:31:54 -0000	1.6
+++ 61-wqy-bitmapsong.conf	26 Feb 2010 02:45:17 -0000	1.7
@@ -1,121 +1,17 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-<!--
-  WenQuanYi Bitmap Song CJK Font Rendering Setup
-
-  History
-    created by Qianqian Fang,  2007/12/01
-
-  Purpose:
-    1. use the system preferred Latin vector fonts for non-CJK characters
-    2. use wqy-bitmap-fonts for Chinese characters between 10px and 16px (all locales)
-    3. use vector fonts (uming/ukai) for Chinese characters for all other sizes
--->
 
 <!--
-  Serif faces
- -->
-	<alias>
-		<family>serif</family>
-                <prefer><family>WenQuanYi Bitmap Song</family></prefer>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-        <alias>
-                <family>sans-serif</family>         
-                <prefer><family>WenQuanYi Bitmap Song</family></prefer>
-        </alias>
-<!--
-  Monospace faces
- -->
-        <alias>
-                <family>monospace</family>         
-                <prefer>
-                        <family>DejaVu Sans Mono</family>
-                        <family>Bitstream Vera Sans Mono</family>
-			<family>WenQuanYi Bitmap Song</family>
-		</prefer>
-        </alias>
-        <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>
-           <test compare="contains" name="lang">
-                   <string>zh</string>
-           </test>
-           <edit name="family" mode="prepend" binding="strong">
-                   <string>DejaVu Sans Mono</string>
-           </edit>
-       </match>
-
-<!--
-  Use vector fonts at larger/smaller sizes for serif
- -->
-       <match target="pattern">
-           <test equal="any" compare="eq" name="family">
-                   <string>WenQuanYi Bitmap Song</string>
-           </test>
-           <test equal="any" compare="eq" name="family">
-                   <string>serif</string>
-           </test>
-           <test compare="more" name="pixelsize">
-                   <double>16</double>
-           </test>
-           <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL UMing CN</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>serif</string>
-           </test>
-           <test compare="less" name="pixelsize">
-                   <double>10</double>
-           </test>
-           <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL UMing CN</string>
-           </edit>
-      </match>
-
-<!--
-  Use vector fonts at larger/smaller sizes for sans
- -->
+  Enable This Bitmap Font
+-->
 
-       <match target="pattern">
-           <test equal="any" compare="eq" name="family">
-                    <string>WenQuanYi Bitmap Song</string>
-           </test>
-           <test equal="any" compare="eq" name="family">
-                   <string>sans-serif</string>
-           </test>
-           <test compare="more" name="pixelsize">
-                   <double>16</double>
-           </test>
-           <edit name="family" mode="prepend" binding="same">
-                   <string>WenQuanYi Zen Hei</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>sans-serif</string>
-           </test>
-           <test compare="less" name="pixelsize">
-                   <double>10</double>
-           </test>
-           <edit name="family" mode="prepend" binding="same">
-                   <string>WenQuanYi Zen Hei</string>
-           </edit>
-      </match>
+<selectfont>
+   <acceptfont>
+      <pattern>
+         <patelt name="family"><string>WenQuanYi Bitmap Song</string></patelt>
+      </pattern>
+   </acceptfont>
+</selectfont>
 
 </fontconfig>


Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-bitmap-fonts/F-13/wqy-bitmap-fonts.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- wqy-bitmap-fonts.spec	27 Jul 2009 07:27:36 -0000	1.24
+++ wqy-bitmap-fonts.spec	26 Feb 2010 02:45:17 -0000	1.25
@@ -4,7 +4,7 @@
 
 Name:           %{fontname}-fonts
 Version:        0.9.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        WenQuanYi Bitmap Chinese Fonts
 
 Group:          User Interface/X
@@ -69,6 +69,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+*Thu Feb 25 2010 Qianqian Fang <fangqq at gmail.com> 0.9.9-12
+- Remove all font preference settings from 61-wqy-bitmapsong.conf (#492510)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild