Revert "conf.d: Drop aliases for (URW)++ fonts" and patch

This reverts commit fa27b150fbfc30c8bc94e6a2bbf1119bb2251e86.

This also reverts "build: Remove references to deleted file", commit
3b69b7ad92d26b59441814afb82b54905442ff16, which was a patch for the
original commit being reverted (it removed a file, and the patch removed
it from the lists of files to install).

The URW++ fonts are currently supplied by media-fonts/urw-fonts-2.4.9,
which does not currently supply the aliases for fontconfig.  There is a
Gentoo bug for updating urw-fonts to a version that may supply its own
aliases for fontconfig which may fix this:
  https://bugs.gentoo.org/show_bug.cgi?id=589890
Until that is fixed, this restores the old aliases supplied by
fontconfig.

The commit this reverts removed some excess whitespace.  This revert was
modified to keep those changes.  This commit was also modified to keep
some comments about them being removed, with an extra comment that they
were restored temporarily.

diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index c755c5e..b552b27 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -47,6 +47,8 @@ but in an order preferring similar designs first.  We do this in three steps:
 NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
       upstream now includes them in their release of (URW)++ Core Font Set here:
       https://github.com/ArtifexSoftware/urw-base35-fonts/tree/master/fontconfig
+NOTE: As of 2018-04-16, media-fonts/urw-fonts does not supply these
+      mappings to fontconfig, so they were restored.
 -->
 
 <!-- Map specifics to generics -->
@@ -498,6 +500,8 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <family>Helvetica</family>
 	  <accept>
 	  <family>TeX Gyre Heros</family>
+	  <family>Nimbus Sans</family>
+	  <family>Nimbus Sans L</family>
 	  </accept>
 	</alias>
 
@@ -505,6 +509,7 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <family>Helvetica Narrow</family>
 	  <accept>
 	  <family>TeX Gyre Heros Cn</family>
+	  <family>Nimbus Sans Narrow</family>
 	  </accept>
 	</alias>
 
@@ -512,6 +517,8 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <family>Times</family>
 	  <accept>
 	  <family>TeX Gyre Termes</family>
+	  <family>Nimbus Roman</family>
+	  <family>Nimbus Roman No9 L</family>
 	  </accept>
 	</alias>
 
@@ -519,6 +526,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <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>
 
@@ -526,6 +536,8 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <family>ITC Avant Garde Gothic</family>
 	  <accept>
 	  <family>TeX Gyre Adventor</family>
+	  <family>URW Gothic</family>
+	  <family>URW Gothic L</family>
 	  </accept>
 	</alias>
 
@@ -534,6 +546,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <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>
 
@@ -541,6 +556,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <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>
 
@@ -549,6 +567,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <accept>
 	  <family>Palatino Linotype</family>
 	  <family>TeX Gyre Pagella</family>
+	  <family>P052</family>
+	  <family>Palladio URW</family>
+	  <family>URW Palladio L</family>
 	  </accept>
 	</alias>
 
@@ -557,6 +578,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
 	  <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/conf.d/30-urw-aliases.conf b/conf.d/30-urw-aliases.conf
new file mode 100644
index 0000000..cfde071
--- /dev/null
+++ b/conf.d/30-urw-aliases.conf
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  URW provides metric and shape compatible fonts for some Adobe families.
+  Most of these are handled in 30-metric-aliases.conf.
+  -->
+	<alias binding="same">
+	  <family>Zapf Dingbats</family>
+	  <accept>
+	    <family>D050000L</family>
+	    <family>Dingbats</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>ITC Zapf Dingbats</family>
+	  <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>
+	</match>
+</fontconfig>
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index ff03fb2..fd50a5d 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -29,6 +29,7 @@ CONF_LINKS = \
 	10-hinting-$(PREFERRED_HINTING).conf	\
 	10-scale-bitmap-fonts.conf \
 	20-unhint-small-vera.conf \
+	30-urw-aliases.conf \
 	30-metric-aliases.conf \
 	40-nonlatin.conf \
 	45-generic.conf \
@@ -69,6 +70,7 @@ template_DATA =				\
 	11-lcdfilter-light.conf		\
 	20-unhint-small-vera.conf	\
 	25-unhint-nonlatin.conf		\
+	30-urw-aliases.conf		\
 	30-metric-aliases.conf		\
 	40-nonlatin.conf		\
 	45-generic.conf			\