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 (file)
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 (file)
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 (file)
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 84e85e44bbda73cc8ff4c069de92294a50592b79..3746714ccd00040e1b0b91a6f315717ba5ea4482 100644 (file)
--- 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 2d2cf2f03ebcc77905b7a5636a1df2e87ae16744..af31c0d260b834420d2d97f3194eaac712698f3a 100644 (file)
--- 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 cdb3519e87b15cda4350c1c2a619f470496fac2d..06c60147a6c091a0bdeab8b0af26d687375c374a 100644 (file)
--- 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 dbcfe2135f809089266fbbb024a2304f6c24ac03..de2be2633ebb25b5c0f9c686d0120d451074af30 100644 (file)
--- 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