Merge remote-tracking branch 'origin/released'

1 files changed, 142 insertions, 1 deletions

diff --git a/fontconfig/conf.d/40-nonlatin.conf b/fontconfig/conf.d/40-nonlatin.conf
index a875db08c..1208a6ebf 100644
--- a/fontconfig/conf.d/40-nonlatin.conf
+++ b/fontconfig/conf.d/40-nonlatin.conf
@@ -11,23 +11,81 @@
  -->
 	<alias>
 		<family>Nazli</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Lotoos</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Mitra</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Ferdosi</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Badr</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Zar</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Titr</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Jadid</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Kochi Mincho</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL SungtiL GB</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL Mingti2L Big5</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>ＭＳ 明朝</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>NanumMyeongjo</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>UnBatang</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Baekmuk Batang</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>MgOpen Canonica</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Sazanami Mincho</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL ZenKai Uni</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>ZYSong18030</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>FreeSerif</family>
 		<default><family>serif</family></default>
 	</alias>
@@ -36,33 +94,104 @@
  -->
 	<alias>
 		<family>Arshia</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Elham</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Farnaz</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Nasim</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Sina</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Roya</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Koodak</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Terafik</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Kochi Gothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL KaitiM GB</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL KaitiM Big5</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>ＭＳ ゴシック</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>NanumGothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>UnDotum</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Baekmuk Dotum</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>SimSun</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>MgOpen Modata</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Sazanami Gothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL ShanHeiSun Uni</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>ZYSong18030</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>FreeSans</family>
 		<default><family>sans-serif</family></default>
 	</alias>
 <!--
   Monospace faces
  -->
- 	<alias>
+	<alias>
 		<family>NSimSun</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>ZYSong18030</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>NanumGothicCoding</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>FreeMono</family>
 		<default><family>monospace</family></default>
 	</alias>
@@ -72,8 +201,17 @@
  -->
 	<alias>
 		<family>Homa</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Kamran</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Fantezi</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Tabassom</family>
 		<default><family>fantasy</family></default>
 	</alias>
@@ -83,6 +221,9 @@
  -->
 	<alias>
 		<family>IranNastaliq</family>
+		<default><family>cursive</family></default>
+	</alias>
+	<alias>
 		<family>Nafees Nastaleeq</family>
 		<default><family>cursive</family></default>
 	</alias>