=== modified file 'debian/changelog'
--- debian/changelog	2010-04-16 14:39:58 +0000
+++ debian/changelog	2010-04-24 14:12:44 +0000
@@ -1,3 +1,17 @@
+language-selector (0.5.7) lucid; urgency=low
+
+  * Change fontconfig settings:
+    - zh-*: reorder font priority lists, put DejaVu and Bitstream Vera in front
+    (LP: #149944)
+    - zh-*: add WenQuanYi Microhei, Droid Sans Fallback and HYSong
+    - ja: add entries for Takao and IPA fonts, reorder and merge
+    required rendering options from the 29-language-selector-ja-jp.conf file
+    (LP: #535582)
+    - update 30-cjk-aliases.conf to include localized font names and fonts used
+    in Windows 7.
+
+ -- Arne Goetje <arne@ubuntu.com>  Wed, 21 Apr 2010 17:49:18 +0200
+
 language-selector (0.5.6) lucid; urgency=low
 
   * bugfix: use os.R_OK and os.W_OK to check file permissions.

=== removed file 'fontconfig/29-language-selector-ja-jp.conf'
--- fontconfig/29-language-selector-ja-jp.conf	2010-03-11 21:47:00 +0000
+++ fontconfig/29-language-selector-ja-jp.conf	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-	<match target="font">
-		<edit name="embeddedbitmap" mode="assign">
-			<bool>false</bool>
-		</edit>
-		<edit name="hinting" mode="assign">
-			<bool>true</bool>
-		</edit>
-		<edit name="hintstyle" mode="assign">
-			<const>hintslight</const>
-		</edit>
-		<edit name="antialias" mode="assign">
-			<bool>true</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="lang" compare="contains">
-			<string>ja</string>
-		</test>
-		<test name="pixelsize" compare="less_eq">
-			<double>18</double>
-		</test>
-		<edit name="hintstyle" mode="assign">
-			<const>hintnone</const>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="lang" compare="contains">
-			<string>ja</string>
-		</test>
-		<test name="spacing" compare="eq">
-			<const>dual</const>
-		</test>
-		<edit name="spacing">
-			<const>proportional</const>
-		</edit>
-		<edit name="globaladvance" binding="strong">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="lang" compare="contains">
-			<string>ja</string>
-		</test>
-		<test name="outline" compare="eq">
-			<bool>false</bool>
-		</test>
-		<test name="spacing" compare="eq">
-			<const>mono</const>
-			<const>charcell</const>
-		</test>
-		<edit name="spacing">
-			<const>proportional</const>
-		</edit>
-		<edit name="globaladvance" binding="strong">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-</fontconfig>

=== modified file 'fontconfig/30-cjk-aliases.conf'
--- fontconfig/30-cjk-aliases.conf	2010-03-11 21:47:00 +0000
+++ fontconfig/30-cjk-aliases.conf	2010-04-24 14:12:44 +0000
@@ -2,189 +2,166 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!-- Aliases for Korean Windows fonts -->
-	<alias>
-		<family>Batang</family>
-		<accept>
-		    <family>UnBatang</family>
-		    <family>Baekmuk Batang</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>BatangChe</family>
-		<accept>
-		    <family>UnBatang</family>
-		    <family>Baekmuk Batang</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>AR MingtiM KSC</family>
-		<accept>
-		    <family>UnBatang</family>
-		    <family>Baekmuk Batang</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>Dotum</family>
-		<accept>
-		    <family>UnDotum</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>DotumChe</family>
-		<accept>
-		    <family>UnDotum</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>Gulim</family>
-		<accept>
-		    <family>Guseul</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>GulimChe</family>
-		<accept>
-		    <family>Guseul</family>
-		</accept>
-	</alias>
+    <alias>
+        <family>Batang</family>
+        <family>바탕</family>
+        <family>BatangChe</family>
+        <family>바탕체</family>
+        <family>Gungsuh</family>
+        <family>궁서</family>
+        <family>GungsuhChe</family>
+        <family>궁서체</family>
+        <family>AR MingtiM KSC</family>
+        <accept>
+            <family>UnBatang</family>
+            <family>Baekmuk Batang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Dotum</family>
+        <family>돋움</family>
+        <family>DotumChe</family>
+        <family>돋움체</family>
+        <family>Malgun Gothic</family>
+        <family>맑은 고딕</family>
+        <accept>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Gulim</family>
+        <family>굴림</family>
+        <family>GulimChe</family>
+        <family>굴림체</family>
+        <accept>
+            <family>UnDotum</family>
+            <family>Guseul</family>
+        </accept>
+    </alias>
 <!-- Aliases for Japanese Windows fonts -->
-	<alias>
-		<family>MS Gothic</family>
-		<accept>
-		    <family>IPAMonaPGothic</family>
-    		<family>IPAPGothic</family>
-		    <family>Sazanami Gothic</family>
-		    <family>Kochi Gothic</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>MS UIGothic</family>
-		<accept>
-		    <family>IPAMonaPGothic</family>
-    		<family>IPAPGothic</family>
-		    <family>Sazanami Gothic</family>
-		    <family>Kochi Gothic</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>MS Mincho</family>
-		<accept>
-		    <family>IPAMonaPMincho</family>
-		    <family>IPAPMincho</family>
-		    <family>Sazanami Mincho</family>
-		    <family>Kochi Mincho</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>MS PMincho</family>
-		<accept>
-		    <family>IPAMonaPMincho</family>
-		    <family>IPAPMincho</family>
-		    <family>Sazanami Mincho</family>
-		    <family>Kochi Mincho</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>AR MinchoL JIS</family>
-		<accept>
-		    <family>IPAMonaPMincho</family>
-		    <family>IPAPMincho</family>
-		    <family>Sazanami Mincho</family>
-		    <family>Kochi Mincho</family>
-		</accept>
-	</alias>
+    <alias>
+        <family>MS Gothic</family>
+        <family>ＭＳ ゴシック</family>
+        <accept>
+            <family>TakaoGothic</family>
+            <family>IPAGothic</family>
+            <family>IPAMonaGothic</family>
+            <family>VL Gothic</family>
+            <family>Sazanami Gothic</family>
+            <family>Kochi Gothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS PGothic</family>
+        <family>ＭＳ Ｐゴシック</family>
+        <family>MS UIGothic</family>
+        <family>Meiryo UI</family>
+        <accept>
+            <family>IPAMonaPGothic</family>
+            <family>TakaoPGothic</family>
+            <family>IPAPGothic</family>
+            <family>VL PGothic</family>
+            <family>Sazanami Gothic</family>
+            <family>Kochi Gothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS Mincho</family>
+        <family>ＭＳ 明朝</family>
+        <family>AR MinchoL JIS</family>
+        <accept>
+            <family>TakaoMincho</family>
+            <family>IPAMincho</family>
+            <family>IPAMonaMincho</family>
+            <family>Sazanami Mincho</family>
+            <family>Kochi Mincho</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS PMincho</family>
+        <family>ＭＳ Ｐ明朝</family>
+        <accept>
+            <family>IPAMonaPMincho</family>
+            <family>TakaoPMincho</family>
+            <family>IPAPMincho</family>
+            <family>Sazanami Mincho</family>
+            <family>Kochi Mincho</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Meiryo</family>
+        <family>メイリオ</family>
+        <accept>
+            <family>IPAexGothic</family>
+        </accept>
+    </alias>
 <!-- Aliases for Simplified Chinese Windows fonts -->
-	<alias>
-		<family>SimSun</family>
-		<accept>
-		    <family>AR PL UMing CN</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>NSimSun</family>
-		<accept>
-		    <family>AR PL UMing CN</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>SimSun-18030</family>
-		<accept>
-		    <family>AR PL UMing CN</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>NSimSun-18030</family>
-		<accept>
-		    <family>AR PL UMing CN</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>宋体</family>
-		<accept>
-		    <family>AR PL UMing CN</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>AR MingtiM GB</family>
-		<accept>
-		    <family>AR PL UMing CN</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
+    <alias>
+        <family>SimSun</family>
+        <family>NSimSun</family>
+        <family>SimSun-18030</family>
+        <family>NSimSun-18030</family>
+        <family>宋体</family>
+        <family>新宋体</family>
+        <family>AR MingtiM GB</family>
+        <accept>
+            <family>HYSong</family>
+            <family>AR PL UMing CN</family>
+            <family>AR PL ShanHeiSun Uni</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>KaiTi</family>
+        <family>楷体</family>
+        <accept>
+            <family>AR PL UKai CN</family>
+            <family>AR PL ZenKai Uni</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Microsoft YaHei</family>
+        <family>微软雅黑</family>
+        <accept>
+            <family>WenQuanYi Micro Hei</family>
+            <family>WenQuanYi Zen Hei</family>
+        </accept>
+    </alias>
 <!-- Aliases for Traditional Chinese Windows fonts -->
-	<alias>
-		<family>MingLiU</family>
-		<accept>
-		    <family>AR PL UMing TW</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>細明體</family>
-		<accept>
-		    <family>AR PL UMing TW</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>PMingLiU</family>
-		<accept>
-		    <family>AR PL UMing TW</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>新細明體</family>
-		<accept>
-		    <family>AR PL UMing TW</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>AR MingtiM BIG-5</family>
-		<accept>
-		    <family>AR PL UMing TW</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
-	<alias>
-		<family>標楷體</family>
-		<accept>
-		    <family>AR PL UKai TW</family>
-		    <family>AR PL ZenKai Uni</family>
-		</accept>
-	</alias>
+    <alias>
+        <family>MingLiU</family>
+        <family>細明體</family>
+        <family>PMingLiU</family>
+        <family>新細明體</family>
+        <family>AR MingtiM BIG-5</family>
+        <accept>
+            <family>AR PL UMing TW</family>
+            <family>AR PL ShanHeiSun Uni</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>DFKai\-SB</family>
+        <family>標楷體</family>
+        <accept>
+            <family>AR PL UKai TW</family>
+            <family>AR PL ZenKai Uni</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Microsoft JhengHei</family>
+        <family>微軟正黑體</family>
+        <accept>
+            <family>WenQuanYi Micro Hei</family>
+            <family>WenQuanYi Zen Hei</family>
+        </accept>
+    </alias>
 <!-- Alias for HKSCS -->
-	<alias>
-		<family>Ming (for ISO10646)</family>
-		<accept>
-		    <family>AR PL UMing HK</family>
-		    <family>AR PL ShanHeiSun Uni</family>
-		</accept>
-	</alias>
+    <alias>
+        <family>Ming (for ISO10646)</family>
+        <family>MingLiU_HKSCS</family>
+        <family>細明體_HKSCS</family>
+        <accept>
+            <family>AR PL UMing HK</family>
+            <family>AR PL ShanHeiSun Uni</family>
+        </accept>
+    </alias>
 </fontconfig>

=== modified file 'fontconfig/69-language-selector-ja-jp.conf'
--- fontconfig/69-language-selector-ja-jp.conf	2010-03-11 21:47:00 +0000
+++ fontconfig/69-language-selector-ja-jp.conf	2010-04-24 14:12:44 +0000
@@ -1,40 +1,149 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans-serif</string>
-		</test>
-		<edit name="family" mode="prepend" binding="strong">
-			<string>IPAMonaPGothic</string>
-			<string>IPAPGothic</string>
-			<string>VL PGothic</string>
-			<string>Sazanami Gothic</string>
-			<string>Kochi Gothic</string>
-		</edit>
-	</match> 
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>serif</string>
-		</test>
-		<edit name="family" mode="prepend" binding="strong">
-			<string>IPAMonaPMincho</string>
-			<string>IPAPMincho</string>
-			<string>Sazanami Mincho</string>
-			<string>Kochi Mincho</string>
-		</edit>
-	</match> 
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>monospace</string>
-		</test>
-		<edit name="family" mode="prepend" binding="strong">
-			<string>IPAMonaGothic</string>
-			<string>IPAGothic</string>
-			<string>VL Gothic</string>
-			<string>Sazanami Gothic</string>
-			<string>Kochi Gothic</string>
-		</edit>
-	</match> 
+    <!-- Japanese (ja) -->
+    <match target="pattern">
+        <test name="lang" compare="contains">
+            <string>ja</string>
+        </test>
+        <test qual="any" name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend" binding="same">
+            <string>DejaVu Serif</string>
+            <string>Takao P明朝</string>
+            <string>IPA P明朝</string>
+            <string>IPA モナー P明朝</string>
+            <string>梅P明朝</string>
+            <string>さざなみ明朝</string>
+            <string>東風明朝</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang" compare="contains">
+            <string>ja</string>
+        </test>
+        <test qual="any" name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit name="family" mode="prepend" binding="same">
+            <string>DejaVu Sans</string>
+            <string>Takao Pゴシック</string>
+            <string>IPA Pゴシック</string>
+            <string>IPA モナー Pゴシック</string>
+            <string>UmePlus P Gothic</string>
+            <string>梅Pゴシック</string>
+            <string>VL Pゴシック</string>
+            <string>さざなみゴシック</string>
+            <string>東風ゴシック</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang" compare="contains">
+            <string>ja</string>
+        </test>
+        <test qual="any" name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend" binding="same">
+            <string>Takaoゴシック</string>
+            <string>IPAゴシック</string>
+            <string>IPA モナー ゴシック</string>
+            <string>UmePlus Gothic</string>
+            <string>梅ゴシック</string>
+            <string>VL ゴシック</string>
+            <string>さざなみゴシック</string>
+            <string>東風ゴシック</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>Ryumin</string>
+        </test>
+        <edit name="family" mode="prepend" binding="same">
+            <string>Takao P明朝</string>
+            <string>IPA P明朝</string>
+            <string>IPA モナー P明朝</string>
+            <string>梅P明朝</string>
+            <string>さざなみ明朝</string>
+            <string>東風明朝</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>GothicBBB</string>
+        </test>
+        <edit name="family" mode="prepend" binding="same">
+            <string>Takao Pゴシック</string>
+            <string>IPA Pゴシック</string>
+            <string>IPA モナー Pゴシック</string>
+            <string>UmePlus P Gothic</string>
+            <string>梅Pゴシック</string>
+            <string>VL Pゴシック</string>
+            <string>さざなみ ゴシック</string>
+            <string>東風ゴシック</string>
+        </edit>
+    </match>
+
+    <match target="font">
+        <test name="family" compare="contains">
+            <string>IPA Pゴシック</string>
+            <string>IPA P明朝</string>
+            <string>IPA モナー Pゴシック</string>
+            <string>IPA モナー P明朝</string>
+            <string>IPA モナー UIゴシック</string>
+            <string>IPA モナー ゴシック</string>
+            <string>IPA モナー 明朝</string>
+            <string>IPAexゴシック</string>
+            <string>IPAex明朝</string>
+            <string>IPAゴシック</string>
+            <string>IPA明朝</string>
+            <string>Takao Pゴシック</string>
+            <string>Takao P明朝</string>
+            <string>TakaoExゴシック</string>
+            <string>TakaoEx明朝</string>
+            <string>Takaoゴシック</string>
+            <string>Takao明朝</string>
+            <string>UmePlus Gothic</string>
+            <string>UmePlus P Gothic</string>
+            <string>VL Pゴシック</string>
+            <string>VL ゴシック</string>
+            <string>さざなみゴシック</string>
+            <string>さざなみ明朝</string>
+            <string>東風ゴシック</string>
+            <string>東風明朝</string>
+            <string>梅Pゴシック</string>
+            <string>梅PゴシックC4</string>
+            <string>梅PゴシックC5</string>
+            <string>梅PゴシックO5</string>
+            <string>梅PゴシックS4</string>
+            <string>梅PゴシックS5</string>
+            <string>梅P明朝</string>
+            <string>梅P明朝S3</string>
+            <string>梅UIゴシック</string>
+            <string>梅UIゴシックO5</string>
+            <string>梅ゴシック</string>
+            <string>梅ゴシックC4</string>
+            <string>梅ゴシックC5</string>
+            <string>梅ゴシックO5</string>
+            <string>梅ゴシックS4</string>
+            <string>梅ゴシックS5</string>
+            <string>梅明朝</string>
+            <string>梅明朝S3</string>
+        </test>
+        <test name="pixelsize" compare="less_eq">
+            <double>18</double>
+        </test>
+        <edit name="hintstyle" mode="assign">
+            <const>hintnone</const>
+        </edit>
+        <edit name="embeddedbitmap">
+             <bool>false</bool>
+        </edit>
+    </match>
+    <!-- Japanese (ja) ends -->
 </fontconfig>

=== modified file 'fontconfig/69-language-selector-zh-cn.conf'
--- fontconfig/69-language-selector-zh-cn.conf	2010-03-11 21:47:00 +0000
+++ fontconfig/69-language-selector-zh-cn.conf	2010-04-24 14:12:44 +0000
@@ -7,11 +7,14 @@
 			<string>serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
-			<string>AR PL UMing CN</string>
-			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>DejaVu Serif</string>
 			<string>Bitstream Vera Serif</string>
-			<string>DejaVu Serif</string>
+			<string>HYSong</string>
+			<string>AR PL UMing CN</string>
+			<string>AR PL UMing HK</string>
+			<string>AR PL ShanHeiSun Uni</string>
+			<string>AR PL New Sung</string>
+			<string>WenQuanYi Bitmap Song</string>
 			<string>AR PL UKai CN</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
@@ -21,12 +24,16 @@
 			<string>sans-serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans</string>
 			<string>Bitstream Vera Sans</string>
-			<string>DejaVu Sans</string>
+			<string>WenQuanYi Micro Hei</string>
 			<string>WenQuanYi Zen Hei</string>
+			<string>Droid Sans Fallback</string>
+			<string>HYSong</string>
 			<string>AR PL UMing CN</string>
+			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
 			<string>AR PL UKai CN</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
@@ -36,12 +43,16 @@
 			<string>monospace</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans Mono</string>
 			<string>Bitstream Vera Sans Mono</string>
-			<string>DejaVu Sans Mono</string>
-			<string>WenQuanYi Zen Hei</string>
+			<string>WenQuanYi Micro Hei Mono</string>
+			<string>WenQuanYi Zen Hei Mono</string>
+			<string>Droid Sans Fallback</string>
+			<string>HYSong</string>
 			<string>AR PL UMing CN</string>
+			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
 			<string>AR PL UKai CN</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>

=== modified file 'fontconfig/69-language-selector-zh-hk.conf'
--- fontconfig/69-language-selector-zh-hk.conf	2010-03-11 21:47:00 +0000
+++ fontconfig/69-language-selector-zh-hk.conf	2010-04-24 14:12:44 +0000
@@ -7,11 +7,13 @@
 			<string>serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
-			<string>AR PL UMing HK</string>
-			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>DejaVu Serif</string>
 			<string>Bitstream Vera Serif</string>
-			<string>DejaVu Serif</string>
+			<string>AR PL UMing HK</string>
+			<string>AR PL ShanHeiSun Uni</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
+			<string>WenQuanYi Bitmap Song</string>
 			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
@@ -21,12 +23,15 @@
 			<string>sans-serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans</string>
 			<string>Bitstream Vera Sans</string>
-			<string>DejaVu Sans</string>
+			<string>WenQuanYi Micro Hei</string>
 			<string>WenQuanYi Zen Hei</string>
+			<string>Droid Sans Fallback</string>
 			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
 			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
@@ -36,12 +41,15 @@
 			<string>monospace</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans Mono</string>
 			<string>Bitstream Vera Sans Mono</string>
-			<string>DejaVu Sans Mono</string>
-			<string>WenQuanYi Zen Hei</string>
+			<string>WenQuanYi Micro Hei Mono</string>
+			<string>WenQuanYi Zen Hei Mono</string>
+			<string>Droid Sans Fallback</string>
 			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
 			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>

=== modified file 'fontconfig/69-language-selector-zh-mo.conf'
--- fontconfig/69-language-selector-zh-mo.conf	2010-03-11 21:47:00 +0000
+++ fontconfig/69-language-selector-zh-mo.conf	2010-04-24 14:12:44 +0000
@@ -7,11 +7,13 @@
 			<string>serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
-			<string>AR PL UMing HK</string>
-			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>DejaVu Serif</string>
 			<string>Bitstream Vera Serif</string>
-			<string>DejaVu Serif</string>
+			<string>AR PL UMing HK</string>
+			<string>AR PL ShanHeiSun Uni</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
+			<string>WenQuanYi Bitmap Song</string>
 			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
@@ -21,12 +23,15 @@
 			<string>sans-serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans</string>
 			<string>Bitstream Vera Sans</string>
-			<string>DejaVu Sans</string>
+			<string>WenQuanYi Micro Hei</string>
 			<string>WenQuanYi Zen Hei</string>
+			<string>Droid Sans Fallback</string>
 			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
 			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
@@ -36,12 +41,15 @@
 			<string>monospace</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans Mono</string>
 			<string>Bitstream Vera Sans Mono</string>
-			<string>DejaVu Sans Mono</string>
-			<string>WenQuanYi Zen Hei</string>
+			<string>WenQuanYi Micro Hei Mono</string>
+			<string>WenQuanYi Zen Hei Mono</string>
+			<string>Droid Sans Fallback</string>
 			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
 			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>

=== modified file 'fontconfig/69-language-selector-zh-sg.conf'
--- fontconfig/69-language-selector-zh-sg.conf	2010-03-11 21:47:00 +0000
+++ fontconfig/69-language-selector-zh-sg.conf	2010-04-24 14:12:44 +0000
@@ -7,11 +7,14 @@
 			<string>serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
-			<string>AR PL UMing CN</string>
-			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>DejaVu Serif</string>
 			<string>Bitstream Vera Serif</string>
-			<string>DejaVu Serif</string>
+			<string>HYSong</string>
+			<string>AR PL UMing CN</string>
+			<string>AR PL UMing HK</string>
+			<string>AR PL ShanHeiSun Uni</string>
+			<string>AR PL New Sung</string>
+			<string>WenQuanYi Bitmap Song</string>
 			<string>AR PL UKai CN</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
@@ -21,12 +24,16 @@
 			<string>sans-serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans</string>
 			<string>Bitstream Vera Sans</string>
-			<string>DejaVu Sans</string>
+			<string>WenQuanYi Micro Hei</string>
 			<string>WenQuanYi Zen Hei</string>
+			<string>Droid Sans Fallback</string>
+			<string>HYSong</string>
 			<string>AR PL UMing CN</string>
+			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
 			<string>AR PL UKai CN</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
@@ -36,12 +43,16 @@
 			<string>monospace</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans Mono</string>
 			<string>Bitstream Vera Sans Mono</string>
-			<string>DejaVu Sans Mono</string>
-			<string>WenQuanYi Zen Hei</string>
+			<string>WenQuanYi Micro Hei Mono</string>
+			<string>WenQuanYi Zen Hei Mono</string>
+			<string>Droid Sans Fallback</string>
+			<string>HYSong</string>
 			<string>AR PL UMing CN</string>
+			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
 			<string>AR PL UKai CN</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>

=== modified file 'fontconfig/69-language-selector-zh-tw.conf'
--- fontconfig/69-language-selector-zh-tw.conf	2010-03-11 21:47:00 +0000
+++ fontconfig/69-language-selector-zh-tw.conf	2010-04-24 14:12:44 +0000
@@ -7,12 +7,16 @@
 			<string>serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
-			<string>AR PL UMing TW</string>
-			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>DejaVu Serif</string>
 			<string>Bitstream Vera Serif</string>
-			<string>DejaVu Serif</string>
+			<string>AR PL UMing TW</string>
+			<string>AR PL UMing HK</string>
+			<string>AR PL ShanHeiSun Uni</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
+			<string>WenQuanYi Bitmap Song</string>
 			<string>AR PL UKai TW</string>
+			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
 	</match> 
@@ -21,13 +25,18 @@
 			<string>sans-serif</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans</string>
 			<string>Bitstream Vera Sans</string>
-			<string>DejaVu Sans</string>
+			<string>WenQuanYi Micro Hei</string>
 			<string>WenQuanYi Zen Hei</string>
+			<string>Droid Sans Fallback</string>
 			<string>AR PL UMing TW</string>
+			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
 			<string>AR PL UKai TW</string>
+			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
 	</match> 
@@ -36,13 +45,18 @@
 			<string>monospace</string>
 		</test>
 		<edit name="family" mode="prepend" binding="strong">
+			<string>DejaVu Sans Mono</string>
 			<string>Bitstream Vera Sans Mono</string>
-			<string>DejaVu Sans Mono</string>
-			<string>WenQuanYi Zen Hei</string>
+			<string>WenQuanYi Micro Hei Mono</string>
+			<string>WenQuanYi Zen Hei Mono</string>
+			<string>Droid Sans Fallback</string>
 			<string>AR PL UMing TW</string>
+			<string>AR PL UMing HK</string>
 			<string>AR PL ShanHeiSun Uni</string>
-			<string>WenQuanYi Bitmap Song</string>
+			<string>AR PL New Sung</string>
+			<string>HYSong</string>
 			<string>AR PL UKai TW</string>
+			<string>AR PL UKai HK</string>
 			<string>AR PL ZenKai Uni</string>
 		</edit>
 	</match> 

