From 4b51f173c99152586db26b03752873a4b4020672 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 5 Nov 2007 16:36:55 -0500
Subject: [PATCH] Split 40-generic.conf into 40-nonlatin.conf and 45-latin.conf

---
 conf.d/40-nonlatin.conf                   | 51 +++++++++++++++++++++++
 conf.d/{40-generic.conf => 45-latin.conf} | 24 -----------
 conf.d/Makefile.am                        |  6 ++-
 conf.d/README                             |  5 ++-
 4 files changed, 58 insertions(+), 28 deletions(-)
 create mode 100644 conf.d/40-nonlatin.conf
 rename conf.d/{40-generic.conf => 45-latin.conf} (63%)

diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
new file mode 100644
index 0000000..5f64169
--- /dev/null
+++ b/conf.d/40-nonlatin.conf
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+	<alias>
+		<family>Kochi Mincho</family>
+		<family>AR PL SungtiL GB</family>
+		<family>AR PL Mingti2L Big5</family>
+		<family>ＭＳ 明朝</family>
+		<family>Baekmuk Batang</family>
+		<family>MgOpen Canonica</family>
+		<family>Sazanami Mincho</family>
+		<family>AR PL ZenKai Uni</family>
+		<family>ZYSong18030</family>
+		<family>FreeSerif</family>
+		<default><family>serif</family></default>
+	</alias>
+<!--
+  Sans-serif faces
+ -->
+	<alias>
+		<family>Kochi Gothic</family>
+		<family>AR PL KaitiM GB</family>
+		<family>AR PL KaitiM Big5</family>
+		<family>ＭＳ ゴシック</family>
+		<family>Baekmuk Dotum</family>
+		<family>SimSun</family>
+		<family>MgOpen Modata</family>
+		<family>Sazanami Gothic</family>
+		<family>AR PL ShanHeiSun Uni</family>
+		<family>ZYSong18030</family>
+		<family>FreeSans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+<!--
+  Monospace faces
+ -->
+ 	<alias>
+		<family>NSimSun</family>
+		<family>ZYSong18030</family>
+		<family>FreeMono</family>
+		<default><family>monospace</family></default>
+	</alias>
+</fontconfig>
diff --git a/conf.d/40-generic.conf b/conf.d/45-latin.conf
similarity index 63%
rename from conf.d/40-generic.conf
rename to conf.d/45-latin.conf
index 3746714..83b2ac2 100644
--- a/conf.d/40-generic.conf
+++ b/conf.d/45-latin.conf
@@ -19,16 +19,6 @@
 		<family>Luxi Serif</family>
 		<family>Thorndale AMT</family>
 		<family>Thorndale</family>
-		<family>Kochi Mincho</family>
-		<family>AR PL SungtiL GB</family>
-		<family>AR PL Mingti2L Big5</family>
-		<family>ＭＳ 明朝</family>
-		<family>Baekmuk Batang</family>
-		<family>MgOpen Canonica</family>
-		<family>Sazanami Mincho</family>
-		<family>AR PL ZenKai Uni</family>
-		<family>ZYSong18030</family>
-		<family>FreeSerif</family>
 		<default><family>serif</family></default>
 	</alias>
 <!--
@@ -45,17 +35,6 @@
 		<family>Albany</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>ＭＳ ゴシック</family>
-		<family>Baekmuk Dotum</family>
-		<family>SimSun</family>
-		<family>MgOpen Modata</family>
-		<family>Sazanami Gothic</family>
-		<family>AR PL ShanHeiSun Uni</family>
-		<family>ZYSong18030</family>
-		<family>FreeSans</family>
 		<default><family>sans-serif</family></default>
 	</alias>
 <!--
@@ -72,9 +51,6 @@
 		<family>Cumberland AMT</family>
 		<family>Cumberland</family>
 		<family>Nimbus Mono L</family>
-		<family>NSimSun</family>
-		<family>ZYSong18030</family>
-		<family>FreeMono</family>
 		<default><family>monospace</family></default>
 	</alias>
 </fontconfig>
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 06c6014..e9360e0 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -36,7 +36,8 @@ CONF_FILES = \
 	25-unhint-nonlatin.conf \
 	30-urw-aliases.conf \
 	30-metric-aliases.conf
-	40-generic.conf \
+	40-nonlatin.conf \
+	45-latin.conf \
 	49-sansserif.conf \
 	50-user.conf \
 	51-local.conf \
@@ -56,7 +57,8 @@ CONF_LINKS = \
 	25-unhint-nonlatin.conf \
 	30-urw-aliases.conf \
 	30-metric-aliases.conf
-	40-generic.conf \
+	40-nonlatin.conf \
+	45-latin.conf \
 	49-sansserif.conf \
 	50-user.conf \
 	51-local.conf \
diff --git a/conf.d/README b/conf.d/README
index de2be26..b5b3b32 100644
--- a/conf.d/README
+++ b/conf.d/README
@@ -29,12 +29,13 @@ has led to the following conventions in usage:
  	30-urw-aliases.conf
 	30-metric-aliases.conf
  40 through 49		generic identification, map family->generic
- 	40-generic-id.conf
+ 	40-nonlatin.conf
+ 	45-latin.conf
 	49-sansserif.conf
  50 through 59		alternate config file loading
  	50-user.conf	Load ~/.fonts.conf
 	51-local.conf	Load local.conf
- 60 through 69		generic aliases
+ 60 through 69		generic aliases, map generic->family
  	60-latin.conf
 	65-fonts-persian.conf
 	65-nonlatin.conf
-- 
2.39.2