beta 2009.05.28 11:23

57 files changed, 30 insertions, 692 deletions

diff --git a/fonts/map/dvips/context/contnav.map b/fonts/map/dvips/context/contnav.map
new file mode 100644
index 000000000..942798c57
--- /dev/null
+++ b/fonts/map/dvips/context/contnav.map
@@ -0,0 +1 @@
+contnav ContextNavigation <contnav.pfb
diff --git a/fonts/map/dvips/jmn/hans.map b/fonts/map/dvips/jmn/hans.map
new file mode 100644
index 000000000..8d283c0f6
--- /dev/null
+++ b/fonts/map/dvips/jmn/hans.map
@@ -0,0 +1,2 @@
+hans Hans-Regular "enchans ReEncodeFont" <hans.enc <hans.pfb
+hans-sh Hans-sh-Regular "enchans ReEncodeFont" <hans.enc <hans-sh.pfb
diff --git a/fonts/map/pdftex/context/cs-qbk.map b/fonts/map/pdftex/context/cs-qbk.map
deleted file mode 100644
index 93acb1250..000000000
--- a/fonts/map/pdftex/context/cs-qbk.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-cs-qbkr TeXGyreBonum-Regular "encqcs ReEncodeFont" <q-cs.enc <qbkr.pfb
-cs-qbkri TeXGyreBonum-Italic "encqcs ReEncodeFont" <q-cs.enc <qbkri.pfb
-cs-qbkb TeXGyreBonum-Bold "encqcs ReEncodeFont" <q-cs.enc <qbkb.pfb
-cs-qbkbi TeXGyreBonum-BoldItalic "encqcs ReEncodeFont" <q-cs.enc <qbkbi.pfb
-cs-qbkr-sc TeXGyreBonum-Regular "encqcssc ReEncodeFont" <q-cs-sc.enc <qbkr.pfb
-cs-qbkri-sc TeXGyreBonum-Italic "encqcssc ReEncodeFont" <q-cs-sc.enc <qbkri.pfb
-cs-qbkb-sc TeXGyreBonum-Bold "encqcssc ReEncodeFont" <q-cs-sc.enc <qbkb.pfb
-cs-qbkbi-sc TeXGyreBonum-BoldItalic "encqcssc ReEncodeFont" <q-cs-sc.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/cs-qcs.map b/fonts/map/pdftex/context/cs-qcs.map
deleted file mode 100644
index 5433beef3..000000000
--- a/fonts/map/pdftex/context/cs-qcs.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-cs-qcsr TeXGyreSchola-Regular "encqcs ReEncodeFont" <q-cs.enc <qcsr.pfb
-cs-qcsri TeXGyreSchola-Italic "encqcs ReEncodeFont" <q-cs.enc <qcsri.pfb
-cs-qcsb TeXGyreSchola-Bold "encqcs ReEncodeFont" <q-cs.enc <qcsb.pfb
-cs-qcsbi TeXGyreSchola-BoldItalic "encqcs ReEncodeFont" <q-cs.enc <qcsbi.pfb
-cs-qcsr-sc TeXGyreSchola-Regular "encqcssc ReEncodeFont" <q-cs-sc.enc <qcsr.pfb
-cs-qcsri-sc TeXGyreSchola-Italic "encqcssc ReEncodeFont" <q-cs-sc.enc <qcsri.pfb
-cs-qcsb-sc TeXGyreSchola-Bold "encqcssc ReEncodeFont" <q-cs-sc.enc <qcsb.pfb
-cs-qcsbi-sc TeXGyreSchola-BoldItalic "encqcssc ReEncodeFont" <q-cs-sc.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/cs-qpl.map b/fonts/map/pdftex/context/cs-qpl.map
deleted file mode 100644
index bdc0bffa6..000000000
--- a/fonts/map/pdftex/context/cs-qpl.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-cs-qplr TeXGyrePagella-Regular "encqcs ReEncodeFont" <q-cs.enc <qplr.pfb
-cs-qplri TeXGyrePagella-Italic "encqcs ReEncodeFont" <q-cs.enc <qplri.pfb
-cs-qplb TeXGyrePagella-Bold "encqcs ReEncodeFont" <q-cs.enc <qplb.pfb
-cs-qplbi TeXGyrePagella-BoldItalic "encqcs ReEncodeFont" <q-cs.enc <qplbi.pfb
-cs-qplr-sc TeXGyrePagella-Regular "encqcssc ReEncodeFont" <q-cs-sc.enc <qplr.pfb
-cs-qplri-sc TeXGyrePagella-Italic "encqcssc ReEncodeFont" <q-cs-sc.enc <qplri.pfb
-cs-qplb-sc TeXGyrePagella-Bold "encqcssc ReEncodeFont" <q-cs-sc.enc <qplb.pfb
-cs-qplbi-sc TeXGyrePagella-BoldItalic "encqcssc ReEncodeFont" <q-cs-sc.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/cs-qtm.map b/fonts/map/pdftex/context/cs-qtm.map
deleted file mode 100644
index 7be549dc0..000000000
--- a/fonts/map/pdftex/context/cs-qtm.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-cs-qtmr TeXGyreTermes-Regular "encqcs ReEncodeFont" <q-cs.enc <qtmr.pfb
-cs-qtmri TeXGyreTermes-Italic "encqcs ReEncodeFont" <q-cs.enc <qtmri.pfb
-cs-qtmb TeXGyreTermes-Bold "encqcs ReEncodeFont" <q-cs.enc <qtmb.pfb
-cs-qtmbi TeXGyreTermes-BoldItalic "encqcs ReEncodeFont" <q-cs.enc <qtmbi.pfb
-cs-qtmr-sc TeXGyreTermes-Regular "encqcssc ReEncodeFont" <q-cs-sc.enc <qtmr.pfb
-cs-qtmri-sc TeXGyreTermes-Italic "encqcssc ReEncodeFont" <q-cs-sc.enc <qtmri.pfb
-cs-qtmb-sc TeXGyreTermes-Bold "encqcssc ReEncodeFont" <q-cs-sc.enc <qtmb.pfb
-cs-qtmbi-sc TeXGyreTermes-BoldItalic "encqcssc ReEncodeFont" <q-cs-sc.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/ec-public-lm.map b/fonts/map/pdftex/context/ec-public-lm.map
deleted file mode 100644
index 9f21b7107..000000000
--- a/fonts/map/pdftex/context/ec-public-lm.map
+++ /dev/null
@@ -1,3 +0,0 @@
-% Being an early adopter, we used this name for the map file. The first
-% latin modern font sets had *-lm.map which unfortunately was changed to
-% lm-*.map names.
diff --git a/fonts/map/pdftex/context/ec-qbk.map b/fonts/map/pdftex/context/ec-qbk.map
deleted file mode 100644
index efceaae97..000000000
--- a/fonts/map/pdftex/context/ec-qbk.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-ec-qbkr TeXGyreBonum-Regular "encqec ReEncodeFont" <q-ec.enc <qbkr.pfb
-ec-qbkri TeXGyreBonum-Italic "encqec ReEncodeFont" <q-ec.enc <qbkri.pfb
-ec-qbkb TeXGyreBonum-Bold "encqec ReEncodeFont" <q-ec.enc <qbkb.pfb
-ec-qbkbi TeXGyreBonum-BoldItalic "encqec ReEncodeFont" <q-ec.enc <qbkbi.pfb
-ec-qbkr-sc TeXGyreBonum-Regular "encqecsc ReEncodeFont" <q-ec-sc.enc <qbkr.pfb
-ec-qbkri-sc TeXGyreBonum-Italic "encqecsc ReEncodeFont" <q-ec-sc.enc <qbkri.pfb
-ec-qbkb-sc TeXGyreBonum-Bold "encqecsc ReEncodeFont" <q-ec-sc.enc <qbkb.pfb
-ec-qbkbi-sc TeXGyreBonum-BoldItalic "encqecsc ReEncodeFont" <q-ec-sc.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/ec-qcs.map b/fonts/map/pdftex/context/ec-qcs.map
deleted file mode 100644
index 093ae18f8..000000000
--- a/fonts/map/pdftex/context/ec-qcs.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-ec-qcsr TeXGyreSchola-Regular "encqec ReEncodeFont" <q-ec.enc <qcsr.pfb
-ec-qcsri TeXGyreSchola-Italic "encqec ReEncodeFont" <q-ec.enc <qcsri.pfb
-ec-qcsb TeXGyreSchola-Bold "encqec ReEncodeFont" <q-ec.enc <qcsb.pfb
-ec-qcsbi TeXGyreSchola-BoldItalic "encqec ReEncodeFont" <q-ec.enc <qcsbi.pfb
-ec-qcsr-sc TeXGyreSchola-Regular "encqecsc ReEncodeFont" <q-ec-sc.enc <qcsr.pfb
-ec-qcsri-sc TeXGyreSchola-Italic "encqecsc ReEncodeFont" <q-ec-sc.enc <qcsri.pfb
-ec-qcsb-sc TeXGyreSchola-Bold "encqecsc ReEncodeFont" <q-ec-sc.enc <qcsb.pfb
-ec-qcsbi-sc TeXGyreSchola-BoldItalic "encqecsc ReEncodeFont" <q-ec-sc.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/ec-qpl.map b/fonts/map/pdftex/context/ec-qpl.map
deleted file mode 100644
index e1bb1f811..000000000
--- a/fonts/map/pdftex/context/ec-qpl.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-ec-qplr TeXGyrePagella-Regular "encqec ReEncodeFont" <q-ec.enc <qplr.pfb
-ec-qplri TeXGyrePagella-Italic "encqec ReEncodeFont" <q-ec.enc <qplri.pfb
-ec-qplb TeXGyrePagella-Bold "encqec ReEncodeFont" <q-ec.enc <qplb.pfb
-ec-qplbi TeXGyrePagella-BoldItalic "encqec ReEncodeFont" <q-ec.enc <qplbi.pfb
-ec-qplr-sc TeXGyrePagella-Regular "encqecsc ReEncodeFont" <q-ec-sc.enc <qplr.pfb
-ec-qplri-sc TeXGyrePagella-Italic "encqecsc ReEncodeFont" <q-ec-sc.enc <qplri.pfb
-ec-qplb-sc TeXGyrePagella-Bold "encqecsc ReEncodeFont" <q-ec-sc.enc <qplb.pfb
-ec-qplbi-sc TeXGyrePagella-BoldItalic "encqecsc ReEncodeFont" <q-ec-sc.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/ec-qtm.map b/fonts/map/pdftex/context/ec-qtm.map
deleted file mode 100644
index 557219415..000000000
--- a/fonts/map/pdftex/context/ec-qtm.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-ec-qtmr TeXGyreTermes-Regular "encqec ReEncodeFont" <q-ec.enc <qtmr.pfb
-ec-qtmri TeXGyreTermes-Italic "encqec ReEncodeFont" <q-ec.enc <qtmri.pfb
-ec-qtmb TeXGyreTermes-Bold "encqec ReEncodeFont" <q-ec.enc <qtmb.pfb
-ec-qtmbi TeXGyreTermes-BoldItalic "encqec ReEncodeFont" <q-ec.enc <qtmbi.pfb
-ec-qtmr-sc TeXGyreTermes-Regular "encqecsc ReEncodeFont" <q-ec-sc.enc <qtmr.pfb
-ec-qtmri-sc TeXGyreTermes-Italic "encqecsc ReEncodeFont" <q-ec-sc.enc <qtmri.pfb
-ec-qtmb-sc TeXGyreTermes-Bold "encqecsc ReEncodeFont" <q-ec-sc.enc <qtmb.pfb
-ec-qtmbi-sc TeXGyreTermes-BoldItalic "encqecsc ReEncodeFont" <q-ec-sc.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/el-public-lm.map b/fonts/map/pdftex/context/el-public-lm.map
deleted file mode 100644
index 9f21b7107..000000000
--- a/fonts/map/pdftex/context/el-public-lm.map
+++ /dev/null
@@ -1,3 +0,0 @@
-% Being an early adopter, we used this name for the map file. The first
-% latin modern font sets had *-lm.map which unfortunately was changed to
-% lm-*.map names.
diff --git a/fonts/map/pdftex/context/el-qbk.map b/fonts/map/pdftex/context/el-qbk.map
deleted file mode 100644
index 65fea636b..000000000
--- a/fonts/map/pdftex/context/el-qbk.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-el-qbkr TeXGyreBonum-Regular "encqel ReEncodeFont" <q-el.enc <qbkr.pfb
-el-qbkri TeXGyreBonum-Italic "encqel ReEncodeFont" <q-el.enc <qbkri.pfb
-el-qbkb TeXGyreBonum-Bold "encqel ReEncodeFont" <q-el.enc <qbkb.pfb
-el-qbkbi TeXGyreBonum-BoldItalic "encqel ReEncodeFont" <q-el.enc <qbkbi.pfb
-el-qbkr-sc TeXGyreBonum-Regular "encqelsc ReEncodeFont" <q-el-sc.enc <qbkr.pfb
-el-qbkri-sc TeXGyreBonum-Italic "encqelsc ReEncodeFont" <q-el-sc.enc <qbkri.pfb
-el-qbkb-sc TeXGyreBonum-Bold "encqelsc ReEncodeFont" <q-el-sc.enc <qbkb.pfb
-el-qbkbi-sc TeXGyreBonum-BoldItalic "encqelsc ReEncodeFont" <q-el-sc.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/el-qcs.map b/fonts/map/pdftex/context/el-qcs.map
deleted file mode 100644
index d6ed26bb9..000000000
--- a/fonts/map/pdftex/context/el-qcs.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-el-qcsr TeXGyreSchola-Regular "encqel ReEncodeFont" <q-el.enc <qcsr.pfb
-el-qcsri TeXGyreSchola-Italic "encqel ReEncodeFont" <q-el.enc <qcsri.pfb
-el-qcsb TeXGyreSchola-Bold "encqel ReEncodeFont" <q-el.enc <qcsb.pfb
-el-qcsbi TeXGyreSchola-BoldItalic "encqel ReEncodeFont" <q-el.enc <qcsbi.pfb
-el-qcsr-sc TeXGyreSchola-Regular "encqelsc ReEncodeFont" <q-el-sc.enc <qcsr.pfb
-el-qcsri-sc TeXGyreSchola-Italic "encqelsc ReEncodeFont" <q-el-sc.enc <qcsri.pfb
-el-qcsb-sc TeXGyreSchola-Bold "encqelsc ReEncodeFont" <q-el-sc.enc <qcsb.pfb
-el-qcsbi-sc TeXGyreSchola-BoldItalic "encqelsc ReEncodeFont" <q-el-sc.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/el-qpl.map b/fonts/map/pdftex/context/el-qpl.map
deleted file mode 100644
index 7b42cc756..000000000
--- a/fonts/map/pdftex/context/el-qpl.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-el-qplr TeXGyrePagella-Regular "encqel ReEncodeFont" <q-el.enc <qplr.pfb
-el-qplri TeXGyrePagella-Italic "encqel ReEncodeFont" <q-el.enc <qplri.pfb
-el-qplb TeXGyrePagella-Bold "encqel ReEncodeFont" <q-el.enc <qplb.pfb
-el-qplbi TeXGyrePagella-BoldItalic "encqel ReEncodeFont" <q-el.enc <qplbi.pfb
-el-qplr-sc TeXGyrePagella-Regular "encqelsc ReEncodeFont" <q-el-sc.enc <qplr.pfb
-el-qplri-sc TeXGyrePagella-Italic "encqelsc ReEncodeFont" <q-el-sc.enc <qplri.pfb
-el-qplb-sc TeXGyrePagella-Bold "encqelsc ReEncodeFont" <q-el-sc.enc <qplb.pfb
-el-qplbi-sc TeXGyrePagella-BoldItalic "encqelsc ReEncodeFont" <q-el-sc.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/el-qtm.map b/fonts/map/pdftex/context/el-qtm.map
deleted file mode 100644
index 2c5d5bef8..000000000
--- a/fonts/map/pdftex/context/el-qtm.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-el-qtmr TeXGyreTermes-Regular "encqel ReEncodeFont" <q-el.enc <qtmr.pfb
-el-qtmri TeXGyreTermes-Italic "encqel ReEncodeFont" <q-el.enc <qtmri.pfb
-el-qtmb TeXGyreTermes-Bold "encqel ReEncodeFont" <q-el.enc <qtmb.pfb
-el-qtmbi TeXGyreTermes-BoldItalic "encqel ReEncodeFont" <q-el.enc <qtmbi.pfb
-el-qtmr-sc TeXGyreTermes-Regular "encqelsc ReEncodeFont" <q-el-sc.enc <qtmr.pfb
-el-qtmri-sc TeXGyreTermes-Italic "encqelsc ReEncodeFont" <q-el-sc.enc <qtmri.pfb
-el-qtmb-sc TeXGyreTermes-Bold "encqelsc ReEncodeFont" <q-el-sc.enc <qtmb.pfb
-el-qtmbi-sc TeXGyreTermes-BoldItalic "encqelsc ReEncodeFont" <q-el-sc.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/l7x-qbk.map b/fonts/map/pdftex/context/l7x-qbk.map
deleted file mode 100644
index b4be9e526..000000000
--- a/fonts/map/pdftex/context/l7x-qbk.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-l7x-qbkr TeXGyreBonum-Regular "encql7x ReEncodeFont" <q-l7x.enc <qbkr.pfb
-l7x-qbkri TeXGyreBonum-Italic "encql7x ReEncodeFont" <q-l7x.enc <qbkri.pfb
-l7x-qbkb TeXGyreBonum-Bold "encql7x ReEncodeFont" <q-l7x.enc <qbkb.pfb
-l7x-qbkbi TeXGyreBonum-BoldItalic "encql7x ReEncodeFont" <q-l7x.enc <qbkbi.pfb
-l7x-qbkr-sc TeXGyreBonum-Regular "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qbkr.pfb
-l7x-qbkri-sc TeXGyreBonum-Italic "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qbkri.pfb
-l7x-qbkb-sc TeXGyreBonum-Bold "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qbkb.pfb
-l7x-qbkbi-sc TeXGyreBonum-BoldItalic "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/l7x-qcs.map b/fonts/map/pdftex/context/l7x-qcs.map
deleted file mode 100644
index 0cd1af27c..000000000
--- a/fonts/map/pdftex/context/l7x-qcs.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-l7x-qcsr TeXGyreSchola-Regular "encql7x ReEncodeFont" <q-l7x.enc <qcsr.pfb
-l7x-qcsri TeXGyreSchola-Italic "encql7x ReEncodeFont" <q-l7x.enc <qcsri.pfb
-l7x-qcsb TeXGyreSchola-Bold "encql7x ReEncodeFont" <q-l7x.enc <qcsb.pfb
-l7x-qcsbi TeXGyreSchola-BoldItalic "encql7x ReEncodeFont" <q-l7x.enc <qcsbi.pfb
-l7x-qcsr-sc TeXGyreSchola-Regular "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qcsr.pfb
-l7x-qcsri-sc TeXGyreSchola-Italic "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qcsri.pfb
-l7x-qcsb-sc TeXGyreSchola-Bold "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qcsb.pfb
-l7x-qcsbi-sc TeXGyreSchola-BoldItalic "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/l7x-qpl.map b/fonts/map/pdftex/context/l7x-qpl.map
deleted file mode 100644
index 95c69ffc5..000000000
--- a/fonts/map/pdftex/context/l7x-qpl.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-l7x-qplr TeXGyrePagella-Regular "encql7x ReEncodeFont" <q-l7x.enc <qplr.pfb
-l7x-qplri TeXGyrePagella-Italic "encql7x ReEncodeFont" <q-l7x.enc <qplri.pfb
-l7x-qplb TeXGyrePagella-Bold "encql7x ReEncodeFont" <q-l7x.enc <qplb.pfb
-l7x-qplbi TeXGyrePagella-BoldItalic "encql7x ReEncodeFont" <q-l7x.enc <qplbi.pfb
-l7x-qplr-sc TeXGyrePagella-Regular "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qplr.pfb
-l7x-qplri-sc TeXGyrePagella-Italic "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qplri.pfb
-l7x-qplb-sc TeXGyrePagella-Bold "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qplb.pfb
-l7x-qplbi-sc TeXGyrePagella-BoldItalic "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/l7x-qtm.map b/fonts/map/pdftex/context/l7x-qtm.map
deleted file mode 100644
index 9b05886e6..000000000
--- a/fonts/map/pdftex/context/l7x-qtm.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-l7x-qtmr TeXGyreTermes-Regular "encql7x ReEncodeFont" <q-l7x.enc <qtmr.pfb
-l7x-qtmri TeXGyreTermes-Italic "encql7x ReEncodeFont" <q-l7x.enc <qtmri.pfb
-l7x-qtmb TeXGyreTermes-Bold "encql7x ReEncodeFont" <q-l7x.enc <qtmb.pfb
-l7x-qtmbi TeXGyreTermes-BoldItalic "encql7x ReEncodeFont" <q-l7x.enc <qtmbi.pfb
-l7x-qtmr-sc TeXGyreTermes-Regular "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qtmr.pfb
-l7x-qtmri-sc TeXGyreTermes-Italic "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qtmri.pfb
-l7x-qtmb-sc TeXGyreTermes-Bold "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qtmb.pfb
-l7x-qtmbi-sc TeXGyreTermes-BoldItalic "encql7xsc ReEncodeFont" <q-l7x-sc.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/original-youngryu-px.map b/fonts/map/pdftex/context/original-youngryu-px.map
index 87c1f48cf..6a27e357d 100644
--- a/fonts/map/pdftex/context/original-youngryu-px.map
+++ b/fonts/map/pdftex/context/original-youngryu-px.map
@@ -1,16 +1,17 @@
 % This file a (slightly adapted) copy of the map file
 % that comes with the PX fonts by Young Ryu.
 
-% tx8r.enc replaced by 8r.enc
+% URW fonts replaced by TeX Gyre
 
-% URW Palatino
+% TeX Gyre Pagella (Palatino)
 
-rpxpplb  URWPalladioL-Bold                      <8r.enc <uplb8a.pfb
-rpxpplbo URWPalladioL-Bold     ".167 SlantFont" <8r.enc <uplb8a.pfb
-rpxpplbi URWPalladioL-BoldItal                  <8r.enc <uplbi8a.pfb
-rpxpplr  URWPalladioL-Roma                      <8r.enc <uplr8a.pfb
-rpxpplro URWPalladioL-Roma     ".167 SlantFont" <8r.enc <uplr8a.pfb
-rpxpplri URWPalladioL-Ital                      <8r.enc <uplri8a.pfb
+rpxpplr  TeXGyrePagella-Regular     "encq8r ReEncodeFont" <q-8r.enc <qplr.pfb
+rpxpplb  TeXGyrePagella-Bold        "encq8r ReEncodeFont" <q-8r.enc <qplb.pfb
+rpxpplri TeXGyrePagella-Italic      "encq8r ReEncodeFont" <q-8r.enc <qplri.pfb
+rpxpplbi TeXGyrePagella-BoldItalic  "encq8r ReEncodeFont" <q-8r.enc <qplbi.pfb
+% no idea why these were added
+rpxpplro TeXGyrePagella-Oblique     ".167 SlantFont encq8r ReEncodeFont" <q-8r.enc <qplr.pfb
+rpxpplbo TeXGyrePagella-BoldOblique ".167 SlantFont encq8r ReEncodeFont" <q-8r.enc <qplb.pfb
 
 % PX Text
 
diff --git a/fonts/map/pdftex/context/original-youngryu-tx.map b/fonts/map/pdftex/context/original-youngryu-tx.map
index 5618ee8bc..d2600fa78 100644
--- a/fonts/map/pdftex/context/original-youngryu-tx.map
+++ b/fonts/map/pdftex/context/original-youngryu-tx.map
@@ -1,23 +1,28 @@
 % This file is a (slightly adapted) copy of the map file
 % that comes with the TX fonts by Young Ryu.
 
-% tx8r.enc replaced by 8r.enc
+% URW fonts replaced by TeX Gyre
 
-% URW times
+% TeX Gyre Termes (Times)
 
-rtxptmb  NimbusRomNo9L-Medi                      <8r.enc <utmb8a.pfb
-rtxptmbo NimbusRomNo9L-Medi     ".167 SlantFont" <8r.enc <utmb8a.pfb
-rtxptmbi NimbusRomNo9L-MediItal                  <8r.enc <utmbi8a.pfb
-rtxptmr  NimbusRomNo9L-Regu                      <8r.enc <utmr8a.pfb
-rtxptmro NimbusRomNo9L-Regu     ".167 SlantFont" <8r.enc <utmr8a.pfb
-rtxptmri NimbusRomNo9L-ReguItal                  <8r.enc <utmri8a.pfb
+rtxptmr  TeXGyreTermes-Regular     "encq8r ReEncodeFont" <q-8r.enc <qtmr.pfb
+rtxptmb  TeXGyreTermes-Bold        "encq8r ReEncodeFont" <q-8r.enc <qtmb.pfb
+rtxptmri TeXGyreTermes-Italic      "encq8r ReEncodeFont" <q-8r.enc <qtmri.pfb
+rtxptmbi TeXGyreTermes-BoldItalic  "encq8r ReEncodeFont" <q-8r.enc <qtmbi.pfb
+% no idea why these were added
+rtxptmro TeXGyreTermes-Oblique     ".167 SlantFont encq8r ReEncodeFont" <q-8r.enc <qtmr.pfb
+rtxptmbo TeXGyreTermes-BoldOblique ".167 SlantFont encq8r ReEncodeFont" <q-8r.enc <qtmb.pfb
 
-% URW Helvetica
+% TeX Gyre Heros (Helvetica)
 
-rtxphvr  NimbusSanL-Regu                         <8r.enc <uhv8a.pfb
-rtxphvro NimbusSanL-Regu        ".167 SlantFont" <8r.enc <uhv8a.pfb
-rtxphvb  NimbusSanL-Bold                         <8r.enc <uhvb8a.pfb
-rtxphvbo NimbusSanL-Bold        ".167 SlantFont" <8r.enc <uhvb8a.pfb
+rtxphvr  TeXGyreHeros-Regular     "encqrm ReEncodeFont" <q-rm.enc <qtmr.pfb
+rtxphvb  TeXGyreHeros-Bold        "encqrm ReEncodeFont" <q-rm.enc <qtmb.pfb
+% probably not used by txfonts
+% rtxphvri TeXGyreHeros-Italic      "encqrm ReEncodeFont" <q-rm.enc <qtmri.pfb
+% rtxphvbi TeXGyreHeros-BoldItalic  "encqrm ReEncodeFont" <q-rm.enc <qtmbi.pfb
+% followed original definitions; one could also use the italic version
+rtxphvro TeXGyreHeros-Oblique     ".167 SlantFont encqrm ReEncodeFont" <q-rm.enc <qtmr.pfb
+rtxphvbo TeXGyreHeros-BoldOblique ".167 SlantFont encqrm ReEncodeFont" <q-rm.enc <qtmb.pfb
 
 % TX Text
 
diff --git a/fonts/map/pdftex/context/qx-public-lm.map b/fonts/map/pdftex/context/qx-public-lm.map
deleted file mode 100644
index 9f21b7107..000000000
--- a/fonts/map/pdftex/context/qx-public-lm.map
+++ /dev/null
@@ -1,3 +0,0 @@
-% Being an early adopter, we used this name for the map file. The first
-% latin modern font sets had *-lm.map which unfortunately was changed to
-% lm-*.map names.
diff --git a/fonts/map/pdftex/context/qx-qbk.map b/fonts/map/pdftex/context/qx-qbk.map
deleted file mode 100644
index f49992dbf..000000000
--- a/fonts/map/pdftex/context/qx-qbk.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-qx-qbkr TeXGyreBonum-Regular "encqqx ReEncodeFont" <q-qx.enc <qbkr.pfb
-qx-qbkri TeXGyreBonum-Italic "encqqx ReEncodeFont" <q-qx.enc <qbkri.pfb
-qx-qbkb TeXGyreBonum-Bold "encqqx ReEncodeFont" <q-qx.enc <qbkb.pfb
-qx-qbkbi TeXGyreBonum-BoldItalic "encqqx ReEncodeFont" <q-qx.enc <qbkbi.pfb
-qx-qbkr-sc TeXGyreBonum-Regular "encqqxsc ReEncodeFont" <q-qx-sc.enc <qbkr.pfb
-qx-qbkri-sc TeXGyreBonum-Italic "encqqxsc ReEncodeFont" <q-qx-sc.enc <qbkri.pfb
-qx-qbkb-sc TeXGyreBonum-Bold "encqqxsc ReEncodeFont" <q-qx-sc.enc <qbkb.pfb
-qx-qbkbi-sc TeXGyreBonum-BoldItalic "encqqxsc ReEncodeFont" <q-qx-sc.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/qx-qcs.map b/fonts/map/pdftex/context/qx-qcs.map
deleted file mode 100644
index e3ced4e76..000000000
--- a/fonts/map/pdftex/context/qx-qcs.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-qx-qcsr TeXGyreSchola-Regular "encqqx ReEncodeFont" <q-qx.enc <qcsr.pfb
-qx-qcsri TeXGyreSchola-Italic "encqqx ReEncodeFont" <q-qx.enc <qcsri.pfb
-qx-qcsb TeXGyreSchola-Bold "encqqx ReEncodeFont" <q-qx.enc <qcsb.pfb
-qx-qcsbi TeXGyreSchola-BoldItalic "encqqx ReEncodeFont" <q-qx.enc <qcsbi.pfb
-qx-qcsr-sc TeXGyreSchola-Regular "encqqxsc ReEncodeFont" <q-qx-sc.enc <qcsr.pfb
-qx-qcsri-sc TeXGyreSchola-Italic "encqqxsc ReEncodeFont" <q-qx-sc.enc <qcsri.pfb
-qx-qcsb-sc TeXGyreSchola-Bold "encqqxsc ReEncodeFont" <q-qx-sc.enc <qcsb.pfb
-qx-qcsbi-sc TeXGyreSchola-BoldItalic "encqqxsc ReEncodeFont" <q-qx-sc.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/qx-qpl.map b/fonts/map/pdftex/context/qx-qpl.map
deleted file mode 100644
index f276cfd04..000000000
--- a/fonts/map/pdftex/context/qx-qpl.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-qx-qplr TeXGyrePagella-Regular "encqqx ReEncodeFont" <q-qx.enc <qplr.pfb
-qx-qplri TeXGyrePagella-Italic "encqqx ReEncodeFont" <q-qx.enc <qplri.pfb
-qx-qplb TeXGyrePagella-Bold "encqqx ReEncodeFont" <q-qx.enc <qplb.pfb
-qx-qplbi TeXGyrePagella-BoldItalic "encqqx ReEncodeFont" <q-qx.enc <qplbi.pfb
-qx-qplr-sc TeXGyrePagella-Regular "encqqxsc ReEncodeFont" <q-qx-sc.enc <qplr.pfb
-qx-qplri-sc TeXGyrePagella-Italic "encqqxsc ReEncodeFont" <q-qx-sc.enc <qplri.pfb
-qx-qplb-sc TeXGyrePagella-Bold "encqqxsc ReEncodeFont" <q-qx-sc.enc <qplb.pfb
-qx-qplbi-sc TeXGyrePagella-BoldItalic "encqqxsc ReEncodeFont" <q-qx-sc.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/qx-qtm.map b/fonts/map/pdftex/context/qx-qtm.map
deleted file mode 100644
index 1ffd29aad..000000000
--- a/fonts/map/pdftex/context/qx-qtm.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-qx-qtmr TeXGyreTermes-Regular "encqqx ReEncodeFont" <q-qx.enc <qtmr.pfb
-qx-qtmri TeXGyreTermes-Italic "encqqx ReEncodeFont" <q-qx.enc <qtmri.pfb
-qx-qtmb TeXGyreTermes-Bold "encqqx ReEncodeFont" <q-qx.enc <qtmb.pfb
-qx-qtmbi TeXGyreTermes-BoldItalic "encqqx ReEncodeFont" <q-qx.enc <qtmbi.pfb
-qx-qtmr-sc TeXGyreTermes-Regular "encqqxsc ReEncodeFont" <q-qx-sc.enc <qtmr.pfb
-qx-qtmri-sc TeXGyreTermes-Italic "encqqxsc ReEncodeFont" <q-qx-sc.enc <qtmri.pfb
-qx-qtmb-sc TeXGyreTermes-Bold "encqqxsc ReEncodeFont" <q-qx-sc.enc <qtmb.pfb
-qx-qtmbi-sc TeXGyreTermes-BoldItalic "encqqxsc ReEncodeFont" <q-qx-sc.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/rm-qbk.map b/fonts/map/pdftex/context/rm-qbk.map
deleted file mode 100644
index c889b8cdb..000000000
--- a/fonts/map/pdftex/context/rm-qbk.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-rm-qbkr TeXGyreBonum-Regular "encqrm ReEncodeFont" <q-rm.enc <qbkr.pfb
-rm-qbkri TeXGyreBonum-Italic "encqrm ReEncodeFont" <q-rm.enc <qbkri.pfb
-rm-qbkb TeXGyreBonum-Bold "encqrm ReEncodeFont" <q-rm.enc <qbkb.pfb
-rm-qbkbi TeXGyreBonum-BoldItalic "encqrm ReEncodeFont" <q-rm.enc <qbkbi.pfb
-rm-qbkr-sc TeXGyreBonum-Regular "encqrmsc ReEncodeFont" <q-rm-sc.enc <qbkr.pfb
-rm-qbkri-sc TeXGyreBonum-Italic "encqrmsc ReEncodeFont" <q-rm-sc.enc <qbkri.pfb
-rm-qbkb-sc TeXGyreBonum-Bold "encqrmsc ReEncodeFont" <q-rm-sc.enc <qbkb.pfb
-rm-qbkbi-sc TeXGyreBonum-BoldItalic "encqrmsc ReEncodeFont" <q-rm-sc.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/rm-qcs.map b/fonts/map/pdftex/context/rm-qcs.map
deleted file mode 100644
index df7d4539f..000000000
--- a/fonts/map/pdftex/context/rm-qcs.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-rm-qcsr TeXGyreSchola-Regular "encqrm ReEncodeFont" <q-rm.enc <qcsr.pfb
-rm-qcsri TeXGyreSchola-Italic "encqrm ReEncodeFont" <q-rm.enc <qcsri.pfb
-rm-qcsb TeXGyreSchola-Bold "encqrm ReEncodeFont" <q-rm.enc <qcsb.pfb
-rm-qcsbi TeXGyreSchola-BoldItalic "encqrm ReEncodeFont" <q-rm.enc <qcsbi.pfb
-rm-qcsr-sc TeXGyreSchola-Regular "encqrmsc ReEncodeFont" <q-rm-sc.enc <qcsr.pfb
-rm-qcsri-sc TeXGyreSchola-Italic "encqrmsc ReEncodeFont" <q-rm-sc.enc <qcsri.pfb
-rm-qcsb-sc TeXGyreSchola-Bold "encqrmsc ReEncodeFont" <q-rm-sc.enc <qcsb.pfb
-rm-qcsbi-sc TeXGyreSchola-BoldItalic "encqrmsc ReEncodeFont" <q-rm-sc.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/rm-qpl.map b/fonts/map/pdftex/context/rm-qpl.map
deleted file mode 100644
index 487876951..000000000
--- a/fonts/map/pdftex/context/rm-qpl.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-rm-qplr TeXGyrePagella-Regular "encqrm ReEncodeFont" <q-rm.enc <qplr.pfb
-rm-qplri TeXGyrePagella-Italic "encqrm ReEncodeFont" <q-rm.enc <qplri.pfb
-rm-qplb TeXGyrePagella-Bold "encqrm ReEncodeFont" <q-rm.enc <qplb.pfb
-rm-qplbi TeXGyrePagella-BoldItalic "encqrm ReEncodeFont" <q-rm.enc <qplbi.pfb
-rm-qplr-sc TeXGyrePagella-Regular "encqrmsc ReEncodeFont" <q-rm-sc.enc <qplr.pfb
-rm-qplri-sc TeXGyrePagella-Italic "encqrmsc ReEncodeFont" <q-rm-sc.enc <qplri.pfb
-rm-qplb-sc TeXGyrePagella-Bold "encqrmsc ReEncodeFont" <q-rm-sc.enc <qplb.pfb
-rm-qplbi-sc TeXGyrePagella-BoldItalic "encqrmsc ReEncodeFont" <q-rm-sc.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/rm-qtm.map b/fonts/map/pdftex/context/rm-qtm.map
deleted file mode 100644
index 89c7734c0..000000000
--- a/fonts/map/pdftex/context/rm-qtm.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-rm-qtmr TeXGyreTermes-Regular "encqrm ReEncodeFont" <q-rm.enc <qtmr.pfb
-rm-qtmri TeXGyreTermes-Italic "encqrm ReEncodeFont" <q-rm.enc <qtmri.pfb
-rm-qtmb TeXGyreTermes-Bold "encqrm ReEncodeFont" <q-rm.enc <qtmb.pfb
-rm-qtmbi TeXGyreTermes-BoldItalic "encqrm ReEncodeFont" <q-rm.enc <qtmbi.pfb
-rm-qtmr-sc TeXGyreTermes-Regular "encqrmsc ReEncodeFont" <q-rm-sc.enc <qtmr.pfb
-rm-qtmri-sc TeXGyreTermes-Italic "encqrmsc ReEncodeFont" <q-rm-sc.enc <qtmri.pfb
-rm-qtmb-sc TeXGyreTermes-Bold "encqrmsc ReEncodeFont" <q-rm-sc.enc <qtmb.pfb
-rm-qtmbi-sc TeXGyreTermes-BoldItalic "encqrmsc ReEncodeFont" <q-rm-sc.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/t2a-qbk.map b/fonts/map/pdftex/context/t2a-qbk.map
deleted file mode 100644
index bbf662c78..000000000
--- a/fonts/map/pdftex/context/t2a-qbk.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2a-qbkr TeXGyreBonum-Regular "encqt2a ReEncodeFont" <q-t2a.enc <qbkr.pfb
-t2a-qbkri TeXGyreBonum-Italic "encqt2a ReEncodeFont" <q-t2a.enc <qbkri.pfb
-t2a-qbkb TeXGyreBonum-Bold "encqt2a ReEncodeFont" <q-t2a.enc <qbkb.pfb
-t2a-qbkbi TeXGyreBonum-BoldItalic "encqt2a ReEncodeFont" <q-t2a.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/t2a-qcs.map b/fonts/map/pdftex/context/t2a-qcs.map
deleted file mode 100644
index 6f8d1c944..000000000
--- a/fonts/map/pdftex/context/t2a-qcs.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2a-qcsr TeXGyreSchola-Regular "encqt2a ReEncodeFont" <q-t2a.enc <qcsr.pfb
-t2a-qcsri TeXGyreSchola-Italic "encqt2a ReEncodeFont" <q-t2a.enc <qcsri.pfb
-t2a-qcsb TeXGyreSchola-Bold "encqt2a ReEncodeFont" <q-t2a.enc <qcsb.pfb
-t2a-qcsbi TeXGyreSchola-BoldItalic "encqt2a ReEncodeFont" <q-t2a.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/t2a-qpl.map b/fonts/map/pdftex/context/t2a-qpl.map
deleted file mode 100644
index a963a9027..000000000
--- a/fonts/map/pdftex/context/t2a-qpl.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2a-qplr TeXGyrePagella-Regular "encqt2a ReEncodeFont" <q-t2a.enc <qplr.pfb
-t2a-qplri TeXGyrePagella-Italic "encqt2a ReEncodeFont" <q-t2a.enc <qplri.pfb
-t2a-qplb TeXGyrePagella-Bold "encqt2a ReEncodeFont" <q-t2a.enc <qplb.pfb
-t2a-qplbi TeXGyrePagella-BoldItalic "encqt2a ReEncodeFont" <q-t2a.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/t2a-qtm.map b/fonts/map/pdftex/context/t2a-qtm.map
deleted file mode 100644
index 3d433f2ec..000000000
--- a/fonts/map/pdftex/context/t2a-qtm.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2a-qtmr TeXGyreTermes-Regular "encqt2a ReEncodeFont" <q-t2a.enc <qtmr.pfb
-t2a-qtmri TeXGyreTermes-Italic "encqt2a ReEncodeFont" <q-t2a.enc <qtmri.pfb
-t2a-qtmb TeXGyreTermes-Bold "encqt2a ReEncodeFont" <q-t2a.enc <qtmb.pfb
-t2a-qtmbi TeXGyreTermes-BoldItalic "encqt2a ReEncodeFont" <q-t2a.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/t2b-qbk.map b/fonts/map/pdftex/context/t2b-qbk.map
deleted file mode 100644
index 2ddd898b1..000000000
--- a/fonts/map/pdftex/context/t2b-qbk.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2b-qbkr TeXGyreBonum-Regular "encqt2b ReEncodeFont" <q-t2b.enc <qbkr.pfb
-t2b-qbkri TeXGyreBonum-Italic "encqt2b ReEncodeFont" <q-t2b.enc <qbkri.pfb
-t2b-qbkb TeXGyreBonum-Bold "encqt2b ReEncodeFont" <q-t2b.enc <qbkb.pfb
-t2b-qbkbi TeXGyreBonum-BoldItalic "encqt2b ReEncodeFont" <q-t2b.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/t2b-qcs.map b/fonts/map/pdftex/context/t2b-qcs.map
deleted file mode 100644
index 3bf23d11e..000000000
--- a/fonts/map/pdftex/context/t2b-qcs.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2b-qcsr TeXGyreSchola-Regular "encqt2b ReEncodeFont" <q-t2b.enc <qcsr.pfb
-t2b-qcsri TeXGyreSchola-Italic "encqt2b ReEncodeFont" <q-t2b.enc <qcsri.pfb
-t2b-qcsb TeXGyreSchola-Bold "encqt2b ReEncodeFont" <q-t2b.enc <qcsb.pfb
-t2b-qcsbi TeXGyreSchola-BoldItalic "encqt2b ReEncodeFont" <q-t2b.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/t2b-qpl.map b/fonts/map/pdftex/context/t2b-qpl.map
deleted file mode 100644
index efd0760b8..000000000
--- a/fonts/map/pdftex/context/t2b-qpl.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2b-qplr TeXGyrePagella-Regular "encqt2b ReEncodeFont" <q-t2b.enc <qplr.pfb
-t2b-qplri TeXGyrePagella-Italic "encqt2b ReEncodeFont" <q-t2b.enc <qplri.pfb
-t2b-qplb TeXGyrePagella-Bold "encqt2b ReEncodeFont" <q-t2b.enc <qplb.pfb
-t2b-qplbi TeXGyrePagella-BoldItalic "encqt2b ReEncodeFont" <q-t2b.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/t2b-qtm.map b/fonts/map/pdftex/context/t2b-qtm.map
deleted file mode 100644
index a38009c36..000000000
--- a/fonts/map/pdftex/context/t2b-qtm.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2b-qtmr TeXGyreTermes-Regular "encqt2b ReEncodeFont" <q-t2b.enc <qtmr.pfb
-t2b-qtmri TeXGyreTermes-Italic "encqt2b ReEncodeFont" <q-t2b.enc <qtmri.pfb
-t2b-qtmb TeXGyreTermes-Bold "encqt2b ReEncodeFont" <q-t2b.enc <qtmb.pfb
-t2b-qtmbi TeXGyreTermes-BoldItalic "encqt2b ReEncodeFont" <q-t2b.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/t2c-qbk.map b/fonts/map/pdftex/context/t2c-qbk.map
deleted file mode 100644
index 41855359a..000000000
--- a/fonts/map/pdftex/context/t2c-qbk.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2c-qbkr TeXGyreBonum-Regular "encqt2c ReEncodeFont" <q-t2c.enc <qbkr.pfb
-t2c-qbkri TeXGyreBonum-Italic "encqt2c ReEncodeFont" <q-t2c.enc <qbkri.pfb
-t2c-qbkb TeXGyreBonum-Bold "encqt2c ReEncodeFont" <q-t2c.enc <qbkb.pfb
-t2c-qbkbi TeXGyreBonum-BoldItalic "encqt2c ReEncodeFont" <q-t2c.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/t2c-qcs.map b/fonts/map/pdftex/context/t2c-qcs.map
deleted file mode 100644
index 16276d5c6..000000000
--- a/fonts/map/pdftex/context/t2c-qcs.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2c-qcsr TeXGyreSchola-Regular "encqt2c ReEncodeFont" <q-t2c.enc <qcsr.pfb
-t2c-qcsri TeXGyreSchola-Italic "encqt2c ReEncodeFont" <q-t2c.enc <qcsri.pfb
-t2c-qcsb TeXGyreSchola-Bold "encqt2c ReEncodeFont" <q-t2c.enc <qcsb.pfb
-t2c-qcsbi TeXGyreSchola-BoldItalic "encqt2c ReEncodeFont" <q-t2c.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/t2c-qpl.map b/fonts/map/pdftex/context/t2c-qpl.map
deleted file mode 100644
index 8b3647e9c..000000000
--- a/fonts/map/pdftex/context/t2c-qpl.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2c-qplr TeXGyrePagella-Regular "encqt2c ReEncodeFont" <q-t2c.enc <qplr.pfb
-t2c-qplri TeXGyrePagella-Italic "encqt2c ReEncodeFont" <q-t2c.enc <qplri.pfb
-t2c-qplb TeXGyrePagella-Bold "encqt2c ReEncodeFont" <q-t2c.enc <qplb.pfb
-t2c-qplbi TeXGyrePagella-BoldItalic "encqt2c ReEncodeFont" <q-t2c.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/t2c-qtm.map b/fonts/map/pdftex/context/t2c-qtm.map
deleted file mode 100644
index 3755ae476..000000000
--- a/fonts/map/pdftex/context/t2c-qtm.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t2c-qtmr TeXGyreTermes-Regular "encqt2c ReEncodeFont" <q-t2c.enc <qtmr.pfb
-t2c-qtmri TeXGyreTermes-Italic "encqt2c ReEncodeFont" <q-t2c.enc <qtmri.pfb
-t2c-qtmb TeXGyreTermes-Bold "encqt2c ReEncodeFont" <q-t2c.enc <qtmb.pfb
-t2c-qtmbi TeXGyreTermes-BoldItalic "encqt2c ReEncodeFont" <q-t2c.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/t5-public-lm.map b/fonts/map/pdftex/context/t5-public-lm.map
deleted file mode 100644
index 9f21b7107..000000000
--- a/fonts/map/pdftex/context/t5-public-lm.map
+++ /dev/null
@@ -1,3 +0,0 @@
-% Being an early adopter, we used this name for the map file. The first
-% latin modern font sets had *-lm.map which unfortunately was changed to
-% lm-*.map names.
diff --git a/fonts/map/pdftex/context/t5-qbk.map b/fonts/map/pdftex/context/t5-qbk.map
deleted file mode 100644
index 387f8a9f2..000000000
--- a/fonts/map/pdftex/context/t5-qbk.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t5-qbkr TeXGyreBonum-Regular "encqt5 ReEncodeFont" <q-t5.enc <qbkr.pfb
-t5-qbkri TeXGyreBonum-Italic "encqt5 ReEncodeFont" <q-t5.enc <qbkri.pfb
-t5-qbkb TeXGyreBonum-Bold "encqt5 ReEncodeFont" <q-t5.enc <qbkb.pfb
-t5-qbkbi TeXGyreBonum-BoldItalic "encqt5 ReEncodeFont" <q-t5.enc <qbkbi.pfb
-t5-qbkr-sc TeXGyreBonum-Regular "encqt5sc ReEncodeFont" <q-t5-sc.enc <qbkr.pfb
-t5-qbkri-sc TeXGyreBonum-Italic "encqt5sc ReEncodeFont" <q-t5-sc.enc <qbkri.pfb
-t5-qbkb-sc TeXGyreBonum-Bold "encqt5sc ReEncodeFont" <q-t5-sc.enc <qbkb.pfb
-t5-qbkbi-sc TeXGyreBonum-BoldItalic "encqt5sc ReEncodeFont" <q-t5-sc.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/t5-qcs.map b/fonts/map/pdftex/context/t5-qcs.map
deleted file mode 100644
index da8f5d563..000000000
--- a/fonts/map/pdftex/context/t5-qcs.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t5-qcsr TeXGyreSchola-Regular "encqt5 ReEncodeFont" <q-t5.enc <qcsr.pfb
-t5-qcsri TeXGyreSchola-Italic "encqt5 ReEncodeFont" <q-t5.enc <qcsri.pfb
-t5-qcsb TeXGyreSchola-Bold "encqt5 ReEncodeFont" <q-t5.enc <qcsb.pfb
-t5-qcsbi TeXGyreSchola-BoldItalic "encqt5 ReEncodeFont" <q-t5.enc <qcsbi.pfb
-t5-qcsr-sc TeXGyreSchola-Regular "encqt5sc ReEncodeFont" <q-t5-sc.enc <qcsr.pfb
-t5-qcsri-sc TeXGyreSchola-Italic "encqt5sc ReEncodeFont" <q-t5-sc.enc <qcsri.pfb
-t5-qcsb-sc TeXGyreSchola-Bold "encqt5sc ReEncodeFont" <q-t5-sc.enc <qcsb.pfb
-t5-qcsbi-sc TeXGyreSchola-BoldItalic "encqt5sc ReEncodeFont" <q-t5-sc.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/t5-qpl.map b/fonts/map/pdftex/context/t5-qpl.map
deleted file mode 100644
index de6fb85cb..000000000
--- a/fonts/map/pdftex/context/t5-qpl.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t5-qplr TeXGyrePagella-Regular "encqt5 ReEncodeFont" <q-t5.enc <qplr.pfb
-t5-qplri TeXGyrePagella-Italic "encqt5 ReEncodeFont" <q-t5.enc <qplri.pfb
-t5-qplb TeXGyrePagella-Bold "encqt5 ReEncodeFont" <q-t5.enc <qplb.pfb
-t5-qplbi TeXGyrePagella-BoldItalic "encqt5 ReEncodeFont" <q-t5.enc <qplbi.pfb
-t5-qplr-sc TeXGyrePagella-Regular "encqt5sc ReEncodeFont" <q-t5-sc.enc <qplr.pfb
-t5-qplri-sc TeXGyrePagella-Italic "encqt5sc ReEncodeFont" <q-t5-sc.enc <qplri.pfb
-t5-qplb-sc TeXGyrePagella-Bold "encqt5sc ReEncodeFont" <q-t5-sc.enc <qplb.pfb
-t5-qplbi-sc TeXGyrePagella-BoldItalic "encqt5sc ReEncodeFont" <q-t5-sc.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/t5-qtm.map b/fonts/map/pdftex/context/t5-qtm.map
deleted file mode 100644
index 559fc6dcc..000000000
--- a/fonts/map/pdftex/context/t5-qtm.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-t5-qtmr TeXGyreTermes-Regular "encqt5 ReEncodeFont" <q-t5.enc <qtmr.pfb
-t5-qtmri TeXGyreTermes-Italic "encqt5 ReEncodeFont" <q-t5.enc <qtmri.pfb
-t5-qtmb TeXGyreTermes-Bold "encqt5 ReEncodeFont" <q-t5.enc <qtmb.pfb
-t5-qtmbi TeXGyreTermes-BoldItalic "encqt5 ReEncodeFont" <q-t5.enc <qtmbi.pfb
-t5-qtmr-sc TeXGyreTermes-Regular "encqt5sc ReEncodeFont" <q-t5-sc.enc <qtmr.pfb
-t5-qtmri-sc TeXGyreTermes-Italic "encqt5sc ReEncodeFont" <q-t5-sc.enc <qtmri.pfb
-t5-qtmb-sc TeXGyreTermes-Bold "encqt5sc ReEncodeFont" <q-t5-sc.enc <qtmb.pfb
-t5-qtmbi-sc TeXGyreTermes-BoldItalic "encqt5sc ReEncodeFont" <q-t5-sc.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/texnansi-public-lm.map b/fonts/map/pdftex/context/texnansi-public-lm.map
deleted file mode 100644
index 9f21b7107..000000000
--- a/fonts/map/pdftex/context/texnansi-public-lm.map
+++ /dev/null
@@ -1,3 +0,0 @@
-% Being an early adopter, we used this name for the map file. The first
-% latin modern font sets had *-lm.map which unfortunately was changed to
-% lm-*.map names.
diff --git a/fonts/map/pdftex/context/texnansi-qbk.map b/fonts/map/pdftex/context/texnansi-qbk.map
deleted file mode 100644
index 6b418d83f..000000000
--- a/fonts/map/pdftex/context/texnansi-qbk.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-texnansi-qbkr TeXGyreBonum-Regular "encqtexnansi ReEncodeFont" <q-texnansi.enc <qbkr.pfb
-texnansi-qbkri TeXGyreBonum-Italic "encqtexnansi ReEncodeFont" <q-texnansi.enc <qbkri.pfb
-texnansi-qbkb TeXGyreBonum-Bold "encqtexnansi ReEncodeFont" <q-texnansi.enc <qbkb.pfb
-texnansi-qbkbi TeXGyreBonum-BoldItalic "encqtexnansi ReEncodeFont" <q-texnansi.enc <qbkbi.pfb
-texnansi-qbkr-sc TeXGyreBonum-Regular "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qbkr.pfb
-texnansi-qbkri-sc TeXGyreBonum-Italic "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qbkri.pfb
-texnansi-qbkb-sc TeXGyreBonum-Bold "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qbkb.pfb
-texnansi-qbkbi-sc TeXGyreBonum-BoldItalic "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/texnansi-qcs.map b/fonts/map/pdftex/context/texnansi-qcs.map
deleted file mode 100644
index 5394f7a8f..000000000
--- a/fonts/map/pdftex/context/texnansi-qcs.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-texnansi-qcsr TeXGyreSchola-Regular "encqtexnansi ReEncodeFont" <q-texnansi.enc <qcsr.pfb
-texnansi-qcsri TeXGyreSchola-Italic "encqtexnansi ReEncodeFont" <q-texnansi.enc <qcsri.pfb
-texnansi-qcsb TeXGyreSchola-Bold "encqtexnansi ReEncodeFont" <q-texnansi.enc <qcsb.pfb
-texnansi-qcsbi TeXGyreSchola-BoldItalic "encqtexnansi ReEncodeFont" <q-texnansi.enc <qcsbi.pfb
-texnansi-qcsr-sc TeXGyreSchola-Regular "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qcsr.pfb
-texnansi-qcsri-sc TeXGyreSchola-Italic "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qcsri.pfb
-texnansi-qcsb-sc TeXGyreSchola-Bold "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qcsb.pfb
-texnansi-qcsbi-sc TeXGyreSchola-BoldItalic "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/texnansi-qpl.map b/fonts/map/pdftex/context/texnansi-qpl.map
deleted file mode 100644
index b496a42ee..000000000
--- a/fonts/map/pdftex/context/texnansi-qpl.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-texnansi-qplr TeXGyrePagella-Regular "encqtexnansi ReEncodeFont" <q-texnansi.enc <qplr.pfb
-texnansi-qplri TeXGyrePagella-Italic "encqtexnansi ReEncodeFont" <q-texnansi.enc <qplri.pfb
-texnansi-qplb TeXGyrePagella-Bold "encqtexnansi ReEncodeFont" <q-texnansi.enc <qplb.pfb
-texnansi-qplbi TeXGyrePagella-BoldItalic "encqtexnansi ReEncodeFont" <q-texnansi.enc <qplbi.pfb
-texnansi-qplr-sc TeXGyrePagella-Regular "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qplr.pfb
-texnansi-qplri-sc TeXGyrePagella-Italic "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qplri.pfb
-texnansi-qplb-sc TeXGyrePagella-Bold "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qplb.pfb
-texnansi-qplbi-sc TeXGyrePagella-BoldItalic "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/texnansi-qtm.map b/fonts/map/pdftex/context/texnansi-qtm.map
deleted file mode 100644
index 373555f3f..000000000
--- a/fonts/map/pdftex/context/texnansi-qtm.map
+++ /dev/null
@@ -1,15 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-texnansi-qtmr TeXGyreTermes-Regular "encqtexnansi ReEncodeFont" <q-texnansi.enc <qtmr.pfb
-texnansi-qtmri TeXGyreTermes-Italic "encqtexnansi ReEncodeFont" <q-texnansi.enc <qtmri.pfb
-texnansi-qtmb TeXGyreTermes-Bold "encqtexnansi ReEncodeFont" <q-texnansi.enc <qtmb.pfb
-texnansi-qtmbi TeXGyreTermes-BoldItalic "encqtexnansi ReEncodeFont" <q-texnansi.enc <qtmbi.pfb
-texnansi-qtmr-sc TeXGyreTermes-Regular "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qtmr.pfb
-texnansi-qtmri-sc TeXGyreTermes-Italic "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qtmri.pfb
-texnansi-qtmb-sc TeXGyreTermes-Bold "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qtmb.pfb
-texnansi-qtmbi-sc TeXGyreTermes-BoldItalic "encqtexnansisc ReEncodeFont" <q-texnansi-sc.enc <qtmbi.pfb
diff --git a/fonts/map/pdftex/context/ts1-qbk.map b/fonts/map/pdftex/context/ts1-qbk.map
deleted file mode 100644
index c85e04d00..000000000
--- a/fonts/map/pdftex/context/ts1-qbk.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Bonum.txt
-% and README-TeX-Gyre-Bonum.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-ts1-qbkr TeXGyreBonum-Regular "encqts1 ReEncodeFont" <q-ts1.enc <qbkr.pfb
-ts1-qbkri TeXGyreBonum-Italic "encqts1 ReEncodeFont" <q-ts1.enc <qbkri.pfb
-ts1-qbkb TeXGyreBonum-Bold "encqts1 ReEncodeFont" <q-ts1.enc <qbkb.pfb
-ts1-qbkbi TeXGyreBonum-BoldItalic "encqts1 ReEncodeFont" <q-ts1.enc <qbkbi.pfb
diff --git a/fonts/map/pdftex/context/ts1-qcs.map b/fonts/map/pdftex/context/ts1-qcs.map
deleted file mode 100644
index 418eb94e7..000000000
--- a/fonts/map/pdftex/context/ts1-qcs.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Schola.txt
-% and README-TeX-Gyre-Schola.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-ts1-qcsr TeXGyreSchola-Regular "encqts1 ReEncodeFont" <q-ts1.enc <qcsr.pfb
-ts1-qcsri TeXGyreSchola-Italic "encqts1 ReEncodeFont" <q-ts1.enc <qcsri.pfb
-ts1-qcsb TeXGyreSchola-Bold "encqts1 ReEncodeFont" <q-ts1.enc <qcsb.pfb
-ts1-qcsbi TeXGyreSchola-BoldItalic "encqts1 ReEncodeFont" <q-ts1.enc <qcsbi.pfb
diff --git a/fonts/map/pdftex/context/ts1-qpl.map b/fonts/map/pdftex/context/ts1-qpl.map
deleted file mode 100644
index e09358b1d..000000000
--- a/fonts/map/pdftex/context/ts1-qpl.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Pagella.txt
-% and README-TeX-Gyre-Pagella.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-ts1-qplr TeXGyrePagella-Regular "encqts1 ReEncodeFont" <q-ts1.enc <qplr.pfb
-ts1-qplri TeXGyrePagella-Italic "encqts1 ReEncodeFont" <q-ts1.enc <qplri.pfb
-ts1-qplb TeXGyrePagella-Bold "encqts1 ReEncodeFont" <q-ts1.enc <qplb.pfb
-ts1-qplbi TeXGyrePagella-BoldItalic "encqts1 ReEncodeFont" <q-ts1.enc <qplbi.pfb
diff --git a/fonts/map/pdftex/context/ts1-qtm.map b/fonts/map/pdftex/context/ts1-qtm.map
deleted file mode 100644
index 7118c34fb..000000000
--- a/fonts/map/pdftex/context/ts1-qtm.map
+++ /dev/null
@@ -1,11 +0,0 @@
-% This file belongs to the TeX Gyre collection of fonts. The work is released
-% under the GUST Font License. See the MANIFEST-TeX-Gyre-Termes.txt
-% and README-TeX-Gyre-Termes.txt files for the details.
-% For the most recent version of this license see
-% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt or
-% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
-% 
-ts1-qtmr TeXGyreTermes-Regular "encqts1 ReEncodeFont" <q-ts1.enc <qtmr.pfb
-ts1-qtmri TeXGyreTermes-Italic "encqts1 ReEncodeFont" <q-ts1.enc <qtmri.pfb
-ts1-qtmb TeXGyreTermes-Bold "encqts1 ReEncodeFont" <q-ts1.enc <qtmb.pfb
-ts1-qtmbi TeXGyreTermes-BoldItalic "encqts1 ReEncodeFont" <q-ts1.enc <qtmbi.pfb