From 6c5619a08575943f75d2341e1a4931ec5faf716b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 9 Sep 2006 21:32:14 -0700 Subject: [PATCH] Split much of the configuration into separate files. Renumber files Most of the remaining elements in fonts.conf have been moved to separate files. The numbering scheme for conf.d files has been documented in the README and the files have been renumbered. Config files have been validated against the DTD and a few minor errors fixed. --- conf.d/{73-autohint.conf => 10-autohint.conf} | 0 ...no-sub-pixel.conf => 10-no-sub-pixel.conf} | 0 ...b-pixel-bgr.conf => 10-sub-pixel-bgr.conf} | 0 ...b-pixel-rgb.conf => 10-sub-pixel-rgb.conf} | 0 ...pixel-vbgr.conf => 10-sub-pixel-vbgr.conf} | 0 ...pixel-vrgb.conf => 10-sub-pixel-vrgb.conf} | 0 conf.d/{73-unhinted.conf => 10-unhinted.conf} | 0 conf.d/20-lohit-gujarati.conf | 11 + ...ll-vera.conf => 20-unhint-small-vera.conf} | 0 ...5-amt-aliases.conf => 30-amt-aliases.conf} | 0 ...0-urw-aliases.conf => 30-urw-aliases.conf} | 2 +- conf.d/40-generic.conf | 66 ++++++ conf.d/49-sansserif.conf | 21 ++ conf.d/60-LohitGujarati.conf | 5 - conf.d/60-latin.conf | 42 ++++ ...nts-persian.conf => 65-fonts-persian.conf} | 0 conf.d/65-nonlatin.conf | 38 ++++ conf.d/69-unifont.conf | 24 ++ ...{76-no-bitmaps.conf => 70-no-bitmaps.conf} | 0 ...6-yes-bitmaps.conf => 70-yes-bitmaps.conf} | 0 .../{60-delicious.conf => 80-delicious.conf} | 0 conf.d/90-synthetic.conf | 64 ++++++ conf.d/Makefile.am | 55 +++-- conf.d/README | 46 +++- fonts.conf.in | 207 ------------------ 25 files changed, 344 insertions(+), 237 deletions(-) rename conf.d/{73-autohint.conf => 10-autohint.conf} (100%) rename conf.d/{70-no-sub-pixel.conf => 10-no-sub-pixel.conf} (100%) rename conf.d/{70-sub-pixel-bgr.conf => 10-sub-pixel-bgr.conf} (100%) rename conf.d/{70-sub-pixel-rgb.conf => 10-sub-pixel-rgb.conf} (100%) rename conf.d/{70-sub-pixel-vbgr.conf => 10-sub-pixel-vbgr.conf} (100%) rename conf.d/{70-sub-pixel-vrgb.conf => 10-sub-pixel-vrgb.conf} (100%) rename conf.d/{73-unhinted.conf => 10-unhinted.conf} (100%) create mode 100644 conf.d/20-lohit-gujarati.conf rename conf.d/{30-unhint-small-vera.conf => 20-unhint-small-vera.conf} (100%) rename conf.d/{15-amt-aliases.conf => 30-amt-aliases.conf} (100%) rename conf.d/{10-urw-aliases.conf => 30-urw-aliases.conf} (96%) create mode 100644 conf.d/40-generic.conf create mode 100644 conf.d/49-sansserif.conf delete mode 100644 conf.d/60-LohitGujarati.conf create mode 100644 conf.d/60-latin.conf rename conf.d/{60-fonts-persian.conf => 65-fonts-persian.conf} (100%) create mode 100644 conf.d/65-nonlatin.conf create mode 100644 conf.d/69-unifont.conf rename conf.d/{76-no-bitmaps.conf => 70-no-bitmaps.conf} (100%) rename conf.d/{76-yes-bitmaps.conf => 70-yes-bitmaps.conf} (100%) rename conf.d/{60-delicious.conf => 80-delicious.conf} (100%) create mode 100644 conf.d/90-synthetic.conf diff --git a/conf.d/73-autohint.conf b/conf.d/10-autohint.conf similarity index 100% rename from conf.d/73-autohint.conf rename to conf.d/10-autohint.conf diff --git a/conf.d/70-no-sub-pixel.conf b/conf.d/10-no-sub-pixel.conf similarity index 100% rename from conf.d/70-no-sub-pixel.conf rename to conf.d/10-no-sub-pixel.conf diff --git a/conf.d/70-sub-pixel-bgr.conf b/conf.d/10-sub-pixel-bgr.conf similarity index 100% rename from conf.d/70-sub-pixel-bgr.conf rename to conf.d/10-sub-pixel-bgr.conf diff --git a/conf.d/70-sub-pixel-rgb.conf b/conf.d/10-sub-pixel-rgb.conf similarity index 100% rename from conf.d/70-sub-pixel-rgb.conf rename to conf.d/10-sub-pixel-rgb.conf diff --git a/conf.d/70-sub-pixel-vbgr.conf b/conf.d/10-sub-pixel-vbgr.conf similarity index 100% rename from conf.d/70-sub-pixel-vbgr.conf rename to conf.d/10-sub-pixel-vbgr.conf diff --git a/conf.d/70-sub-pixel-vrgb.conf b/conf.d/10-sub-pixel-vrgb.conf similarity index 100% rename from conf.d/70-sub-pixel-vrgb.conf rename to conf.d/10-sub-pixel-vrgb.conf diff --git a/conf.d/73-unhinted.conf b/conf.d/10-unhinted.conf similarity index 100% rename from conf.d/73-unhinted.conf rename to conf.d/10-unhinted.conf diff --git a/conf.d/20-lohit-gujarati.conf b/conf.d/20-lohit-gujarati.conf new file mode 100644 index 0000000..1c29d0d --- /dev/null +++ b/conf.d/20-lohit-gujarati.conf @@ -0,0 +1,11 @@ + + + + + + + + Lohit Gujarati + false + + diff --git a/conf.d/30-unhint-small-vera.conf b/conf.d/20-unhint-small-vera.conf similarity index 100% rename from conf.d/30-unhint-small-vera.conf rename to conf.d/20-unhint-small-vera.conf diff --git a/conf.d/15-amt-aliases.conf b/conf.d/30-amt-aliases.conf similarity index 100% rename from conf.d/15-amt-aliases.conf rename to conf.d/30-amt-aliases.conf diff --git a/conf.d/10-urw-aliases.conf b/conf.d/30-urw-aliases.conf similarity index 96% rename from conf.d/10-urw-aliases.conf rename to conf.d/30-urw-aliases.conf index 10e6ce9..cf90dd5 100644 --- a/conf.d/10-urw-aliases.conf +++ b/conf.d/30-urw-aliases.conf @@ -45,7 +45,7 @@ Symbol - + Standard Symbols L diff --git a/conf.d/40-generic.conf b/conf.d/40-generic.conf new file mode 100644 index 0000000..84e85e4 --- /dev/null +++ b/conf.d/40-generic.conf @@ -0,0 +1,66 @@ + + + + + + + + Bitstream Vera Serif + DejaVu Serif + Times New Roman + Times + Nimbus Roman No9 L + Luxi Serif + Kochi Mincho + AR PL SungtiL GB + AR PL Mingti2L Big5 + ＭＳ 明朝 + Baekmuk Batang + FreeSerif + MgOpen Canonica + serif + + + + Bitstream Vera Sans + DejaVu Sans + Helvetica + Arial + Verdana + Albany AMT + Nimbus Sans L + Luxi Sans + Kochi Gothic + AR PL KaitiM GB + AR PL KaitiM Big5 + ＭＳ ゴシック + Baekmuk Dotum + SimSun + FreeSans + MgOpen Modata + sans-serif + + + + Bitstream Vera Sans Mono + DejaVu Sans Mono + Courier + Courier New + Andale Mono + Luxi Mono + Cumberland AMT + Nimbus Mono L + NSimSun + FreeMono + monospace + + diff --git a/conf.d/49-sansserif.conf b/conf.d/49-sansserif.conf new file mode 100644 index 0000000..c6209a7 --- /dev/null +++ b/conf.d/49-sansserif.conf @@ -0,0 +1,21 @@ + + + + + + + sans-serif + + + serif + + + monospace + + + sans-serif + + + diff --git a/conf.d/60-LohitGujarati.conf b/conf.d/60-LohitGujarati.conf deleted file mode 100644 index eb51f86..0000000 --- a/conf.d/60-LohitGujarati.conf +++ /dev/null @@ -1,5 +0,0 @@ - - - Lohit Gujarati - false - \ No newline at end of file diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf new file mode 100644 index 0000000..06cdd7e --- /dev/null +++ b/conf.d/60-latin.conf @@ -0,0 +1,42 @@ + + + + + serif + + Bitstream Vera Serif + DejaVu Serif + Times New Roman + Thorndale AMT + Luxi Serif + Nimbus Roman No9 L + Times + + + + sans-serif + + Bitstream Vera Sans + DejaVu Sans + Verdana + Arial + Albany AMT + Luxi Sans + Nimbus Sans L + Helvetica + + + + monospace + + Bitstream Vera Sans Mono + DejaVu Sans Mono + Andale Mono + Courier New + Cumberland AMT + Luxi Mono + Nimbus Mono L + Courier + + + diff --git a/conf.d/60-fonts-persian.conf b/conf.d/65-fonts-persian.conf similarity index 100% rename from conf.d/60-fonts-persian.conf rename to conf.d/65-fonts-persian.conf diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf new file mode 100644 index 0000000..f8dbb64 --- /dev/null +++ b/conf.d/65-nonlatin.conf @@ -0,0 +1,38 @@ + + + + + serif + + Frank Ruehl + MgOpen Canonica + Kochi Mincho + AR PL SungtiL GB + AR PL Mingti2L Big5 + ＭＳ 明朝 + Baekmuk Batang + + + + sans-serif + + Nachlieli + MgOpen Modata + Kochi Gothic + AR PL KaitiM GB + AR PL KaitiM Big5 + ＭＳ ゴシック + Baekmuk Dotum + SimSun + + + + monospace + + Miriam Mono + Kochi Gothic + AR PL KaitiM GB + Baekmuk Dotum + + + diff --git a/conf.d/69-unifont.conf b/conf.d/69-unifont.conf new file mode 100644 index 0000000..a784af9 --- /dev/null +++ b/conf.d/69-unifont.conf @@ -0,0 +1,24 @@ + + + + + serif + + FreeSerif + Code2000 + + + + sans-serif + + FreeSans + Arial Unicode MS + + + + monospace + + FreeMono + + + diff --git a/conf.d/76-no-bitmaps.conf b/conf.d/70-no-bitmaps.conf similarity index 100% rename from conf.d/76-no-bitmaps.conf rename to conf.d/70-no-bitmaps.conf diff --git a/conf.d/76-yes-bitmaps.conf b/conf.d/70-yes-bitmaps.conf similarity index 100% rename from conf.d/76-yes-bitmaps.conf rename to conf.d/70-yes-bitmaps.conf diff --git a/conf.d/60-delicious.conf b/conf.d/80-delicious.conf similarity index 100% rename from conf.d/60-delicious.conf rename to conf.d/80-delicious.conf diff --git a/conf.d/90-synthetic.conf b/conf.d/90-synthetic.conf new file mode 100644 index 0000000..63d9b89 --- /dev/null +++ b/conf.d/90-synthetic.conf @@ -0,0 +1,64 @@ + + + + + + + + + roman + + + + roman + + + + + matrix + 10.2 + 01 + + + + + + oblique + + + + false + + + + + + + + + medium + + + + medium + + + + true + + + + bold + + + diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am index 6c9f4e1..cdb3519 100644 --- a/conf.d/Makefile.am +++ b/conf.d/Makefile.am @@ -22,35 +22,48 @@ # PERFORMANCE OF THIS SOFTWARE. CONF_FILES = \ - 10-urw-aliases.conf \ - 15-amt-aliases.conf \ + README \ + 10-autohint.conf \ + 10-no-sub-pixel.conf \ + 10-sub-pixel-bgr.conf \ + 10-sub-pixel-rgb.conf \ + 10-sub-pixel-vbgr.conf \ + 10-sub-pixel-vrgb.conf \ + 10-unhinted.conf \ 20-fix-globaladvance.conf \ - 30-unhint-small-vera.conf \ + 20-lohit-gujarati.conf \ + 20-unhint-small-vera.conf \ + 30-amt-aliases.conf \ + 30-urw-aliases.conf \ + 40-generic.conf \ + 49-sansserif.conf \ 50-user.conf \ 51-local.conf \ - 60-LohitGujarati.conf \ - 60-delicious.conf \ - 60-fonts-persian.conf \ - 70-no-sub-pixel.conf \ - 70-sub-pixel-bgr.conf \ - 70-sub-pixel-rgb.conf \ - 70-sub-pixel-vbgr.conf \ - 70-sub-pixel-vrgb.conf \ - 73-autohint.conf \ - 73-unhinted.conf \ - 76-no-bitmaps.conf \ - 76-yes-bitmaps.conf + 60-latin.conf \ + 65-fonts-persian.conf \ + 65-nonlatin.conf \ + 69-unifont.conf \ + 70-no-bitmaps.conf \ + 70-yes-bitmaps.conf \ + 80-delicious.conf \ + 90-synthetic.conf CONF_LINKS = \ - 10-urw-aliases.conf \ - 15-amt-aliases.conf \ 20-fix-globaladvance.conf \ - 30-unhint-small-vera.conf \ + 20-lohit-gujarati.conf \ + 20-unhint-small-vera.conf \ + 30-amt-aliases.conf \ + 30-urw-aliases.conf \ + 40-generic.conf \ + 49-sansserif.conf \ 50-user.conf \ 51-local.conf \ - 60-LohitGujarati.conf \ - 60-delicious.conf \ - 60-fonts-persian.conf + 60-latin.conf \ + 65-fonts-persian.conf \ + 65-nonlatin.conf \ + 69-unifont.conf \ + 80-delicious.conf \ + 90-synthetic.conf EXTRA_DIST = $(CONF_FILES) diff --git a/conf.d/README b/conf.d/README index 7e6cd2c..dbcfe21 100644 --- a/conf.d/README +++ b/conf.d/README @@ -1,8 +1,48 @@ conf.d/README Each file in this directory is a fontconfig configuration file. Fontconfig -scans this directory, loading all files of the form [0-9][0-9]*, so if you -want to use any of these options, link them to a name of that form. E.g. +scans this directory, loading all files of the form [0-9][0-9]*. These files +are normally installed in ../conf.avail and then symlinked here, allowing +them to be easily installed and then enabled/disabled by adjusting the +symlinks. - $ ln -s no-bitmaps.conf 10no-bitmaps.conf +The files are loaded in numeric order, the structure of the configuration +has led to the following conventions in usage: + Files begining with: Contain: + + 00 through 09 Font directories + 10 through 19 system rendering defaults (AA, etc) + 10-autohint.conf + 10-no-sub-pixel.conf + 10-sub-pixel-bgr.conf + 10-sub-pixel-rgb.conf + 10-sub-pixel-vbgr.conf + 10-sub-pixel-vrgb.conf + 10-unhinted.conf + 20 through 29 font rendering options + 20-fix-globaladvance.conf + 20-lohit-gujarati.conf + 20-unhint-small-vera.conf + 30 through 39 family substitution + 30-urw-aliases.conf + 30-amt-aliases.conf + 40 through 49 generic identification, map family->generic + 40-generic-id.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-latin.conf + 65-fonts-persian.conf + 65-nonlatin.conf + 69-unifont.conf + 70 through 79 select font (adjust which fonts are available) + 70-no-bitmaps.conf + 70-yes-bitmaps.conf + 80 through 89 match target="scan" (modify scanned patterns) + 80-delicious.conf + 90 through 98 font synthesis + 90-synthetic.conf + diff --git a/fonts.conf.in b/fonts.conf.in index d70800e..99f2ee5 100644 --- a/fonts.conf.in +++ b/fonts.conf.in @@ -68,218 +68,11 @@ - - - - - Bitstream Vera Serif - DejaVu Serif - Times New Roman - Thorndale AMT - Times - Nimbus Roman No9 L - Luxi Serif - Kochi Mincho - AR PL SungtiL GB - AR PL Mingti2L Big5 - ＭＳ 明朝 - Baekmuk Batang - FreeSerif - MgOpen Canonica - serif - - - - Bitstream Vera Sans - DejaVu Sans - Helvetica - Arial - Verdana - Albany AMT - Nimbus Sans L - Luxi Sans - Kochi Gothic - AR PL KaitiM GB - AR PL KaitiM Big5 - ＭＳ ゴシック - Baekmuk Dotum - SimSun - FreeSans - MgOpen Modata - sans-serif - - - - Bitstream Vera Sans Mono - DejaVu Sans Mono - Courier - Courier New - Andale Mono - Luxi Mono - Cumberland AMT - Nimbus Mono L - NSimSun - FreeMono - monospace - - - - - sans-serif - - - serif - - - monospace - - - sans-serif - - - conf.d - - - serif - - Bitstream Vera Serif - DejaVu Serif - Times New Roman - Thorndale AMT - Luxi Serif - Nimbus Roman No9 L - Times - Frank Ruehl - MgOpen Canonica - Kochi Mincho - AR PL SungtiL GB - AR PL Mingti2L Big5 - ＭＳ 明朝 - Baekmuk Batang - FreeSerif - - - - sans-serif - - Bitstream Vera Sans - DejaVu Sans - Verdana - Arial - Albany AMT - Luxi Sans - Nimbus Sans L - Helvetica - Nachlieli - MgOpen Modata - Kochi Gothic - AR PL KaitiM GB - AR PL KaitiM Big5 - ＭＳ ゴシック - Baekmuk Dotum - SimSun - FreeSans - - - - monospace - - Bitstream Vera Sans Mono - DejaVu Sans Mono - Andale Mono - Courier New - Cumberland AMT - Luxi Mono - Nimbus Mono L - Courier - Miriam Mono - Kochi Gothic - AR PL KaitiM GB - Baekmuk Dotum - FreeMono - - - - - - - - - roman - - - - roman - - - - - matrix - 10.2 - 01 - - - - - - oblique - - - - false - - - - - - - - - medium - - - - medium - - - - true - - - - bold - - - -