Update aliases for URW June 2016

http://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=c8342b4a7b6cdcc4cb1261bf2b008f6df257b5c6
http://git.ghostscript.com/?p=urw-core35-fonts.git;a=commit;h=79bcdfb34fbce12b592cce389fa7a19da6b5b018

4 files changed, 67 insertions, 13 deletions

diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index e72bf7a..1f0778d 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/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             TeX Gyre Heros
-Helvetica Narrow        Nimbus Sans Narrow      TeX Gyre Heros Cn
-Times                   Nimbus Roman            TeX Gyre Termes
-Courier                 Nimbus Mono             TeX Gyre Cursor
-ITC Avant Garde Gothic  URW Gothic              TeX Gyre Adventor
-ITC Bookman             Bookman URW             TeX Gyre Bonum     Bookman Old Style
-ITC Zapf Chancery       Chancery URW            TeX Gyre Chorus
-Palatino                Palladio URW            TeX Gyre Pagella   Palatino Linotype
-New Century Schoolbook  Century SchoolBook URW  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:
 ================  ======================  =======================  =================  ==============
@@ -120,6 +120,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	</alias>
 
 	<alias binding="same">
+	  <family>Nimbus Mono PS</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>TeX Gyre Cursor</family>
 	  <default>
 	  <family>Courier</family>
@@ -176,6 +183,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	</alias>
 
 	<alias binding="same">
+	  <family>URW Bookman</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>TeX Gyre Bonum</family>
 	  <default>
 	  <family>ITC Bookman</family>
@@ -211,6 +225,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	</alias>
 
 	<alias binding="same">
+	  <family>Z003</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>TeX Gyre Chorus</family>
 	  <default>
 	  <family>ITC Zapf Chancery</family>
@@ -232,6 +253,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	</alias>
 
 	<alias binding="same">
+	  <family>P052</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>TeX Gyre Pagella</family>
 	  <default>
 	  <family>Palatino</family>
@@ -260,6 +288,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	</alias>
 
 	<alias binding="same">
+	  <family>C059</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>TeX Gyre Schola</family>
 	  <default>
 	  <family>New Century Schoolbook</family>
@@ -490,6 +525,7 @@ 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>
@@ -509,6 +545,7 @@ 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>
@@ -518,6 +555,7 @@ 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>
@@ -528,6 +566,7 @@ 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>
@@ -538,6 +577,7 @@ 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>
diff --git a/conf.d/30-urw-aliases.conf b/conf.d/30-urw-aliases.conf
index e0d45da..cfde071 100644
--- a/conf.d/30-urw-aliases.conf
+++ b/conf.d/30-urw-aliases.conf
@@ -7,17 +7,26 @@
   -->
 	<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>
 	</match>
diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
index 5228945..c6696f8 100644
--- a/conf.d/45-latin.conf
+++ b/conf.d/45-latin.conf
@@ -228,6 +228,10 @@
 		<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>
diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf
index 35600ea..23ee91b 100644
--- a/conf.d/60-latin.conf
+++ b/conf.d/60-latin.conf
@@ -43,6 +43,7 @@
 			<family>Luxi Mono</family>
 			<family>Nimbus Mono L</family>
 			<family>Nimbus Mono</family>
+			<family>Nimbus Mono PS</family>
 			<family>Courier</family>
 		</prefer>
 	</alias>