From owner-svn-ports-head@freebsd.org  Tue May  8 03:46:30 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83491FCBE21;
 Tue,  8 May 2018 03:46:30 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 31D506F7D4;
 Tue,  8 May 2018 03:46:30 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CA6824D77;
 Tue,  8 May 2018 03:46:30 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w483kU8r028758;
 Tue, 8 May 2018 03:46:30 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w483kTLw028756;
 Tue, 8 May 2018 03:46:29 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201805080346.w483kTLw028756@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 8 May 2018 03:46:29 +0000 (UTC)
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
X-SVN-Group: ports-head
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: in head/x11-fonts/wqy: . files
X-SVN-Commit-Revision: 469349
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 May 2018 03:46:30 -0000

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>