Date: Tue, 8 May 2018 03:46:29 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469349 - in head/x11-fonts/wqy: . files Message-ID: <201805080346.w483kTLw028756@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue May 8 03:46:29 2018 New Revision: 469349 URL: https://svnweb.freebsd.org/changeset/ports/469349 Log: Corrent settings for fontconfig. Submitted by: intron at intron ac Modified: head/x11-fonts/wqy/Makefile head/x11-fonts/wqy/files/85-wqy.conf Modified: head/x11-fonts/wqy/Makefile ============================================================================== --- head/x11-fonts/wqy/Makefile Tue May 8 03:36:42 2018 (r469348) +++ head/x11-fonts/wqy/Makefile Tue May 8 03:46:29 2018 (r469349) @@ -3,7 +3,7 @@ PORTNAME= wqy-fonts PORTVERSION= 20100803 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= SF/wqy/wqy-bitmapfont/1.0.0-RC1:bitmapfont \ Modified: head/x11-fonts/wqy/files/85-wqy.conf ============================================================================== --- head/x11-fonts/wqy/files/85-wqy.conf Tue May 8 03:36:42 2018 (r469348) +++ head/x11-fonts/wqy/files/85-wqy.conf Tue May 8 03:46:29 2018 (r469349) @@ -2,73 +2,16 @@ <!-- $FreeBSD$ --> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> - <!-- Editing properties for all WenQuanYi fonts --> + <!-- + Editing properties for all WenQuanYi fonts + Testing command: + fc-match -v "FONTFAMILY:size=NN" | grep -Ev "[0-9a-f]{4}:" + --> + <match target="font"> - <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> + <test name="family" compare="eq"> + <string>WenQuanYi Bitmap Song</string> + </test> <edit name="antialias"><bool>true</bool></edit> <edit name="hinting"><bool>true</bool></edit> <edit name="autohint"><bool>true</bool></edit> @@ -77,62 +20,365 @@ <edit name="globaladvance"><bool>false</bool></edit> </match> - <!-- Editing properties for bitmap fonts to avoid fuzzy display --> - <match target="font"> - <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> + <match target="font"> + <test name="family" compare="eq"> + <string>Unibit</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Zen Hei</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驿正黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驛正黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Zen Hei Sharp</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驿点阵正黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驛點陣正黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Zen Hei Mono</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驿等宽正黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驛等寬正黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Micro Hei Mono</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Micro Hei Mono Light</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驿等宽微米黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驛等寬微米黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Micro Hei</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Micro Hei Light</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驿微米黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驛微米黑</string> + </test> + <edit name="antialias"><bool>true</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>true</bool></edit> + <edit name="embeddedbitmap"><bool>true</bool></edit> + <edit name="spacing"><const>proportional</const></edit> + <edit name="globaladvance"><bool>false</bool></edit> + </match> + + <!-- + Editing properties for bitmap fonts to avoid fuzzy display + Testing command: + fc-match -v "FONTFAMILY:size=NN" | grep -iE "family|alias|size" + --> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Bitmap Song</string> + </test> <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"> - <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> + <match target="font"> + <test name="family" compare="eq"> + <string>Unibit</string> </test> - <test compare="less_eq" name="pixelsize"> - <double>16</double> + <test name="size" compare="less_eq"><int>16</int></test> + <edit name="antialias" mode="assign"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驿点阵正黑</string> </test> + <test name="size" compare="less_eq"><int>16</int></test> + <edit name="antialias" mode="assign"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>文泉驛點陣正黑</string> + </test> + <test name="size" compare="less_eq"><int>16</int></test> + <edit name="antialias" mode="assign"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family" compare="eq"> + <string>WenQuanYi Zen Hei Sharp</string> + </test> + <test name="size" compare="less_eq"><int>16</int></test> + <edit name="antialias" mode="assign"><bool>false</bool></edit> + </match> + + <!-- + Prior use WenQuanYi Zen Hei Sharp for Chinese Han + Testing command: + fc-match -s "FONTFAMILY:familylang=LL" | head -n 5 + --> + + <match target="pattern"> + <test name="family" compare="eq"><string>serif</string></test> + <test name="familylang" compare="eq"><string>zh-cn</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>serif</string></test> + <test name="familylang" compare="eq"><string>zh-tw</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>serif</string></test> + <test name="familylang" compare="eq"><string>zh-hk</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>serif</string></test> + <test name="familylang" compare="eq"><string>zh-sg</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>sans-serif</string></test> + <test name="familylang" compare="eq"><string>zh-cn</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>sans-serif</string></test> + <test name="familylang" compare="eq"><string>zh-tw</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>sans-serif</string></test> + <test name="familylang" compare="eq"><string>zh-hk</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>sans-serif</string></test> + <test name="familylang" compare="eq"><string>zh-sg</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>monospace</string></test> + <test name="familylang" compare="eq"><string>zh-cn</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>monospace</string></test> + <test name="familylang" compare="eq"><string>zh-tw</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>monospace</string></test> + <test name="familylang" compare="eq"><string>zh-hk</string></test> + <edit name="family" mode="prepend_first"> + <string>WenQuanYi Zen Hei Sharp</string> + </edit> + </match> + + <match target="pattern"> + <test name="family" compare="eq"><string>monospace</string></test> + <test name="familylang" compare="eq"><string>zh-sg</string></test> <edit name="family" mode="prepend_first"> <string>WenQuanYi Zen Hei Sharp</string> </edit>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805080346.w483kTLw028756>