kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a warning "Having multiple values in <test> isn't supported and may

Browse source 
not work as expected" when using the latest x11-fonts/fontconfig.

This is similar to r326328 (ports/181701).

Reported by:	Eric Camachat <eric.camachat gmail.com>
Submitted by:	maintainer
PR:		ports/182865
This commit is contained in:
Xin LI 2013-11-05 19:40:01 +00:00
parent 038b06deb3
commit 42df5e78d7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=332902
2 changed files with 111 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x11-fonts/wqy/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= wqy-fonts
PORTVERSION= 20100803
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-fonts
MASTER_SITES= SF/wqy/wqy-bitmapfont/1.0.0-RC1:bitmapfont \

151
x11-fonts/wqy/files/85-wqy.conf
View file

@ -2,30 +2,73 @@
<!-- $FreeBSD$ -->
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Editing properties for all WenQuanYi fonts -->
<match target="font">
<test name="family" equal="any" compare="eq">
<string>WenQuanYi Bitmap Song</string>
<string>Unibit</string>
<string>WenQuanYi Zen Hei</string>
<string>文泉驿正黑</string>
<string>文泉驛正黑</string>
<string>文泉驿点阵正黑</string>
<string>文泉驛點陣正黑</string>
<string>WenQuanYi Zen Hei Sharp</string>
<string>文泉驿等宽正黑</string>
<string>文泉驛等寬正黑</string>
<string>WenQuanYi Zen Hei Mono</string>
<string>文泉驿等宽微米黑</string>
<string>文泉驛等寬微米黑</string>
<string>WenQuanYi Micro Hei Mono Light</string>
<string>文泉驿等宽微米黑</string>
<string>文泉驛等寬微米黑</string>
<string>WenQuanYi Micro Hei Mono</string>
<string>文泉驿微米黑</string>
<string>文泉驛微米黑</string>
<string>WenQuanYi Micro Hei</string>
<string>WenQuanYi Micro Hei Light</string>
</test>
<or>
<test name="family" compare="eq">
<string>WenQuanYi Bitmap Song</string>
</test>
<test name="family" compare="eq">
<string>Unibit</string>
</test>
<test name="family" compare="eq">
<string>WenQuanYi Zen Hei</string>
</test>
<test name="family" compare="eq">
<string>文泉驿正黑</string>
</test>
<test name="family" compare="eq">
<string>文泉驛正黑</string>
</test>
<test name="family" compare="eq">
<string>文泉驿点阵正黑</string>
</test>
<test name="family" compare="eq">
<string>文泉驛點陣正黑</string>
</test>
<test name="family" compare="eq">
<string>WenQuanYi Zen Hei Sharp</string>
</test>
<test name="family" compare="eq">
<string>文泉驿等宽正黑</string>
</test>
<test name="family" compare="eq">
<string>文泉驛等寬正黑</string>
</test>
<test name="family" compare="eq">
<string>WenQuanYi Zen Hei Mono</string>
</test>
<test name="family" compare="eq">
<string>文泉驿等宽微米黑</string>
</test>
<test name="family" compare="eq">
<string>文泉驛等寬微米黑</string>
</test>
<test name="family" compare="eq">
<string>WenQuanYi Micro Hei Mono Light</string>
</test>
<test name="family" compare="eq">
<string>文泉驿等宽微米黑</string>
</test>
<test name="family" compare="eq">
<string>文泉驛等寬微米黑</string>
</test>
<test name="family" compare="eq">
<string>WenQuanYi Micro Hei Mono</string>
</test>
<test name="family" compare="eq">
<string>文泉驿微米黑</string>
</test>
<test name="family" compare="eq">
<string>文泉驛微米黑</string>
</test>
<test name="family" compare="eq">
<string>WenQuanYi Micro Hei</string>
</test>
<test name="family" compare="eq">
<string>WenQuanYi Micro Hei Light</string>
</test>
</or>
<edit name="antialias"><bool>true</bool></edit>
<edit name="hinting"><bool>true</bool></edit>
<edit name="autohint"><bool>false</bool></edit>
@ -34,30 +77,56 @@
<edit name="globaladvance"><bool>false</bool></edit>
</match>
<!-- Editing properties for bitmap fonts to avoid fuzzy display -->
<match target="font">
<test name="family" equal="any" compare="eq">
<string>WenQuanYi Bitmap Song</string>
<string>Unibit</string>
<string>WenQuanYi Zen Hei</string>
<string>文泉驿正黑</string>
<string>文泉驛正黑</string>
</test>
<or>
<test name="family" compare="eq">
<string>WenQuanYi Bitmap Song</string>
</test>
<test name="family" compare="eq">
<string>Unibit</string>
</test>
<test name="family" compare="eq">
<string>WenQuanYi Zen Hei</string>
</test>
<test name="family" compare="eq">
<string>文泉驿正黑</string>
</test>
<test name="family" compare="eq">
<string>文泉驛正黑</string>
</test>
</or>
<test name="size" compare="less_eq"><int>16</int></test>
<edit name="antialias" mode="assign"><bool>false</bool></edit>
</match>
<!-- Prior use WenQuanYi Bitmap Song for Chinese Han -->
<match target="pattern">
<test name="family" equal="any" compare="eq">
<string>serif</string>
<string>sans-serif</string>
<string>monospace</string>
</test>
<test equal="any" compare="eq" name="lang">
<string>zh-cn</string>
<string>zh-tw</string>
<string>zh-hk</string>
<string>zh-sg</string>
</test>
<or>
<test name="family" compare="eq">
<string>serif</string>
</test>
<test name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="family" compare="eq">
<string>monospace</string>
</test>
</or>
<or>
<test compare="eq" name="lang">
<string>zh-cn</string>
</test>
<test compare="eq" name="lang">
<string>zh-tw</string>
</test>
<test compare="eq" name="lang">
<string>zh-hk</string>
</test>
<test compare="eq" name="lang">
<string>zh-sg</string>
</test>
</or>
<test compare="more_eq" name="pixelsize">
<double>12</double>
</test>