From 56d34b58527b8356d582c522fccc36eb1e06d864 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 7 Sep 2017 11:12:49 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .etckeeper                                  |   4 +
 fonts/conf.avail/10-hinting-full.conf       |  13 ++
 fonts/conf.avail/10-hinting-medium.conf     |  13 ++
 fonts/conf.avail/10-hinting-none.conf       |  13 ++
 fonts/conf.avail/10-hinting-slight.conf     |  13 ++
 fonts/conf.avail/10-scale-bitmap-fonts.conf |  32 +++--
 fonts/conf.avail/30-metric-aliases.conf     | 148 ++++++++++++++++---
 fonts/conf.avail/30-urw-aliases.conf        |  13 +-
 fonts/conf.avail/45-latin.conf              | 150 +++++++++++++++-----
 fonts/conf.avail/60-latin.conf              |  28 ++--
 fonts/conf.d/10-hinting-slight.conf         |   1 +
 fonts/conf.d/10-scale-bitmap-fonts.conf     |   2 +-
 fonts/conf.d/20-unhint-small-vera.conf      |   2 +-
 fonts/conf.d/30-metric-aliases.conf         |   2 +-
 fonts/conf.d/30-urw-aliases.conf            |   2 +-
 fonts/conf.d/40-nonlatin.conf               |   2 +-
 fonts/conf.d/45-latin.conf                  |   2 +-
 fonts/conf.d/49-sansserif.conf              |   2 +-
 fonts/conf.d/50-user.conf                   |   2 +-
 fonts/conf.d/51-local.conf                  |   2 +-
 fonts/conf.d/60-latin.conf                  |   2 +-
 fonts/conf.d/65-fonts-persian.conf          |   2 +-
 fonts/conf.d/65-nonlatin.conf               |   2 +-
 fonts/conf.d/69-unifont.conf                |   2 +-
 fonts/conf.d/80-delicious.conf              |   2 +-
 fonts/conf.d/90-synthetic.conf              |   2 +-
 fonts/fonts.conf                            |  66 ---------
 27 files changed, 362 insertions(+), 162 deletions(-)
 create mode 100644 fonts/conf.avail/10-hinting-full.conf
 create mode 100644 fonts/conf.avail/10-hinting-medium.conf
 create mode 100644 fonts/conf.avail/10-hinting-none.conf
 create mode 100644 fonts/conf.avail/10-hinting-slight.conf
 create mode 120000 fonts/conf.d/10-hinting-slight.conf

diff --git a/.etckeeper b/.etckeeper
index 2a4ff6e..22c555b 100755
--- 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
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
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
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
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 e3bcd46..b4e9cb4 100644
--- 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 08c8ba3..1f0778d 100644
--- 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 e0d45da..cfde071 100644
--- 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 aa62ed4..c6696f8 100644
--- 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 dc1205f..65063bb 100644
--- 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
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 56049bc..c3ca696 120000
--- 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 8a25f8b..56c5b8f 120000
--- 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 70c8daf..6809157 120000
--- 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 956075e..227e03d 120000
--- 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 9270117..efb8230 120000
--- 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 4488ebb..c400905 120000
--- 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 4b035b7..0262faa 120000
--- 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 1222f4f..967e33e 120000
--- 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 47b2583..58fc313 120000
--- 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 545fd88..4827df3 120000
--- 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 426d035..7f72bfe 120000
--- 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 778097e..d99e17a 120000
--- 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 3cbf9ef..7ba1b65 120000
--- 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 2abc80a..22d6770 120000
--- 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 1d1af1f..a25f312 120000
--- 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 2530eef..a1e4b53 100644
--- 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
  -->
-- 
2.39.5