[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 conf.d/65-nonlatin.conf |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit db2825eed54496f4e20f7375d71d6a92b27926a2
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Jul 11 13:19:16 2017 +0900

    Bug 101726 - Sans config pulls in Microsoft Serifed font
    
    Update 65-nonlatin.conf to have better choice of the sans-serif fonts for Chinese
    
    Patch from Joseph Wang
    
    https://bugs.freedesktop.org/show_bug.cgi?id=101726

diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index 9306f74..7cedf3b 100644
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -96,9 +96,8 @@
 			<family>Hapax Berbère</family> <!-- tifinagh -->
 			<family>MS Gothic</family> <!-- han (ja) -->
 			<family>UmePlus P Gothic</family> <!-- han (ja) -->
-			<!-- chinese fonts are actually serifed -->
-			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
-			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>Microsoft YaHei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>Microsoft JhengHei</family> <!-- han (zh-tw) -->
 			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
 			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
 			<family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->