saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 2a4ff6e57ecb82f335df8b265362d933172d2a7e..22c555b376f2e00c5c76de810d03c6059b6c3755 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -342,6 +342,10 @@ maybe chmod 0644 'filesystems'
 maybe chmod 0755 'fonts'
 maybe chmod 0755 'fonts/conf.avail'
 maybe chmod 0644 'fonts/conf.avail/10-autohint.conf'
+maybe chmod 0644 'fonts/conf.avail/10-hinting-full.conf'
+maybe chmod 0644 'fonts/conf.avail/10-hinting-medium.conf'
+maybe chmod 0644 'fonts/conf.avail/10-hinting-none.conf'
+maybe chmod 0644 'fonts/conf.avail/10-hinting-slight.conf'
 maybe chmod 0644 'fonts/conf.avail/10-no-sub-pixel.conf'
 maybe chmod 0644 'fonts/conf.avail/10-scale-bitmap-fonts.conf'
 maybe chmod 0644 'fonts/conf.avail/10-sub-pixel-bgr.conf'

diff --git a/fonts/conf.avail/10-hinting-full.conf b/fonts/conf.avail/10-hinting-full.conf
new file mode 100644 (file)
index 0000000..27d8229
--- /dev/null
+++ b/fonts/conf.avail/10-hinting-full.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintfull</const></edit>
+  </match>
+</fontconfig>

diff --git a/fonts/conf.avail/10-hinting-medium.conf b/fonts/conf.avail/10-hinting-medium.conf
new file mode 100644 (file)
index 0000000..e34ab5b
--- /dev/null
+++ b/fonts/conf.avail/10-hinting-medium.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintmedium</const></edit>
+  </match>
+</fontconfig>

diff --git a/fonts/conf.avail/10-hinting-none.conf b/fonts/conf.avail/10-hinting-none.conf
new file mode 100644 (file)
index 0000000..0b3810d
--- /dev/null
+++ b/fonts/conf.avail/10-hinting-none.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintnone</const></edit>
+  </match>
+</fontconfig>

diff --git a/fonts/conf.avail/10-hinting-slight.conf b/fonts/conf.avail/10-hinting-slight.conf
new file mode 100644 (file)
index 0000000..c244ac0
--- /dev/null
+++ b/fonts/conf.avail/10-hinting-slight.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintslight</const></edit>
+  </match>
+</fontconfig>

diff --git a/fonts/conf.avail/10-scale-bitmap-fonts.conf b/fonts/conf.avail/10-scale-bitmap-fonts.conf
index e3bcd46cdc01ba359c468fde5fd31fb8aebf591a..b4e9cb4f233c9179a7a6361ddf82c45033aadc6e 100644 (file)
--- a/fonts/conf.avail/10-scale-bitmap-fonts.conf
+++ b/fonts/conf.avail/10-scale-bitmap-fonts.conf
@@ -2,8 +2,13 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
+<!--
+  If font is bitmap, calculate scale factor.
+  Note that color bitmap fonts have scalable=true, while
+  non-color ones have scalable=false.  Both groups have outline=false.
+  -->
 <match target="font">
-  <test name="scalable" compare="eq">
+  <test name="outline" compare="eq">
     <bool>false</bool>
   </test>
   <edit name="pixelsizefixupfactor" mode="assign">
@@ -13,10 +18,20 @@
     </divide>
   </edit>
 </match>
+<!--
+  For non-scalable bitmap fonts (ie. non-color), skip
+  minor scaling if hinting is enabled.
+  -->
 <match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
   <test name="scalable" compare="eq">
     <bool>false</bool>
   </test>
+  <test name="hinting" compare="eq">
+    <bool>true</bool>
+  </test>
   <edit name="scalingnotneeded" mode="assign">
     <and>
       <less>
@@ -30,20 +45,7 @@
     </and>
   </edit>
 </match>
-<!--
-  So far we determined the scale factor.  Now, check and if
-  scaling is NOT desirable, just reset the scale factor to 1.0.
-  -->
 <match target="font">
-  <test name="scalable" compare="eq">
-    <bool>false</bool>
-  </test>
-  <test name="pixelsize" target="pattern" compare="less">
-    <double>64</double>
-  </test>
-  <test name="hinting" compare="eq">
-    <bool>true</bool>
-  </test>
   <test name="scalingnotneeded" compare="eq">
     <bool>true</bool>
   </test>
@@ -55,7 +57,7 @@
   If we *are* going to scale, go ahead and do it.
   -->
 <match target="font">
-  <test name="scalable" compare="eq">
+  <test name="outline" compare="eq">
     <bool>false</bool>
   </test>
   <test name="pixelsizefixupfactor" compare="not_eq">

diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf
index 08c8ba328f5cb418cb15001ec25b43742c305bbd..1f0778d68c463818c0d6de4fee03d6b2213dc120 100644 (file)
--- a/fonts/conf.avail/30-metric-aliases.conf
+++ b/fonts/conf.avail/30-metric-aliases.conf
@@ -6,17 +6,17 @@
 
 Alias similar/metric-compatible families from various sources:
 
-PostScript fonts:       URW fonts:            GUST fonts:        Windows fonts:
-======================  ====================  =================  ==================
-Helvetica               Nimbus Sans L         TeX Gyre Heros
-Helvetica Condensed                           TeX Gyre Heros Cn
-Times                   Nimbus Roman No9 L    TeX Gyre Termes
-Courier                 Nimbus Mono L         TeX Gyre Cursor
-ITC Avant Garde Gothic  URW Gothic L          TeX Gyre Adventor
-ITC Bookman             URW Bookman L         TeX Gyre Bonum     Bookman Old Style
-ITC Zapf Chancery       URW Chancery L        TeX Gyre Chorus
-Palatino                URW Palladio L        TeX Gyre Pagella   Palatino Linotype
-New Century Schoolbook  Century Schoolbook L  TeX Gyre Schola    Century Schoolbook
+PostScript fonts:       URW fonts:           GUST fonts:        Windows fonts:
+======================  ==================  =================  ==================
+Helvetica               Nimbus Sans         TeX Gyre Heros
+Helvetica Narrow        Nimbus Sans Narrow  TeX Gyre Heros Cn
+Times                   Nimbus Roman        TeX Gyre Termes
+Courier                 Nimbus Mono PS      TeX Gyre Cursor
+ITC Avant Garde Gothic  URW Gothic          TeX Gyre Adventor
+ITC Bookman             URW Bookman         TeX Gyre Bonum     Bookman Old Style
+ITC Zapf Chancery       Z003                TeX Gyre Chorus
+Palatino                P052                TeX Gyre Pagella   Palatino Linotype
+New Century Schoolbook  C059                TeX Gyre Schola    Century Schoolbook
 
 Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fonts:  AMT fonts:
 ================  ======================  =======================  =================  ==============
@@ -56,6 +56,13 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
+       <alias binding="same">
+         <family>Nimbus Sans</family>
+         <default>
+         <family>Helvetica</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Heros</family>
          <default>
@@ -63,10 +70,17 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
+       <alias binding="same">
+         <family>Nimbus Sans Narrow</family>
+         <default>
+         <family>Helvetica Narrow</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Heros Cn</family>
          <default>
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
          </default>
        </alias>
 
@@ -77,15 +91,19 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
-<!--
-     Due to Bug#73291, commented out those lines until the broken font are fixed.
+       <alias binding="same">
+         <family>Nimbus Roman</family>
+         <default>
+         <family>Times</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Termes</family>
          <default>
          <family>Times</family>
          </default>
        </alias>
--->
 
        <alias binding="same">
          <family>Nimbus Mono L</family>
@@ -94,6 +112,20 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
+       <alias binding="same">
+         <family>Nimbus Mono</family>
+         <default>
+         <family>Courier</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Nimbus Mono PS</family>
+         <default>
+         <family>Courier</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Cursor</family>
          <default>
@@ -115,6 +147,13 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
+       <alias binding="same">
+         <family>URW Gothic</family>
+         <default>
+         <family>ITC Avant Garde Gothic</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Adventor</family>
          <default>
@@ -136,6 +175,20 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
+       <alias binding="same">
+         <family>Bookman URW</family>
+         <default>
+         <family>ITC Bookman</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>URW Bookman</family>
+         <default>
+         <family>ITC Bookman</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Bonum</family>
          <default>
@@ -164,6 +217,20 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
+       <alias binding="same">
+         <family>Chancery URW</family>
+         <default>
+         <family>ITC Zapf Chancery</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Z003</family>
+         <default>
+         <family>ITC Zapf Chancery</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Chorus</family>
          <default>
@@ -178,6 +245,20 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
+       <alias binding="same">
+         <family>Palladio URW</family>
+         <default>
+         <family>Palatino</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>P052</family>
+         <default>
+         <family>Palatino</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Pagella</family>
          <default>
@@ -199,6 +280,20 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
+       <alias binding="same">
+         <family>Century SchoolBook URW</family>
+         <default>
+         <family>New Century Schoolbook</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>C059</family>
+         <default>
+         <family>New Century Schoolbook</family>
+         </default>
+       </alias>
+
        <alias binding="same">
          <family>TeX Gyre Schola</family>
          <default>
@@ -345,7 +440,7 @@ but in an order preferring similar designs first.  We do this in three steps:
        </alias>
 
        <alias>
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
          <default>
          <family>Arial Narrow</family>
          </default>
@@ -377,7 +472,7 @@ but in an order preferring similar designs first.  We do this in three steps:
        <alias>
          <family>Arial Narrow</family>
          <default>
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
          </default>
        </alias>
 
@@ -404,24 +499,24 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>Helvetica</family>
          <accept>
          <family>TeX Gyre Heros</family>
+         <family>Nimbus Sans</family>
          <family>Nimbus Sans L</family>
          </accept>
        </alias>
 
        <alias binding="same">
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
          <accept>
          <family>TeX Gyre Heros Cn</family>
+         <family>Nimbus Sans Narrow</family>
          </accept>
        </alias>
 
        <alias binding="same">
          <family>Times</family>
          <accept>
-<!--
-     Due to Bug#73291, commented out this line until the broken font are fixed.
          <family>TeX Gyre Termes</family>
--->
+         <family>Nimbus Roman</family>
          <family>Nimbus Roman No9 L</family>
          </accept>
        </alias>
@@ -430,6 +525,8 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>Courier</family>
          <accept>
          <family>TeX Gyre Cursor</family>
+         <family>Nimbus Mono PS</family>
+         <family>Nimbus Mono</family>
          <family>Nimbus Mono L</family>
          </accept>
        </alias>
@@ -438,6 +535,7 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>ITC Avant Garde Gothic</family>
          <accept>
          <family>TeX Gyre Adventor</family>
+         <family>URW Gothic</family>
          <family>URW Gothic L</family>
          </accept>
        </alias>
@@ -447,6 +545,8 @@ but in an order preferring similar designs first.  We do this in three steps:
          <accept>
          <family>Bookman Old Style</family>
          <family>TeX Gyre Bonum</family>
+         <family>URW Bookman</family>
+         <family>Bookman URW</family>
          <family>URW Bookman L</family>
          </accept>
        </alias>
@@ -455,6 +555,8 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>ITC Zapf Chancery</family>
          <accept>
          <family>TeX Gyre Chorus</family>
+         <family>Z003</family>
+         <family>Chancery URW</family>
          <family>URW Chancery L</family>
          </accept>
        </alias>
@@ -464,6 +566,8 @@ but in an order preferring similar designs first.  We do this in three steps:
          <accept>
          <family>Palatino Linotype</family>
          <family>TeX Gyre Pagella</family>
+         <family>P052</family>
+         <family>Palladio URW</family>
          <family>URW Palladio L</family>
          </accept>
        </alias>
@@ -473,6 +577,8 @@ but in an order preferring similar designs first.  We do this in three steps:
          <accept>
          <family>Century Schoolbook</family>
          <family>TeX Gyre Schola</family>
+         <family>C059</family>
+         <family>Century SchoolBook URW</family>
          <family>Century Schoolbook L</family>
          </accept>
        </alias>

diff --git a/fonts/conf.avail/30-urw-aliases.conf b/fonts/conf.avail/30-urw-aliases.conf
index e0d45da8760c656d32f0e9ed2d4e73b3d5fc7645..cfde071fbffc74796ad022f814be3580a7629d22 100644 (file)
--- a/fonts/conf.avail/30-urw-aliases.conf
+++ b/fonts/conf.avail/30-urw-aliases.conf
@@ -7,16 +7,25 @@
   -->
        <alias binding="same">
          <family>Zapf Dingbats</family>
-         <accept><family>Dingbats</family></accept>
+         <accept>
+           <family>D050000L</family>
+           <family>Dingbats</family>
+         </accept>
        </alias>
        <alias binding="same">
          <family>ITC Zapf Dingbats</family>
-         <accept><family>Dingbats</family></accept>
+         <accept>
+           <family>D050000L</family>
+           <family>Dingbats</family>
+         </accept>
        </alias>
        <match target="pattern">
          <test name="family" compare="eq" ignore-blanks="true">
            <string>Symbol</string>
          </test>
+         <edit name="family" mode="append" binding="same">
+           <string>Standard Symbols PS</string>
+         </edit>
          <edit name="family" mode="append" binding="same">
            <string>Standard Symbols L</string>
          </edit>

diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf
index aa62ed42e7fb1a13f665be37562fbd3e2933dcca..c6696f8d6f24213dbeb36d76b36b686cd5d5f32a 100644 (file)
--- a/fonts/conf.avail/45-latin.conf
+++ b/fonts/conf.avail/45-latin.conf
@@ -13,24 +13,32 @@
                <family>Bitstream Vera Serif</family>
                <default><family>serif</family></default>
        </alias>
+       <alias>
+               <family>Cambria</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Constantia</family>
+               <default><family>serif</family></default>
+       </alias>
        <alias>
                <family>DejaVu Serif</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Liberation Serif</family>
+               <family>Elephant</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Times New Roman</family>
+               <family>Garamond</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Times</family>
+               <family>Georgia</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Nimbus Roman No9 L</family>
+               <family>Liberation Serif</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
@@ -38,151 +46,227 @@
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Thorndale AMT</family>
+               <family>MS Serif</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Thorndale</family>
+               <family>Nimbus Roman No9 L</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Georgia</family>
+               <family>Nimbus Roman</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Garamond</family>
+               <family>Palatino Linotype</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Palatino Linotype</family>
+               <family>Thorndale AMT</family>
                <default><family>serif</family></default>
        </alias>
        <alias>
-               <family>Trebuchet MS</family>
+               <family>Thorndale</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Times New Roman</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Times</family>
                <default><family>serif</family></default>
        </alias>
 <!--
   Sans-serif faces
  -->
        <alias>
-               <family>Bitstream Vera Sans</family>
+               <family>Albany AMT</family>
                <default><family>sans-serif</family></default>
        </alias>
        <alias>
-               <family>DejaVu Sans</family>
+               <family>Albany</family>
                <default><family>sans-serif</family></default>
        </alias>
        <alias>
-               <family>Liberation Sans</family>
+               <family>Arial Unicode MS</family>
                <default><family>sans-serif</family></default>
        </alias>
        <alias>
                <family>Arial</family>
                <default><family>sans-serif</family></default>
        </alias>
+       <alias>
+               <family>Bitstream Vera Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Britannic</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Calibri</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Candara</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Century Gothic</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Corbel</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>DejaVu Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
        <alias>
                <family>Helvetica</family>
                <default><family>sans-serif</family></default>
        </alias>
        <alias>
-               <family>Verdana</family>
+               <family>Haettenschweiler</family>
                <default><family>sans-serif</family></default>
        </alias>
        <alias>
-               <family>Albany AMT</family>
+               <family>Liberation Sans</family>
                <default><family>sans-serif</family></default>
        </alias>
        <alias>
-               <family>Albany</family>
+               <family>MS Sans Serif</family>
                <default><family>sans-serif</family></default>
        </alias>
        <alias>
                <family>Nimbus Sans L</family>
                <default><family>sans-serif</family></default>
        </alias>
+       <alias>
+               <family>Nimbus Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
        <alias>
                <family>Luxi Sans</family>
                <default><family>sans-serif</family></default>
        </alias>
+       <alias>
+               <family>Tahoma</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Trebuchet MS</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Twentieth Century</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Verdana</family>
+               <default><family>sans-serif</family></default>
+       </alias>
 <!--
   Monospace faces
  -->
+       <alias>
+               <family>Andale Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
        <alias>
                <family>Bitstream Vera Sans Mono</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>DejaVu Sans Mono</family>
+               <family>Consolas</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>Liberation Mono</family>
+               <family>Courier New</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>Inconsolata</family>
+               <family>Courier</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>Courier New</family>
+               <family>Cumberland AMT</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>Courier</family>
+               <family>Cumberland</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>Andale Mono</family>
+               <family>DejaVu Sans Mono</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>Luxi Mono</family>
+               <family>Fixedsys</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>Cumberland AMT</family>
+               <family>Inconsolata</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
-               <family>Cumberland</family>
+               <family>Liberation Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Luxi Mono</family>
                <default><family>monospace</family></default>
        </alias>
        <alias>
                <family>Nimbus Mono L</family>
                <default><family>monospace</family></default>
        </alias>
+       <alias>
+               <family>Nimbus Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Nimbus Mono PS</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Terminal</family>
+               <default><family>monospace</family></default>
+       </alias>
 <!--
   Fantasy faces
  -->
-       <alias>
-               <family>Impact</family>
+       <alias>
+               <family>Bauhaus Std</family>
                <default><family>fantasy</family></default>
        </alias>
        <alias>
-               <family>Copperplate Gothic Std</family>
+               <family>Cooper Std</family>
                <default><family>fantasy</family></default>
        </alias>
        <alias>
-               <family>Cooper Std</family>
+               <family>Copperplate Gothic Std</family>
                <default><family>fantasy</family></default>
        </alias>
        <alias>
-               <family>Bauhaus Std</family>
+               <family>Impact</family>
                <default><family>fantasy</family></default>
        </alias>
 <!--
   Cursive faces
   -->
        <alias>
-               <family>ITC Zapf Chancery Std</family>
+               <family>Comic Sans MS</family>
                <default><family>cursive</family></default>
        </alias>
        <alias>
-               <family>Zapfino</family>
+               <family>ITC Zapf Chancery Std</family>
                <default><family>cursive</family></default>
        </alias>
        <alias>
-               <family>Comic Sans MS</family>
+               <family>Zapfino</family>
                <default><family>cursive</family></default>
        </alias>
 

diff --git a/fonts/conf.avail/60-latin.conf b/fonts/conf.avail/60-latin.conf
index dc1205f52ad9422cb7e1f427c3f7032439b5b20b..65063bbe9df0410707d8c6f3da7855b5a09b97ac 100644 (file)
--- a/fonts/conf.avail/60-latin.conf
+++ b/fonts/conf.avail/60-latin.conf
@@ -4,43 +4,50 @@
        <alias>
                <family>serif</family>
                <prefer>
+                       <family>Liberation Serif</family>
                        <family>DejaVu Serif</family>
-                       <family>Bitstream Vera Serif</family>
                        <family>Times New Roman</family>
-                       <family>Thorndale AMT</family>
                        <family>Luxi Serif</family>
                        <family>Nimbus Roman No9 L</family>
+                       <family>Nimbus Roman</family>
                        <family>Times</family>
+                       <family>Thorndale AMT</family>
+                       <family>Bitstream Vera Serif</family>
                </prefer>
        </alias>
        <alias>
                <family>sans-serif</family>
                <prefer>
+                       <family>Liberation Sans</family>
                        <family>DejaVu Sans</family>
-                       <family>Bitstream Vera Sans</family>
+                       <family>Arial</family>
                        <family>Luxi Sans</family>
                        <family>Nimbus Sans L</family>
-                       <family>Arial</family>
-                       <family>Albany AMT</family>
+                       <family>Nimbus Sans</family>
                        <family>Helvetica</family>
-                       <family>Verdana</family>
                        <family>Lucida Sans Unicode</family>
                        <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+                       <family>Verdana</family>
                        <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
+                       <family>Albany AMT</family>
+                       <family>Bitstream Vera Sans</family>
                </prefer>
        </alias>
        <alias>
                <family>monospace</family>
                <prefer>
+                       <family>Liberation Mono</family>
                        <family>DejaVu Sans Mono</family>
-                       <family>Bitstream Vera Sans Mono</family>
                        <family>Inconsolata</family>
-                       <family>Luxi Mono</family>
-                       <family>Nimbus Mono L</family>
                        <family>Andale Mono</family>
                        <family>Courier New</family>
-                       <family>Cumberland AMT</family>
+                       <family>Luxi Mono</family>
+                       <family>Nimbus Mono L</family>
+                       <family>Nimbus Mono</family>
+                       <family>Nimbus Mono PS</family>
                        <family>Courier</family>
+                       <family>Cumberland AMT</family>
+                       <family>Bitstream Vera Sans Mono</family>
                </prefer>
        </alias>
 <!--
@@ -61,6 +68,7 @@
        <alias>
                <family>cursive</family>
                <prefer>
+                       <family>Comic Neue</family>
                        <family>ITC Zapf Chancery Std</family>
                        <family>Zapfino</family>
                        <family>Comic Sans MS</family>

diff --git a/fonts/conf.d/10-hinting-slight.conf b/fonts/conf.d/10-hinting-slight.conf
new file mode 120000 (symlink)
index 0000000..8206fa0
--- /dev/null
+++ b/fonts/conf.d/10-hinting-slight.conf
@@ -0,0 +1 @@
+/etc/fonts/conf.avail/10-hinting-slight.conf
\ No newline at end of file

diff --git a/fonts/conf.d/10-scale-bitmap-fonts.conf b/fonts/conf.d/10-scale-bitmap-fonts.conf
index 56049bc6c8590233ecba6fd637e4fece13ac859e..c3ca696badbf2bdc3783719224f47cf09c143e3f 120000 (symlink)
--- a/fonts/conf.d/10-scale-bitmap-fonts.conf
+++ b/fonts/conf.d/10-scale-bitmap-fonts.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
\ No newline at end of file
+../conf.avail/10-scale-bitmap-fonts.conf
\ No newline at end of file

diff --git a/fonts/conf.d/20-unhint-small-vera.conf b/fonts/conf.d/20-unhint-small-vera.conf
index 8a25f8b1037afb60617edcee92d460fc2ffc2e9c..56c5b8fa91fe58027bccce3e61a708ae1c3497f0 120000 (symlink)
--- a/fonts/conf.d/20-unhint-small-vera.conf
+++ b/fonts/conf.d/20-unhint-small-vera.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/20-unhint-small-vera.conf
\ No newline at end of file
+../conf.avail/20-unhint-small-vera.conf
\ No newline at end of file

diff --git a/fonts/conf.d/30-metric-aliases.conf b/fonts/conf.d/30-metric-aliases.conf
index 70c8dafd405e7a3e57fde517eff94cc3d5473eb5..6809157c84684f2ebf8dabc76924cdb6bdabd0be 120000 (symlink)
--- a/fonts/conf.d/30-metric-aliases.conf
+++ b/fonts/conf.d/30-metric-aliases.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/30-metric-aliases.conf
\ No newline at end of file
+../conf.avail/30-metric-aliases.conf
\ No newline at end of file

diff --git a/fonts/conf.d/30-urw-aliases.conf b/fonts/conf.d/30-urw-aliases.conf
index 956075e9c88647a57b58c7cdd12f1e79cc61600d..227e03d257c3c8da317b04dea837d1f5ee24ab04 120000 (symlink)
--- a/fonts/conf.d/30-urw-aliases.conf
+++ b/fonts/conf.d/30-urw-aliases.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/30-urw-aliases.conf
\ No newline at end of file
+../conf.avail/30-urw-aliases.conf
\ No newline at end of file

diff --git a/fonts/conf.d/40-nonlatin.conf b/fonts/conf.d/40-nonlatin.conf
index 927011731a4987f8f1187d0cc84f0bad32cf5dd2..efb8230a105d81f061d894faf4cccb5efd95a81e 120000 (symlink)
--- a/fonts/conf.d/40-nonlatin.conf
+++ b/fonts/conf.d/40-nonlatin.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/40-nonlatin.conf
\ No newline at end of file
+../conf.avail/40-nonlatin.conf
\ No newline at end of file

diff --git a/fonts/conf.d/45-latin.conf b/fonts/conf.d/45-latin.conf
index 4488ebb593cc9883737f135cda87380c4b479ddb..c4009055e4dc011b40ef33bf15386d797426723c 120000 (symlink)
--- a/fonts/conf.d/45-latin.conf
+++ b/fonts/conf.d/45-latin.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/45-latin.conf
\ No newline at end of file
+../conf.avail/45-latin.conf
\ No newline at end of file

diff --git a/fonts/conf.d/49-sansserif.conf b/fonts/conf.d/49-sansserif.conf
index 4b035b7377cb60187cef46354e0194928e990e32..0262faa29aa08954af9a9d1acbcd66f46e947c61 120000 (symlink)
--- a/fonts/conf.d/49-sansserif.conf
+++ b/fonts/conf.d/49-sansserif.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/49-sansserif.conf
\ No newline at end of file
+../conf.avail/49-sansserif.conf
\ No newline at end of file

diff --git a/fonts/conf.d/50-user.conf b/fonts/conf.d/50-user.conf
index 1222f4fe8aae3cbfdf0d9b50188e84b0e2eb13cf..967e33e7f79a142c21071f9b7a8c68046f2275e7 120000 (symlink)
--- a/fonts/conf.d/50-user.conf
+++ b/fonts/conf.d/50-user.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/50-user.conf
\ No newline at end of file
+../conf.avail/50-user.conf
\ No newline at end of file

diff --git a/fonts/conf.d/51-local.conf b/fonts/conf.d/51-local.conf
index 47b25831f07abb108c1499074537a105ebcc06fb..58fc31312e38a3110149ef4f2ff311973b4671e7 120000 (symlink)
--- a/fonts/conf.d/51-local.conf
+++ b/fonts/conf.d/51-local.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/51-local.conf
\ No newline at end of file
+../conf.avail/51-local.conf
\ No newline at end of file

diff --git a/fonts/conf.d/60-latin.conf b/fonts/conf.d/60-latin.conf
index 545fd8814d62c4ac402944fe059f532f21c2276e..4827df39b05b659921c7361244ff510bbadaeadc 120000 (symlink)
--- a/fonts/conf.d/60-latin.conf
+++ b/fonts/conf.d/60-latin.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/60-latin.conf
\ No newline at end of file
+../conf.avail/60-latin.conf
\ No newline at end of file

diff --git a/fonts/conf.d/65-fonts-persian.conf b/fonts/conf.d/65-fonts-persian.conf
index 426d03544ce38b2a0779da6eb16d9f452230963f..7f72bfec653a49753259cbe04ce90d088c5c77cb 120000 (symlink)
--- a/fonts/conf.d/65-fonts-persian.conf
+++ b/fonts/conf.d/65-fonts-persian.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/65-fonts-persian.conf
\ No newline at end of file
+../conf.avail/65-fonts-persian.conf
\ No newline at end of file

diff --git a/fonts/conf.d/65-nonlatin.conf b/fonts/conf.d/65-nonlatin.conf
index 778097e3a5ba979de51a0412557579e3f524af9e..d99e17af4b43dc23f3e2a21f933345293c3d6217 120000 (symlink)
--- a/fonts/conf.d/65-nonlatin.conf
+++ b/fonts/conf.d/65-nonlatin.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/65-nonlatin.conf
\ No newline at end of file
+../conf.avail/65-nonlatin.conf
\ No newline at end of file

diff --git a/fonts/conf.d/69-unifont.conf b/fonts/conf.d/69-unifont.conf
index 3cbf9ef8ac0332f148ee2e052e1067bb2b7ddf15..7ba1b65ce413c666002ac005c78dc01ab0815536 120000 (symlink)
--- a/fonts/conf.d/69-unifont.conf
+++ b/fonts/conf.d/69-unifont.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/69-unifont.conf
\ No newline at end of file
+../conf.avail/69-unifont.conf
\ No newline at end of file

diff --git a/fonts/conf.d/80-delicious.conf b/fonts/conf.d/80-delicious.conf
index 2abc80a85d04125a50cb87eee6a10e1aac2e2f47..22d677070fe8497ac359392f2cdbbb9917c21f1f 120000 (symlink)
--- a/fonts/conf.d/80-delicious.conf
+++ b/fonts/conf.d/80-delicious.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/80-delicious.conf
\ No newline at end of file
+../conf.avail/80-delicious.conf
\ No newline at end of file

diff --git a/fonts/conf.d/90-synthetic.conf b/fonts/conf.d/90-synthetic.conf
index 1d1af1fed5f142c14e4d69c91fb80e3377b15ce7..a25f312a39824275f2bd6afd030f6fe7cf1e95f6 120000 (symlink)
--- a/fonts/conf.d/90-synthetic.conf
+++ b/fonts/conf.d/90-synthetic.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/90-synthetic.conf
\ No newline at end of file
+../conf.avail/90-synthetic.conf
\ No newline at end of file

diff --git a/fonts/fonts.conf b/fonts/fonts.conf
index 2530eef054ef694527ec82de80def4bf135b99bb..a1e4b53c2ca8c5936955f3b7095f6689bfb5b0a0 100644 (file)
--- a/fonts/fonts.conf
+++ b/fonts/fonts.conf
@@ -78,72 +78,6 @@
        <cachedir>~/.fontconfig</cachedir>
 
        <config>
-<!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-               <blank>
-                       <int>0x0020</int>       <!-- SPACE -->
-                       <int>0x00A0</int>       <!-- NO-BREAK SPACE -->
-                       <int>0x00AD</int>       <!-- SOFT HYPHEN -->
-                       <int>0x034F</int>       <!-- COMBINING GRAPHEME JOINER -->
-                       <int>0x0600</int>       <!-- ARABIC NUMBER SIGN -->
-                       <int>0x0601</int>       <!-- ARABIC SIGN SANAH -->
-                       <int>0x0602</int>       <!-- ARABIC FOOTNOTE MARKER -->
-                       <int>0x0603</int>       <!-- ARABIC SIGN SAFHA -->
-                       <int>0x06DD</int>       <!-- ARABIC END OF AYAH -->
-                       <int>0x070F</int>       <!-- SYRIAC ABBREVIATION MARK -->
-                       <int>0x115F</int>       <!-- HANGUL CHOSEONG FILLER -->
-                       <int>0x1160</int>       <!-- HANGUL JUNGSEONG FILLER -->
-                       <int>0x1680</int>       <!-- OGHAM SPACE MARK -->
-                       <int>0x17B4</int>       <!-- KHMER VOWEL INHERENT AQ -->
-                       <int>0x17B5</int>       <!-- KHMER VOWEL INHERENT AA -->
-                       <int>0x180E</int>       <!-- MONGOLIAN VOWEL SEPARATOR -->
-                       <int>0x2000</int>       <!-- EN QUAD -->
-                       <int>0x2001</int>       <!-- EM QUAD -->
-                       <int>0x2002</int>       <!-- EN SPACE -->
-                       <int>0x2003</int>       <!-- EM SPACE -->
-                       <int>0x2004</int>       <!-- THREE-PER-EM SPACE -->
-                       <int>0x2005</int>       <!-- FOUR-PER-EM SPACE -->
-                       <int>0x2006</int>       <!-- SIX-PER-EM SPACE -->
-                       <int>0x2007</int>       <!-- FIGURE SPACE -->
-                       <int>0x2008</int>       <!-- PUNCTUATION SPACE -->
-                       <int>0x2009</int>       <!-- THIN SPACE -->
-                       <int>0x200A</int>       <!-- HAIR SPACE -->
-                       <int>0x200B</int>       <!-- ZERO WIDTH SPACE -->
-                       <int>0x200C</int>       <!-- ZERO WIDTH NON-JOINER -->
-                       <int>0x200D</int>       <!-- ZERO WIDTH JOINER -->
-                       <int>0x200E</int>       <!-- LEFT-TO-RIGHT MARK -->
-                       <int>0x200F</int>       <!-- RIGHT-TO-LEFT MARK -->
-                       <int>0x2028</int>       <!-- LINE SEPARATOR -->
-                       <int>0x2029</int>       <!-- PARAGRAPH SEPARATOR -->
-                       <int>0x202A</int>       <!-- LEFT-TO-RIGHT EMBEDDING -->
-                       <int>0x202B</int>       <!-- RIGHT-TO-LEFT EMBEDDING -->
-                       <int>0x202C</int>       <!-- POP DIRECTIONAL FORMATTING -->
-                       <int>0x202D</int>       <!-- LEFT-TO-RIGHT OVERRIDE -->
-                       <int>0x202E</int>       <!-- RIGHT-TO-LEFT OVERRIDE -->
-                       <int>0x202F</int>       <!-- NARROW NO-BREAK SPACE -->
-                       <int>0x205F</int>       <!-- MEDIUM MATHEMATICAL SPACE -->
-                       <int>0x2060</int>       <!-- WORD JOINER -->
-                       <int>0x2061</int>       <!-- FUNCTION APPLICATION -->
-                       <int>0x2062</int>       <!-- INVISIBLE TIMES -->
-                       <int>0x2063</int>       <!-- INVISIBLE SEPARATOR -->
-                       <int>0x206A</int>       <!-- INHIBIT SYMMETRIC SWAPPING -->
-                       <int>0x206B</int>       <!-- ACTIVATE SYMMETRIC SWAPPING -->
-                       <int>0x206C</int>       <!-- INHIBIT ARABIC FORM SHAPING -->
-                       <int>0x206D</int>       <!-- ACTIVATE ARABIC FORM SHAPING -->
-                       <int>0x206E</int>       <!-- NATIONAL DIGIT SHAPES -->
-                       <int>0x206F</int>       <!-- NOMINAL DIGIT SHAPES -->
-                       <int>0x2800</int>       <!-- BRAILLE PATTERN BLANK -->
-                       <int>0x3000</int>       <!-- IDEOGRAPHIC SPACE -->
-                       <int>0x3164</int>       <!-- HANGUL FILLER -->
-                       <int>0xFEFF</int>       <!-- ZERO WIDTH NO-BREAK SPACE -->
-                       <int>0xFFA0</int>       <!-- HALFWIDTH HANGUL FILLER -->
-                       <int>0xFFF9</int>       <!-- INTERLINEAR ANNOTATION ANCHOR -->
-                       <int>0xFFFA</int>       <!-- INTERLINEAR ANNOTATION SEPARATOR -->
-                       <int>0xFFFB</int>       <!-- INTERLINEAR ANNOTATION TERMINATOR -->
-               </blank>
 <!--
   Rescan configuration every 30 seconds when FcFontSetList is called
  -->