[Fontconfig] fontconfig: Branch 'master' - 10 commits
Keith Packard
keithp at kemper.freedesktop.org
Mon Nov 5 15:38:56 PST 2007
conf.d/10-autohint.conf | 1
conf.d/10-no-sub-pixel.conf | 1
conf.d/10-sub-pixel-bgr.conf | 1
conf.d/10-sub-pixel-rgb.conf | 1
conf.d/10-sub-pixel-vbgr.conf | 1
conf.d/10-sub-pixel-vrgb.conf | 1
conf.d/10-unhinted.conf | 1
conf.d/20-fix-globaladvance.conf | 1
conf.d/20-lohit-gujarati.conf | 11 -
conf.d/20-unhint-small-vera.conf | 1
conf.d/25-unhint-nonlatin.conf | 227 +++++++++++++++++++++++++++++++++++++++
conf.d/30-amt-aliases.conf | 21 ---
conf.d/30-metric-aliases.conf | 211 ++++++++++++++++++++++++++++++++++++
conf.d/30-urw-aliases.conf | 28 +---
conf.d/40-generic.conf | 66 -----------
conf.d/40-nonlatin.conf | 51 ++++++++
conf.d/45-latin.conf | 56 +++++++++
conf.d/50-user.conf | 1
conf.d/51-local.conf | 1
conf.d/65-fonts-persian.conf | 1
conf.d/65-nonlatin.conf | 45 +++++++
conf.d/70-no-bitmaps.conf | 1
conf.d/70-yes-bitmaps.conf | 1
conf.d/80-delicious.conf | 1
conf.d/Makefile.am | 13 +-
conf.d/README | 37 +-----
26 files changed, 611 insertions(+), 170 deletions(-)
New commits:
commit a504f6b5394b96d2c6a24772b61705227a8e88ab
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 18:12:51 2007 -0500
Simplify/improve 30-metric-aliases.conf
diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index fa6908f..87e4493 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -8,14 +8,19 @@
Helvetica
Times
Courier
- Microsoft fonts:
- Arial
- Times New Roman
- Courier New
URW fonts:
Nimbus Sans L
Nimbus Roman No9 L
Nimbus Mono L
+
+ Microsoft fonts:
+ Arial
+ Times New Roman
+ Courier New
+ Liberation fonts:
+ Liberation Sans
+ Liberation Serif
+ Liberation Mono
StarOffice fonts:
Albany
Thorndale
@@ -24,10 +29,6 @@
Albany AMT
Thorndale AMT
Cumberland AMT
- Liberation fonts:
- Liberation Sans
- Liberation Serif
- Liberation Mono
Of these, URW fonts are design compatible with PostScrict fonts,
and the Liberation, StarOffice, and AMT ones are compatible with
@@ -35,151 +36,176 @@
We want for each of them to fallback to any of these
available, but in an order preferring similar designs
- first.
-
- We don't alias URW and Liberation fonts though, given that
- they are free and less probable to appear in documents by
- name.
+ first. We do this in three steps:
+
+ 1) Alias each specific to it's generic family.
+ eg. Liberation Sans to Arial
+
+ 2) Weak alias each generic to the other generic of its family.
+ eg. Arial to Helvetica
+
+ 3) Alias each generic to its specifics.
+ eg. Arial to Liberation Sans, Albany, and Albany AMT
-->
+<!-- Map specifics to generics -->
+
<!-- PostScript -->
- <alias>
- <family>Helvetica</family>
- <accept>
+ <alias binding="same">
<family>Nimbus Sans L</family>
+ <default>
+ <family>Helvetica</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Nimbus Roman No9 L</family>
+ <default>
+ <family>Times</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Nimbus Mono L</family>
+ <default>
+ <family>Courier</family>
+ </default>
+ </alias>
+
+
+ <!-- Microsoft -->
+ <alias binding="same">
<family>Liberation Sans</family>
- <family>Arial</family>
<family>Albany</family>
<family>Albany AMT</family>
- </accept>
+ <default>
+ <family>Arial</family>
+ </default>
</alias>
- <alias>
- <family>Times</family>
- <accept>
- <family>Nimbus Roman No9 L</family>
+ <alias binding="same">
<family>Liberation Serif</family>
- <family>Times New Roman</family>
<family>Thorndale</family>
<family>Thorndale AMT</family>
- </accept>
+ <default>
+ <family>Times New Roman</family>
+ </default>
</alias>
- <alias>
- <family>Courier</family>
- <accept>
- <family>Nimbus Mono L</family>
+ <alias binding="same">
<family>Liberation Mono</family>
- <family>Courier New</family>
<family>Cumberland</family>
<family>Cumberland AMT</family>
- </accept>
+ <default>
+ <family>Courier New</family>
+ </default>
</alias>
+<!-- Accept the other group as fallback -->
+
+
+ <!-- PostScript -->
+ <alias>
+ <family>Helvetica</family>
+ <default>
+ <family>Arial</family>
+ </default>
+ </alias>
+
+ <alias>
+ <family>Times</family>
+ <default>
+ <family>Times New Roman</family>
+ </default>
+ </alias>
+
+ <alias>
+ <family>Courier</family>
+ <default>
+ <family>Courier New</family>
+ </default>
+ </alias>
+
+
<!-- Microsoft -->
<alias>
<family>Arial</family>
- <accept>
- <family>Liberation Sans</family>
- <family>Albany</family>
- <family>Albany AMT</family>
+ <default>
<family>Helvetica</family>
- <family>Nimbus Sans L</family>
- </accept>
+ </default>
</alias>
<alias>
<family>Times New Roman</family>
- <accept>
- <family>Liberation Serif</family>
- <family>Thorndale</family>
- <family>Thorndale AMT</family>
+ <default>
<family>Times</family>
- <family>Nimbus Roman No9 L</family>
- </accept>
+ </default>
</alias>
<alias>
<family>Courier New</family>
- <accept>
- <family>Liberation Mono</family>
- <family>Cumberland</family>
- <family>Cumberland AMT</family>
+ <default>
<family>Courier</family>
- <family>Nimbus Mono L</family>
- </accept>
+ </default>
</alias>
- <!-- StarOffice -->
- <alias>
- <family>Albany</family>
- <accept>
- <family>Liberation Sans</family>
- <family>Arial</family>
- <family>Albany AMT</family>
+
+<!-- Map generics to specifics -->
+
+
+ <!-- PostScript -->
+ <alias binding="same">
<family>Helvetica</family>
+ <accept>
<family>Nimbus Sans L</family>
</accept>
</alias>
- <alias>
- <family>Thorndale</family>
- <accept>
- <family>Liberation Serif</family>
- <family>Times New Roman</family>
- <family>Thorndale AMT</family>
+ <alias binding="same">
<family>Times</family>
+ <accept>
<family>Nimbus Roman No9 L</family>
</accept>
</alias>
- <alias>
- <family>Cumberland</family>
- <accept>
- <family>Liberation Mono</family>
- <family>Courier New</family>
- <family>Cumberland AMT</family>
+ <alias binding="same">
<family>Courier</family>
+ <accept>
<family>Nimbus Mono L</family>
</accept>
</alias>
- <!-- AMT -->
- <alias>
- <family>Albany AMT</family>
+ <!-- Microsoft -->
+ <alias binding="same">
+ <family>Arial</family>
<accept>
<family>Liberation Sans</family>
- <family>Arial</family>
<family>Albany</family>
- <family>Helvetica</family>
- <family>Nimbus Sans L</family>
+ <family>Albany AMT</family>
</accept>
</alias>
- <alias>
- <family>Thorndale AMT</family>
+ <alias binding="same">
+ <family>Times New Roman</family>
<accept>
<family>Liberation Serif</family>
- <family>Times New Roman</family>
<family>Thorndale</family>
- <family>Times</family>
- <family>Nimbus Roman No9 L</family>
+ <family>Thorndale AMT</family>
</accept>
</alias>
- <alias>
- <family>Cumberland AMT</family>
+ <alias binding="same">
+ <family>Courier New</family>
<accept>
<family>Liberation Mono</family>
- <family>Courier New</family>
<family>Cumberland</family>
- <family>Courier</family>
- <family>Nimbus Mono L</family>
+ <family>Cumberland AMT</family>
</accept>
</alias>
+
</fontconfig>
commit cbff442c69bfbb6895f5033dfcda325c0508cb3f
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 17:07:36 2007 -0500
Remove list of available conf files from README.
It was redundant and out-dated.
diff --git a/conf.d/README b/conf.d/README
index 273edad..c2fb52c 100644
--- a/conf.d/README
+++ b/conf.d/README
@@ -13,38 +13,11 @@ has led to the following conventions in usage:
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
- 25-unhint-nonlatin.conf
30 through 39 family substitution
- 30-urw-aliases.conf
- 30-metric-aliases.conf
40 through 49 generic identification, map family->generic
- 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, map generic->family
- 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
-
+ 90 through 99 font synthesis
commit 0294bda4800b94828b59139e6205730c74261c40
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 17:05:36 2007 -0500
Fix documented conf-file naming format in README
diff --git a/conf.d/README b/conf.d/README
index b5b3b32..273edad 100644
--- a/conf.d/README
+++ b/conf.d/README
@@ -1,10 +1,10 @@
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]*. 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.
+scans this directory, loading all files of the form [0-9][0-9]*.conf.
+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.
The files are loaded in numeric order, the structure of the configuration
has led to the following conventions in usage:
commit 07d04da76c4009552866ae0d2f85659186ef77d6
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 17:01:44 2007 -0500
Remove 25-unhint-nonlatin.conf from default configuration by not linking it.
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index bf9ed91..7aca246 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -52,7 +52,6 @@ CONF_FILES = \
CONF_LINKS = \
20-fix-globaladvance.conf \
20-unhint-small-vera.conf \
- 25-unhint-nonlatin.conf \
30-urw-aliases.conf \
30-metric-aliases.conf \
40-nonlatin.conf \
commit 9bac30859b9b2b532b9028dc6fe1730b87e95686
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 16:46:19 2007 -0500
Oops, fix Makefile.am.
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 2a7fe28..bf9ed91 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -34,7 +34,7 @@ CONF_FILES = \
20-unhint-small-vera.conf \
25-unhint-nonlatin.conf \
30-urw-aliases.conf \
- 30-metric-aliases.conf
+ 30-metric-aliases.conf \
40-nonlatin.conf \
45-latin.conf \
49-sansserif.conf \
@@ -54,7 +54,7 @@ CONF_LINKS = \
20-unhint-small-vera.conf \
25-unhint-nonlatin.conf \
30-urw-aliases.conf \
- 30-metric-aliases.conf
+ 30-metric-aliases.conf \
40-nonlatin.conf \
45-latin.conf \
49-sansserif.conf \
commit 93b4049c9ac6283fbf05a2a414ff3b4edaef822e
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 16:43:49 2007 -0500
Remove 20-lohit-gujarati.conf. It's covered by 25-unhint-nonlatin.conf now.
diff --git a/conf.d/20-lohit-gujarati.conf b/conf.d/20-lohit-gujarati.conf
deleted file mode 100644
index 1c29d0d..0000000
--- a/conf.d/20-lohit-gujarati.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- Available Gujarti fonts look much better without hinting -->
-
- <match target="font">
- <test name="family"><string>Lohit Gujarati</string></test>
- <edit name="hinting"><bool>false</bool></edit>
- </match>
-</fontconfig>
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index e9360e0..2a7fe28 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -31,7 +31,6 @@ CONF_FILES = \
10-sub-pixel-vrgb.conf \
10-unhinted.conf \
20-fix-globaladvance.conf \
- 20-lohit-gujarati.conf \
20-unhint-small-vera.conf \
25-unhint-nonlatin.conf \
30-urw-aliases.conf \
@@ -52,7 +51,6 @@ CONF_FILES = \
CONF_LINKS = \
20-fix-globaladvance.conf \
- 20-lohit-gujarati.conf \
20-unhint-small-vera.conf \
25-unhint-nonlatin.conf \
30-urw-aliases.conf \
commit 7465091fa90753440ed775de5783387bc4fd9cc4
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 16:43:14 2007 -0500
Remove redundant/obsolete comments from conf files.
Conf files had an initial comment mentioning the files' name.
This was outdated and wrong in most cases. There's no real use in that.
diff --git a/conf.d/10-autohint.conf b/conf.d/10-autohint.conf
index 5406f4e..c597bf4 100644
--- a/conf.d/10-autohint.conf
+++ b/conf.d/10-autohint.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/autohint.conf -->
<fontconfig>
<!-- Use the Autohinter -->
<match target="font">
diff --git a/conf.d/10-no-sub-pixel.conf b/conf.d/10-no-sub-pixel.conf
index 5d64a0b..87ada4e 100644
--- a/conf.d/10-no-sub-pixel.conf
+++ b/conf.d/10-no-sub-pixel.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
diff --git a/conf.d/10-sub-pixel-bgr.conf b/conf.d/10-sub-pixel-bgr.conf
index 2aba95e..e1f64fd 100644
--- a/conf.d/10-sub-pixel-bgr.conf
+++ b/conf.d/10-sub-pixel-bgr.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
diff --git a/conf.d/10-sub-pixel-rgb.conf b/conf.d/10-sub-pixel-rgb.conf
index c4e8a42..2b49fe3 100644
--- a/conf.d/10-sub-pixel-rgb.conf
+++ b/conf.d/10-sub-pixel-rgb.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
diff --git a/conf.d/10-sub-pixel-vbgr.conf b/conf.d/10-sub-pixel-vbgr.conf
index 0cdad2a..5947650 100644
--- a/conf.d/10-sub-pixel-vbgr.conf
+++ b/conf.d/10-sub-pixel-vbgr.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
diff --git a/conf.d/10-sub-pixel-vrgb.conf b/conf.d/10-sub-pixel-vrgb.conf
index 60239e0..84481bd 100644
--- a/conf.d/10-sub-pixel-vrgb.conf
+++ b/conf.d/10-sub-pixel-vrgb.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
diff --git a/conf.d/10-unhinted.conf b/conf.d/10-unhinted.conf
index fb0b375..025ae2a 100644
--- a/conf.d/10-unhinted.conf
+++ b/conf.d/10-unhinted.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/unhinted.conf -->
<fontconfig>
<!-- Disable hinting -->
<match target="font">
diff --git a/conf.d/20-fix-globaladvance.conf b/conf.d/20-fix-globaladvance.conf
index a62162c..2a9c063 100644
--- a/conf.d/20-fix-globaladvance.conf
+++ b/conf.d/20-fix-globaladvance.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!--
Some Asian fonts misadvertise themselves as monospaced when
diff --git a/conf.d/20-unhint-small-vera.conf b/conf.d/20-unhint-small-vera.conf
index 3078119..c4ebee9 100644
--- a/conf.d/20-unhint-small-vera.conf
+++ b/conf.d/20-unhint-small-vera.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!--
The Bitstream Vera fonts have GASP entries suggesting that hinting be
diff --git a/conf.d/25-unhint-nonlatin.conf b/conf.d/25-unhint-nonlatin.conf
index d8f6cdb..943460c 100644
--- a/conf.d/25-unhint-nonlatin.conf
+++ b/conf.d/25-unhint-nonlatin.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-
<fontconfig>
<!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index 66dbd58..fa6908f 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!-- Alias similar/metric-compatible families from various sources:
diff --git a/conf.d/30-urw-aliases.conf b/conf.d/30-urw-aliases.conf
index c2c9546..6bab15b 100644
--- a/conf.d/30-urw-aliases.conf
+++ b/conf.d/30-urw-aliases.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!--
URW provides metric and shape compatible fonts for some Adobe families.
diff --git a/conf.d/50-user.conf b/conf.d/50-user.conf
index 9a38a40..3052cdc 100644
--- a/conf.d/50-user.conf
+++ b/conf.d/50-user.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.avail/50-user.conf file to configure system font access -->
<fontconfig>
<!-- Load per-user customization file -->
<include ignore_missing="yes">~/.fonts.conf</include>
diff --git a/conf.d/51-local.conf b/conf.d/51-local.conf
index d35046e..ca9fbe1 100644
--- a/conf.d/51-local.conf
+++ b/conf.d/51-local.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.avail/51-local.conf file to configure system font access -->
<fontconfig>
<!-- Load local system customization file -->
<include ignore_missing="yes">local.conf</include>
diff --git a/conf.d/65-fonts-persian.conf b/conf.d/65-fonts-persian.conf
index c897554..1a4a3ff 100644
--- a/conf.d/65-fonts-persian.conf
+++ b/conf.d/65-fonts-persian.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
<!--
fonts-persian.conf
To configure Persian fonts from The FarsiWeb Project.
diff --git a/conf.d/70-no-bitmaps.conf b/conf.d/70-no-bitmaps.conf
index e8fb6a9..6b506e8 100644
--- a/conf.d/70-no-bitmaps.conf
+++ b/conf.d/70-no-bitmaps.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
<fontconfig>
<!-- Reject bitmap fonts -->
<selectfont>
diff --git a/conf.d/70-yes-bitmaps.conf b/conf.d/70-yes-bitmaps.conf
index c539c70..c153aeb 100644
--- a/conf.d/70-yes-bitmaps.conf
+++ b/conf.d/70-yes-bitmaps.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/yes-bitmaps.conf -->
<fontconfig>
<!-- Accept bitmap fonts -->
<selectfont>
diff --git a/conf.d/80-delicious.conf b/conf.d/80-delicious.conf
index 701429b..728f50c 100644
--- a/conf.d/80-delicious.conf
+++ b/conf.d/80-delicious.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/60-delicious.conf -->
<fontconfig>
<!-- Fix-ups for Delicious family -->
commit 531a143858aa1b5c82ee20bdacc292c0a31b6cfb
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 16:40:25 2007 -0500
Use binding="same" in 30-urw-aliases.conf and remove duplicate entries.
Times, Helvetical, and Courier are already handled in 30-metric-aliases.conf.
Remove them here and add a comment instead.
diff --git a/conf.d/30-urw-aliases.conf b/conf.d/30-urw-aliases.conf
index cf90dd5..c2c9546 100644
--- a/conf.d/30-urw-aliases.conf
+++ b/conf.d/30-urw-aliases.conf
@@ -3,41 +3,30 @@
<!-- conf.d/sub-pixel.conf -->
<fontconfig>
<!--
- URW provides metric and shape compatible fonts for these 10 Adobe families.
+ URW provides metric and shape compatible fonts for some Adobe families.
+ Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
-->
- <alias>
+ <alias binding="same">
<family>Avant Garde</family>
<accept><family>URW Gothic L</family></accept>
</alias>
- <alias>
+ <alias binding="same">
<family>Bookman</family>
<accept><family>URW Bookman L</family></accept>
</alias>
- <alias>
- <family>Courier</family>
- <accept><family>Nimbus Mono L</family></accept>
- </alias>
- <alias>
- <family>Helvetica</family>
- <accept><family>Nimbus Sans L</family></accept>
- </alias>
- <alias>
+ <alias binding="same">
<family>New Century Schoolbook</family>
<accept><family>Century Schoolbook L</family></accept>
</alias>
- <alias>
+ <alias binding="same">
<family>Palatino</family>
<accept><family>URW Palladio L</family></accept>
</alias>
- <alias>
- <family>Times</family>
- <accept><family>Nimbus Roman No9 L</family></accept>
- </alias>
- <alias>
+ <alias binding="same">
<family>Zapf Chancery</family>
<accept><family>URW Chancery L</family></accept>
</alias>
- <alias>
+ <alias binding="same">
<family>Zapf Dingbats</family>
<accept><family>Dingbats</family></accept>
</alias>
commit 4b51f173c99152586db26b03752873a4b4020672
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 16:36:55 2007 -0500
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
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
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
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 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
commit 39968fb223bf2eeb5502553c8d316dc4914a32ba
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Nov 5 16:14:35 2007 -0500
Add/update config files from Fedora.
diff --git a/conf.d/25-unhint-nonlatin.conf b/conf.d/25-unhint-nonlatin.conf
new file mode 100644
index 0000000..d8f6cdb
--- /dev/null
+++ b/conf.d/25-unhint-nonlatin.conf
@@ -0,0 +1,228 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+
+<fontconfig>
+
+<!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
+
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Kochi Mincho</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Kochi Gothic</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Sazanami Mincho</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Sazanami Gothic</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Baekmuk Batang</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Baekmuk Dotum</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Baekmuk Gulim</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Baekmuk Headline</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>AR PL Mingti2L Big5</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>AR PL ShanHeiSun Uni</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>AR PL KaitiM Big5</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>AR PL ZenKai Uni</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>AR PL SungtiL GB</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>AR PL KaitiM GB</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>ZYSong18030</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <!--
+ We also need to turn off hinting for Indic fonts with a joined baseline.
+ -->
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Mukti Narrow</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Lohit Hindi</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Lohit Bengali</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Lohit Punjabi</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+<!--
+Gujarti fonts are distorted when hinting is enabled. Turn it off.
+-->
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Lohit Gujarati</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+<!--
+Disabling hinting for newly added Indic fonts (kn/or/ml/te)
+-->
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Lohit Kannada</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Lohit Oriya</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Lohit Malayalam</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>Lohit Telugu</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+<!--
+And Sinhala
+-->
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>LKLUG</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+</fontconfig>
diff --git a/conf.d/30-amt-aliases.conf b/conf.d/30-amt-aliases.conf
deleted file mode 100644
index d6df67e..0000000
--- a/conf.d/30-amt-aliases.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--
- AMT provides metric and shape compatible fonts for these three web font
- families.
- -->
- <alias>
- <family>Times New Roman</family>
- <accept><family>Thorndale AMT</family></accept>
- </alias>
- <alias>
- <family>Arial</family>
- <accept><family>Albany AMT</family></accept>
- </alias>
- <alias>
- <family>Courier New</family>
- <accept><family>Cumberland AMT</family></accept>
- </alias>
-</fontconfig>
diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
new file mode 100644
index 0000000..66dbd58
--- /dev/null
+++ b/conf.d/30-metric-aliases.conf
@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+
+ <!-- Alias similar/metric-compatible families from various sources:
+
+ PostScript fonts:
+ Helvetica
+ Times
+ Courier
+ Microsoft fonts:
+ Arial
+ Times New Roman
+ Courier New
+ URW fonts:
+ Nimbus Sans L
+ Nimbus Roman No9 L
+ Nimbus Mono L
+ StarOffice fonts:
+ Albany
+ Thorndale
+ Cumberland
+ AMT fonts:
+ Albany AMT
+ Thorndale AMT
+ Cumberland AMT
+ Liberation fonts:
+ Liberation Sans
+ Liberation Serif
+ Liberation Mono
+
+ Of these, URW fonts are design compatible with PostScrict fonts,
+ and the Liberation, StarOffice, and AMT ones are compatible with
+ Microsoft fonts.
+
+ We want for each of them to fallback to any of these
+ available, but in an order preferring similar designs
+ first.
+
+ We don't alias URW and Liberation fonts though, given that
+ they are free and less probable to appear in documents by
+ name.
+ -->
+
+ <!-- PostScript -->
+ <alias>
+ <family>Helvetica</family>
+ <accept>
+ <family>Nimbus Sans L</family>
+ <family>Liberation Sans</family>
+ <family>Arial</family>
+ <family>Albany</family>
+ <family>Albany AMT</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>Times</family>
+ <accept>
+ <family>Nimbus Roman No9 L</family>
+ <family>Liberation Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale</family>
+ <family>Thorndale AMT</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>Courier</family>
+ <accept>
+ <family>Nimbus Mono L</family>
+ <family>Liberation Mono</family>
+ <family>Courier New</family>
+ <family>Cumberland</family>
+ <family>Cumberland AMT</family>
+ </accept>
+ </alias>
+
+
+
+ <!-- Microsoft -->
+ <alias>
+ <family>Arial</family>
+ <accept>
+ <family>Liberation Sans</family>
+ <family>Albany</family>
+ <family>Albany AMT</family>
+ <family>Helvetica</family>
+ <family>Nimbus Sans L</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>Times New Roman</family>
+ <accept>
+ <family>Liberation Serif</family>
+ <family>Thorndale</family>
+ <family>Thorndale AMT</family>
+ <family>Times</family>
+ <family>Nimbus Roman No9 L</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>Courier New</family>
+ <accept>
+ <family>Liberation Mono</family>
+ <family>Cumberland</family>
+ <family>Cumberland AMT</family>
+ <family>Courier</family>
+ <family>Nimbus Mono L</family>
+ </accept>
+ </alias>
+
+
+ <!-- StarOffice -->
+ <alias>
+ <family>Albany</family>
+ <accept>
+ <family>Liberation Sans</family>
+ <family>Arial</family>
+ <family>Albany AMT</family>
+ <family>Helvetica</family>
+ <family>Nimbus Sans L</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>Thorndale</family>
+ <accept>
+ <family>Liberation Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Times</family>
+ <family>Nimbus Roman No9 L</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>Cumberland</family>
+ <accept>
+ <family>Liberation Mono</family>
+ <family>Courier New</family>
+ <family>Cumberland AMT</family>
+ <family>Courier</family>
+ <family>Nimbus Mono L</family>
+ </accept>
+ </alias>
+
+
+ <!-- AMT -->
+ <alias>
+ <family>Albany AMT</family>
+ <accept>
+ <family>Liberation Sans</family>
+ <family>Arial</family>
+ <family>Albany</family>
+ <family>Helvetica</family>
+ <family>Nimbus Sans L</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>Thorndale AMT</family>
+ <accept>
+ <family>Liberation Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale</family>
+ <family>Times</family>
+ <family>Nimbus Roman No9 L</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>Cumberland AMT</family>
+ <accept>
+ <family>Liberation Mono</family>
+ <family>Courier New</family>
+ <family>Cumberland</family>
+ <family>Courier</family>
+ <family>Nimbus Mono L</family>
+ </accept>
+ </alias>
+
+</fontconfig>
diff --git a/conf.d/40-generic.conf b/conf.d/40-generic.conf
index 84e85e4..3746714 100644
--- a/conf.d/40-generic.conf
+++ b/conf.d/40-generic.conf
@@ -12,17 +12,23 @@
<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>FreeSerif</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>
<!--
@@ -31,10 +37,12 @@
<alias>
<family>Bitstream Vera Sans</family>
<family>DejaVu Sans</family>
- <family>Helvetica</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>
@@ -43,8 +51,11 @@
<family>ï¼ï¼³ ゴシック</family>
<family>Baekmuk Dotum</family>
<family>SimSun</family>
- <family>FreeSans</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>
<!--
@@ -53,13 +64,16 @@
<alias>
<family>Bitstream Vera Sans Mono</family>
<family>DejaVu Sans Mono</family>
- <family>Courier</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>
diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index 2d2cf2f..af31c0d 100644
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -12,8 +12,22 @@
<family>Kochi Mincho</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
+ <family>AR PL Zenkai Uni</family>
<family>ï¼ï¼³ 明æœ</family>
+ <family>ZYSong18030</family>
<family>Baekmuk Batang</family>
+ <family>KacstQura</family>
+ <family>Frank Ruehl CLM</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
</prefer>
</alias>
<alias>
@@ -28,9 +42,25 @@
<family>Kochi Gothic</family>
<family>AR PL KaitiM GB</family>
<family>AR PL KaitiM Big5</family>
+ <family>AR PL ShanHeiSun Uni</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
<family>ï¼ï¼³ ゴシック</family>
+ <family>ZYSong18030</family>
<family>Baekmuk Dotum</family>
+ <family>Baekmuk Gulim</family>
<family>SimSun</family>
+ <family>KacstQura</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
</prefer>
</alias>
<alias>
@@ -43,7 +73,22 @@
<family>Sazanami Gothic</family>
<family>Kochi Gothic</family>
<family>AR PL KaitiM GB</family>
+ <family>AR PL ShanHeiSun Uni</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>ZYSong18030</family>
<family>Baekmuk Dotum</family>
+ <family>Baekmuk Gulim</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
</prefer>
</alias>
</fontconfig>
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index cdb3519..06c6014 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -33,8 +33,9 @@ CONF_FILES = \
20-fix-globaladvance.conf \
20-lohit-gujarati.conf \
20-unhint-small-vera.conf \
- 30-amt-aliases.conf \
+ 25-unhint-nonlatin.conf \
30-urw-aliases.conf \
+ 30-metric-aliases.conf
40-generic.conf \
49-sansserif.conf \
50-user.conf \
@@ -52,8 +53,9 @@ CONF_LINKS = \
20-fix-globaladvance.conf \
20-lohit-gujarati.conf \
20-unhint-small-vera.conf \
- 30-amt-aliases.conf \
+ 25-unhint-nonlatin.conf \
30-urw-aliases.conf \
+ 30-metric-aliases.conf
40-generic.conf \
49-sansserif.conf \
50-user.conf \
diff --git a/conf.d/README b/conf.d/README
index dbcfe21..de2be26 100644
--- a/conf.d/README
+++ b/conf.d/README
@@ -24,9 +24,10 @@ has led to the following conventions in usage:
20-fix-globaladvance.conf
20-lohit-gujarati.conf
20-unhint-small-vera.conf
+ 25-unhint-nonlatin.conf
30 through 39 family substitution
30-urw-aliases.conf
- 30-amt-aliases.conf
+ 30-metric-aliases.conf
40 through 49 generic identification, map family->generic
40-generic-id.conf
49-sansserif.conf
More information about the Fontconfig
mailing list