From c26344ecfc1d3b85671f5d948a10d5cc27c21c2f Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Sat, 3 May 2008 19:26:09 -0700
Subject: [PATCH] Merge some of Mandriva configuration into upstream
 configuration. Bug 13247

This is merging some parts of Mandriva fontconfig changes, mostly adding and
documenting fonts to common aliases.
---
 conf.d/25-unhint-nonlatin.conf | 20 +++++++++
 conf.d/60-latin.conf           |  3 ++
 conf.d/65-nonlatin.conf        | 81 +++++++++++++++++++++++++++++++---
 conf.d/69-unifont.conf         |  4 ++
 4 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/conf.d/25-unhint-nonlatin.conf b/conf.d/25-unhint-nonlatin.conf
index 943460c..3a00055 100644
--- a/conf.d/25-unhint-nonlatin.conf
+++ b/conf.d/25-unhint-nonlatin.conf
@@ -224,4 +224,24 @@ And Sinhala
 		</edit>
 	</match>
 
+<!--
+Old(?) Indic fonts
+-->
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Likhan</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Raghindi</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+
 </fontconfig>
diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf
index 1311e54..62bf0d4 100644
--- a/conf.d/60-latin.conf
+++ b/conf.d/60-latin.conf
@@ -24,6 +24,9 @@
 			<family>Luxi Sans</family>
 			<family>Nimbus Sans L</family>
 			<family>Helvetica</family>
+			<family>Lucida Sans Unicode</family>
+			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
 		</prefer>
 	</alias>
 	<alias>
diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index af31c0d..ba9239a 100644
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -4,7 +4,34 @@
 	<alias>
 		<family>serif</family>
 		<prefer>
-			<family>Frank Ruehl</family>
+			<family>Artsounk</family> <!-- armenian -->
+			<family>BPG UTF8 M</family> <!-- georgian -->
+			<family>Phaisarn</family> <!-- thai -->
+			<family>Phaisarn98</family> <!-- thai -->
+			<family>Norasi</family> <!-- thai -->
+			<family>Frank Ruehl</family> <!-- hebrew -->
+			<family>Dror</family>  <!-- hebrew -->
+			<family>JG LaoTimes</family>  <!-- lao -->
+			<family>Saysettha Unicode</family>  <!-- lao -->
+			<family>Pigiarniq</family> <!-- canadian syllabics -->
+			<family>B Davat</family> <!-- arabic (fa) -->
+			<family>B Compset</family>  <!-- arabic (fa) -->
+			<family>Kacst-Qr</family> <!-- arabic (ar) -->
+			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+			<family>Raghindi</family> <!-- devanagari -->
+			<family>Mukti Narrow</family> <!-- bengali -->
+			<family>malayalam</family> <!-- malayalam -->
+			<family>Sampige</family> <!-- kannada -->
+			<family>padmaa</family> <!-- gujarati -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus P Gothic</family> <!-- han (ja) -->
+			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
 			<family>MgOpen Canonica</family>
 			<family>Sazanami Mincho</family>
 			<family>IPAMonaMincho</family>
@@ -33,7 +60,35 @@
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>Nachlieli</family>
+			<family>Nachlieli</family> <!-- hebrew -->
+			<family>Lucida Sans Unicode</family>
+			<family>Yudit Unicode</family>
+			<family>Kerkis</family> <!-- greek -->
+			<family>ArmNet Helvetica</family> <!-- armenian -->
+			<family>Artsounk</family> <!-- armenian -->
+			<family>BPG UTF8 M</family> <!-- georgian -->
+			<family>Norasi</family> <!-- thai -->
+			<family>Saysettha Unicode</family> <!-- lao? -->
+			<family>JG Lao Old Arial</family> <!-- lao -->
+			<family>GF Zemen Unicode</family> <!-- ethiopic -->
+			<family>Pigiarniq</family> <!-- canadian syllabics -->
+			<family>B Davat</family> <!-- arabic (fa) -->
+			<family>B Compset</family> <!-- arabic (fa) -->
+			<family>Kacst-Qr</family> <!-- arabic (ar) -->
+			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+			<family>Raghindi</family> <!-- devanagari -->
+			<family>Mukti Narrow</family> <!-- bengali -->
+			<family>malayalam</family> <!-- malayalam -->
+			<family>Sampige</family> <!-- kannada -->
+			<family>padmaa</family> <!-- gujarati -->
+			<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>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
 			<family>MgOpen Modata</family>
 			<family>VL Gothic</family>
 			<family>IPAMonaGothic</family>
@@ -46,10 +101,10 @@
  			<family>AR PL SungtiL GB</family>
  			<family>AR PL Mingti2L Big5</family>
 			<family>ＭＳ ゴシック</family>
-			<family>ZYSong18030</family>
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>TSCu_Paranar</family> <!-- tamil -->
 			<family>Baekmuk Dotum</family>
  			<family>Baekmuk Gulim</family>
-			<family>SimSun</family>
  			<family>KacstQura</family>
 			<family>Lohit Bengali</family>
  			<family>Lohit Gujarati</family>
@@ -66,19 +121,31 @@
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>Miriam Mono</family>
+			<family>Miriam Mono</family> <!-- hebrew -->
 			<family>VL Gothic</family>
 			<family>IPAMonaGothic</family>
 			<family>IPAGothic</family>
 			<family>Sazanami Gothic</family>
 			<family>Kochi Gothic</family>
 			<family>AR PL KaitiM GB</family>
- 			<family>AR PL ShanHeiSun Uni</family>
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus Gothic</family> <!-- han (ja) -->
+			<family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>MingLiu</family> <!-- han (zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
+			<family>HanyiSong</family> <!-- han (zh-cn) -->
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
-			<family>ZYSong18030</family>
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>Baekmuk Batang</family> <!-- hangul -->
 			<family>Baekmuk Dotum</family>
 			<family>Baekmuk Gulim</family>
+			<family>Courier MonoThai</family> <!-- thai -->
+			<family>Hasida</family> <!-- hebrew -->
+			<family>Mitra Mono</family> <!-- bengali -->
+			<family>GF Zemen Unicode</family> <!-- ethiopic -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
 			<family>Lohit Bengali</family>
 			<family>Lohit Gujarati</family>
 			<family>Lohit Hindi</family>
diff --git a/conf.d/69-unifont.conf b/conf.d/69-unifont.conf
index a784af9..177dec5 100644
--- a/conf.d/69-unifont.conf
+++ b/conf.d/69-unifont.conf
@@ -6,6 +6,7 @@
 		<prefer>
 			<family>FreeSerif</family>
 			<family>Code2000</family>
+			<family>Code2001</family> <!-- plane1 and beyond -->
 		</prefer>
 	</alias>
 	<alias>
@@ -13,6 +14,9 @@
 		<prefer>
 			<family>FreeSans</family>
 			<family>Arial Unicode MS</family>
+			<family>Arial Unicode</family>
+			<family>Code2000</family> <!-- almost everything; serif actually -->
+			<family>Code2001</family> <!-- plane1 and beyond -->
 		</prefer>
 	</alias>
 	<alias>
-- 
2.39.5