[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 conf.d/40-nonlatin.conf |    3 +++
 conf.d/65-nonlatin.conf |   24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 8c58dc276895cbeb0e9ae79718b1a38a082709d3
Author: Jinkyu Yi <jincreator at naver.com>
Date:   Wed Nov 9 18:07:37 2011 +0900

    Bug 42423 - make default Korean font from Un to Nanum
    
    Update 40-nonlatin.conf and 65-nonlatin.conf for Nanum korean fonts.
    
    Signed-off-by: Akira TAGOH <akira at tagoh.org>

diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
index a875db0..00f2707 100644
--- a/conf.d/40-nonlatin.conf
+++ b/conf.d/40-nonlatin.conf
@@ -22,6 +22,7 @@
 		<family>AR PL SungtiL GB</family>
 		<family>AR PL Mingti2L Big5</family>
 		<family>ＭＳ 明朝</family>
+		<family>NanumMyeongjo</family>
 		<family>UnBatang</family>
 		<family>Baekmuk Batang</family>
 		<family>MgOpen Canonica</family>
@@ -47,6 +48,7 @@
 		<family>AR PL KaitiM GB</family>
 		<family>AR PL KaitiM Big5</family>
 		<family>ＭＳ ゴシック</family>
+		<family>NanumGothic</family>
 		<family>UnDotum</family>
 		<family>Baekmuk Dotum</family>
 		<family>SimSun</family>
@@ -63,6 +65,7 @@
  	<alias>
 		<family>NSimSun</family>
 		<family>ZYSong18030</family>
+		<family>NanumGothicCoding</family>
 		<family>FreeMono</family>
 		<default><family>monospace</family></default>
 	</alias>
diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index 53ac064..e9788b0 100644
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -43,8 +43,9 @@
  			<family>AR PL Zenkai Uni</family>
 			<family>ＭＳ 明朝</family>
  			<family>ZYSong18030</family>
-			<family>UnBatang</family>
-			<family>Baekmuk Batang</family>
+			<family>NanumMyeongjo</family> <!-- hangul (ko) -->
+			<family>UnBatang</family> <!-- hangul (ko) -->
+			<family>Baekmuk Batang</family> <!-- hangul (ko) -->
  			<family>KacstQura</family>
  			<family>Frank Ruehl CLM</family>
 			<family>Lohit Bengali</family>
@@ -117,9 +118,10 @@
 			<family>ＭＳ ゴシック</family>
 			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
 			<family>TSCu_Paranar</family> <!-- tamil -->
-			<family>UnDotum</family>
-			<family>Baekmuk Dotum</family>
- 			<family>Baekmuk Gulim</family>
+			<family>NanumGothic</family> <!-- hangul (ko) -->
+			<family>UnDotum</family> <!-- hangul (ko) -->
+			<family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+ 			<family>Baekmuk Gulim</family> <!-- hangul (ko) -->
  			<family>KacstQura</family>
 			<family>Lohit Bengali</family>
  			<family>Lohit Gujarati</family>
@@ -160,11 +162,13 @@
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
 			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
-			<family>UnBatang</family>
-			<family>UnDotum</family>
-			<family>Baekmuk Batang</family> <!-- hangul -->
-			<family>Baekmuk Dotum</family>
-			<family>Baekmuk Gulim</family>
+			<family>NanumGothicCoding</family> <!-- hangul (ko) -->
+			<family>NanumGothic</family> <!-- hangul (ko) -->
+			<family>UnDotum</family> <!-- hangul (ko) -->
+			<family>UnBatang</family> <!-- hangul (ko) -->
+			<family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+			<family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+			<family>Baekmuk Batang</family> <!-- hangul (ko) -->
 			<family>TlwgTypo</family> <!-- thai -->
 			<family>TlwgTypist</family> <!-- thai -->
 			<family>TlwgTypewriter</family> <!-- thai -->