*** xc/extras/fontconfig/fonts.conf.in._orig_	2003-11-10 20:29:56.000000000 +0900
--- xc/extras/fontconfig/fonts.conf.in	2003-11-10 20:51:45.000000000 +0900
***************
*** 72,119 ****
    Serif faces
   -->
  	<alias>
- 		<family>Bitstream Vera Serif</family>
  		<family>Times</family>
- 		<family>Times New Roman</family>
  		<family>Nimbus Roman No9 L</family>
  		<family>Luxi Serif</family>
! 		<family>Kochi Mincho</family>
! 		<family>AR PL SungtiL GB</family>
! 		<family>AR PL Mingti2L Big5</family>
! 		<family>Baekmuk Batang</family>			
  		<default><family>serif</family></default>
  	</alias>
  <!--
    Sans-serif faces
   -->
  	<alias>
- 		<family>Bitstream Vera Sans</family>
  		<family>Helvetica</family>
- 		<family>Arial</family>
- 		<family>Verdana</family>
  		<family>Nimbus Sans L</family>
  		<family>Luxi Sans</family>
! 		<family>Kochi Gothic</family>
! 		<family>AR PL KaitiM GB</family>
! 		<family>AR PL KaitiM Big5</family>
! 		<family>Baekmuk Dotum</family>
! 		<family>SimSun</family>
  		<default><family>sans-serif</family></default>
  	</alias>
  <!--
    Monospace faces
   -->
   	<alias>
! 		<family>Bitstream Vera Sans Mono</family>
  		<family>Courier</family>
  		<family>Courier New</family>
- 		<family>Andale Mono</family>
  		<family>Luxi Mono</family>
! 		<family>Nimbus Mono L</family>
  		<family>NSimSun</family>
  		<default><family>monospace</family></default>
  	</alias>
  <!--
    If the font still has no generic name, add sans-serif
   -->
  	<match target="pattern">
--- 72,125 ----
    Serif faces
   -->
  	<alias>
  		<family>Times</family>
  		<family>Nimbus Roman No9 L</family>
+ 		<family>Times New Roman</family>
+ 		<family>LX P Mincho</family>
  		<family>Luxi Serif</family>
! 		<family>Bitstream Vera Serif</family>
  		<default><family>serif</family></default>
  	</alias>
  <!--
    Sans-serif faces
   -->
  	<alias>
  		<family>Helvetica</family>
  		<family>Nimbus Sans L</family>
+ 		<family>Arial</family>
+ 		<family>LX P Gothic</family>
  		<family>Luxi Sans</family>
! 		<family>Verdana</family>
! 		<family>Bitstream Vera Sans</family>
  		<default><family>sans-serif</family></default>
  	</alias>
  <!--
    Monospace faces
   -->
   	<alias>
! 		<family>LX Gothic</family>
! 		<family>FS Gothic</family>
  		<family>Courier</family>
+ 		<family>Nimbus Mono L</family>
  		<family>Courier New</family>
  		<family>Luxi Mono</family>
! 		<family>Andale Mono</family>
  		<family>NSimSun</family>
+ 		<family>Bitstream Vera Sans Mono</family>
  		<default><family>monospace</family></default>
  	</alias>
  <!--
+ do not use hint for Japanese fonts.
+  -->
+ 	<match target="font">
+ 		<test name="lang" compare="contains">
+ 				<string>ja</string>
+ 		</test>
+ 		<edit name="hinting" mode="assign">
+ 			<bool>false</bool>
+ 		</edit>
+ 	</match>
+ <!--
    If the font still has no generic name, add sans-serif
   -->
  	<match target="pattern">
***************
*** 264,307 ****
  	<alias>
  		<family>serif</family>
  		<prefer>
! 			<family>Bitstream Vera Serif</family>
! 			<family>Times New Roman</family>
  			<family>Nimbus Roman No9 L</family>
  			<family>Luxi Serif</family>
! 			<family>Times</family>
! 			<family>Kochi Mincho</family>
! 			<family>AR PL SungtiL GB</family>
! 			<family>AR PL Mingti2L Big5</family>
! 			<family>Baekmuk Batang</family>			
  		</prefer>
  	</alias>
  	<alias>
  		<family>sans-serif</family>
  		<prefer>
! 			<family>Bitstream Vera Sans</family>
! 			<family>Verdana</family>
  			<family>Nimbus Sans L</family>
- 			<family>Luxi Sans</family>
  			<family>Arial</family>
! 			<family>Helvetica</family>
! 			<family>Kochi Gothic</family>
! 			<family>AR PL KaitiM GB</family>
! 			<family>AR PL KaitiM Big5</family>
! 			<family>Baekmuk Dotum</family>
! 			<family>SimSun</family>
  		</prefer>
  	</alias>
  	<alias>
  		<family>monospace</family>
  		<prefer>
! 			<family>Bitstream Vera Sans Mono</family>
! 			<family>Andale Mono</family>
  			<family>Courier New</family>
  			<family>Luxi Mono</family>
! 			<family>Nimbus Mono L</family>
! 			<family>Kochi Gothic</family>
! 			<family>AR PL KaitiM GB</family>
! 			<family>Baekmuk Dotum</family>
  		</prefer>
  	</alias>
  
--- 270,302 ----
  	<alias>
  		<family>serif</family>
  		<prefer>
! 			<family>Times</family>
  			<family>Nimbus Roman No9 L</family>
+ 			<family>Times New Roman</family>
  			<family>Luxi Serif</family>
! 			<family>Bitstream Vera Serif</family>
  		</prefer>
  	</alias>
  	<alias>
  		<family>sans-serif</family>
  		<prefer>
! 			<family>Helvetica</family>
  			<family>Nimbus Sans L</family>
  			<family>Arial</family>
! 			<family>Luxi Sans</family>
! 			<family>Verdana</family>
! 			<family>Bitstream Vera Sans</family>
  		</prefer>
  	</alias>
  	<alias>
  		<family>monospace</family>
  		<prefer>
! 			<family>Courier</family>
! 			<family>Nimbus Mono L</family>
  			<family>Courier New</family>
  			<family>Luxi Mono</family>
! 			<family>Andale Mono</family>
! 			<family>Bitstream Vera Sans Mono</family>
  		</prefer>
  	</alias>
  
