rpms/wqy-bitmap-fonts/devel 61-wqy-bitmapsong.conf, NONE, 1.1 wqy-bitmap-fonts.spec, 1.9, 1.10
Qianqian Fang (fangq)
fedora-extras-commits at redhat.com
Tue Dec 11 06:30:07 UTC 2007
Author: fangq
Update of /cvs/extras/rpms/wqy-bitmap-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv420
Modified Files:
wqy-bitmap-fonts.spec
Added Files:
61-wqy-bitmapsong.conf
Log Message:
update fontconfig file to minimize impact to non-CJK users
--- NEW FILE 61-wqy-bitmapsong.conf ---
<?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 LGC 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 LGC 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 ZenKai Uni</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 ZenKai Uni</string>
</edit>
</match>
<!--
Use vector fonts at larger/smaller sizes for sans
-->
<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>AR PL ShanHeiSun Uni</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>AR PL ShanHeiSun Uni</string>
</edit>
</match>
</fontconfig>
Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wqy-bitmap-fonts.spec 18 Nov 2007 04:03:51 -0000 1.9
+++ wqy-bitmap-fonts.spec 11 Dec 2007 06:29:34 -0000 1.10
@@ -7,18 +7,19 @@
Name: wqy-bitmap-fonts
Summary: WenQuanYi Bitmap Chinese Fonts
Version: 0.9.9
-Release: 1%{?dist}
+Release: 2%{?dist}
# for font embedding exception please see
# http://www.gnu.org/licenses/gpl-faq.html#FontException
License: GPLv2 with exceptions
URL: http://wqy.sourceforge.net/en/
Group: User Interface/X
-Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-gb18030-%{version}-0.tar.gz
+Source0: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-gb18030-%{version}-0.tar.gz
+Source1: 61-wqy-bitmapsong.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: bdftopcf, mkfontdir
Requires: fontconfig >= 2.3
-Patch0: %{name}-%{version}-fix-mono.patch
+#Patch0: %{name}-%{version}-fix-mono.patch
%description
The Wen Quan Yi bitmap font is a manually fine-tuned
@@ -38,7 +39,7 @@
%prep
%setup -q -n %{wqyroot}
-%patch0 -p0
+#%patch0 -p0
%build
make wqyv1
@@ -50,7 +51,7 @@
install -p -m644 *.pcf %{buildroot}%{fontdir}/
install -p -m644 fonts.alias %{buildroot}%{fontdir}/
install -d -m755 %{buildroot}%{fontconfdir}
-install -p -m644 85-wqy-bitmapsong.conf %{buildroot}%{fontconfdir}/
+install -p -m644 %{source1} %{buildroot}%{fontconfdir}/
touch %{buildroot}%{fontdir}/fonts.dir
# Install catalogue symlink
@@ -68,7 +69,7 @@
%dir %{wqyfontdir}
%dir %{fontdir}
%{fontdir}/*.pcf
-%config(noreplace) %{fontconfdir}/85-wqy-bitmapsong.conf
+%config(noreplace) %{fontconfdir}/%{source1}
%{fontdir}/fonts.alias
%verify(not md5 size mtime) %{fontdir}/fonts.dir
%{catalogue}/%{name}
@@ -86,6 +87,9 @@
fi
%changelog
+*Tue Dec 11 2007 Qianqian Fang <fangqq at gmail.com> 0.9.9-2
+- fontconfig file was rewriten to minimize impact to non-CJK users (#381311)
+
*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
More information about the fedora-extras-commits
mailing list