Split 40-generic.conf into 40-nonlatin.conf and 45-latin.conf

diff --git a/conf.d/40-generic.conf b/conf.d/40-generic.conf
deleted file mode 100644 (file)
index 3746714..0000000
--- a/conf.d/40-generic.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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>Bitstream Vera Serif</family>
-               <family>DejaVu Serif</family>
-               <family>Liberation Serif</family>
-               <family>Times New Roman</family>
-               <family>Times</family>
-               <family>Nimbus Roman No9 L</family>
-               <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>
-<!--
-  Sans-serif faces
- -->
-       <alias>
-               <family>Bitstream Vera Sans</family>
-               <family>DejaVu Sans</family>
-               <family>Liberation Sans</family>
-               <family>Arial</family>
-               <family>Helvetica</family>
-               <family>Verdana</family>
-               <family>Albany AMT</family>
-               <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>
-<!--
-  Monospace faces
- -->
-       <alias>
-               <family>Bitstream Vera Sans Mono</family>
-               <family>DejaVu Sans Mono</family>
-               <family>Liberation Mono</family>
-               <family>Courier New</family>
-               <family>Courier</family>
-               <family>Andale Mono</family>
-               <family>Luxi Mono</family>
-               <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/40-nonlatin.conf b/conf.d/40-nonlatin.conf
new file mode 100644 (file)
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/45-latin.conf b/conf.d/45-latin.conf
new file mode 100644 (file)
index 0000000..83b2ac2
--- /dev/null
+++ b/conf.d/45-latin.conf
@@ -0,0 +1,56 @@
+<?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>Bitstream Vera Serif</family>
+               <family>DejaVu Serif</family>
+               <family>Liberation Serif</family>
+               <family>Times New Roman</family>
+               <family>Times</family>
+               <family>Nimbus Roman No9 L</family>
+               <family>Luxi Serif</family>
+               <family>Thorndale AMT</family>
+               <family>Thorndale</family>
+               <default><family>serif</family></default>
+       </alias>
+<!--
+  Sans-serif faces
+ -->
+       <alias>
+               <family>Bitstream Vera Sans</family>
+               <family>DejaVu Sans</family>
+               <family>Liberation Sans</family>
+               <family>Arial</family>
+               <family>Helvetica</family>
+               <family>Verdana</family>
+               <family>Albany AMT</family>
+               <family>Albany</family>
+               <family>Nimbus Sans L</family>
+               <family>Luxi Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+<!--
+  Monospace faces
+ -->
+       <alias>
+               <family>Bitstream Vera Sans Mono</family>
+               <family>DejaVu Sans Mono</family>
+               <family>Liberation Mono</family>
+               <family>Courier New</family>
+               <family>Courier</family>
+               <family>Andale Mono</family>
+               <family>Luxi Mono</family>
+               <family>Cumberland AMT</family>
+               <family>Cumberland</family>
+               <family>Nimbus Mono L</family>
+               <default><family>monospace</family></default>
+       </alias>
+</fontconfig>

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 06c60147a6c091a0bdeab8b0af26d687375c374a..e9360e01293d9028339a1f2bab2889acace86f94 100644 (file)
--- 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 de2be2633ebb25b5c0f9c686d0120d451074af30..b5b3b32e5ab0c6531f66afee17b0c9ace008656b 100644 (file)
--- 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