From b13d26c37597dbbb0d0853e7ec1f556715ff9668 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 7 Apr 2011 22:58:39 +0000
Subject: still trying to rename groff to metapost

git-svn-id: svn://tug.org/texlive/trunk@22014 c570f23f-e606-0410-a88d-b1316a301751
---
 .../fonts/map/dvips/groff/troff-updmap.map         | 46 ----------------------
 Master/texmf-dist/fonts/map/dvips/groff/troff.map  | 41 -------------------
 .../fonts/map/dvips/metapost/troff-updmap.map      | 46 ++++++++++++++++++++++
 .../texmf-dist/fonts/map/dvips/metapost/troff.map  | 41 +++++++++++++++++++
 Master/tlpkg/tlpsrc/metapost.tlpsrc                |  7 ++++
 5 files changed, 94 insertions(+), 87 deletions(-)
 delete mode 100644 Master/texmf-dist/fonts/map/dvips/groff/troff-updmap.map
 delete mode 100644 Master/texmf-dist/fonts/map/dvips/groff/troff.map
 create mode 100644 Master/texmf-dist/fonts/map/dvips/metapost/troff-updmap.map
 create mode 100644 Master/texmf-dist/fonts/map/dvips/metapost/troff.map

diff --git a/Master/texmf-dist/fonts/map/dvips/groff/troff-updmap.map b/Master/texmf-dist/fonts/map/dvips/groff/troff-updmap.map
deleted file mode 100644
index 0296ed52900..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/groff/troff-updmap.map
+++ /dev/null
@@ -1,46 +0,0 @@
-% troff-updmap.map.  Public domain.
-% 
-% This map file is just the same as troff.map, except that the entries
-% for psyr, psyro, and pzdr are removed.  Why?  Because those tfm names
-% already exist in the standard font support, as downloading the
-% StandardSymL and Dingbats fonts from URW.  Therefore the entries with
-% the Adobe names Symbol and ZapfDingbats causes a conflict.
-% --karl, 5nov07.
-% 
-pagd8g AvantGarde-Demi " groffEncoding ReEncodeFont " <groff.enc
-pagdo8g AvantGarde-DemiOblique " groffEncoding ReEncodeFont " <groff.enc
-pagk8g AvantGarde-Book " groffEncoding ReEncodeFont " <groff.enc
-pagko8g AvantGarde-BookOblique " groffEncoding ReEncodeFont " <groff.enc
-pbkd8g Bookman-Demi " groffEncoding ReEncodeFont " <groff.enc
-pbkdi8g Bookman-DemiItalic " groffEncoding ReEncodeFont " <groff.enc
-pbkl8g Bookman-Light " groffEncoding ReEncodeFont " <groff.enc
-pbkli8g Bookman-LightItalic " groffEncoding ReEncodeFont " <groff.enc
-pcrb8g Courier-Bold " groffEncoding ReEncodeFont " <groff.enc
-pcrbo8g Courier-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
-pcrr8g Courier " groffEncoding ReEncodeFont " <groff.enc
-pcrro8g Courier-Oblique " groffEncoding ReEncodeFont " <groff.enc
-phvb8g Helvetica-Bold " groffEncoding ReEncodeFont " <groff.enc
-phvbo8g Helvetica-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
-phvr8g Helvetica " groffEncoding ReEncodeFont " <groff.enc
-phvro8g Helvetica-Oblique " groffEncoding ReEncodeFont " <groff.enc
-phvb8gn Helvetica-Narrow-Bold " groffEncoding ReEncodeFont " <groff.enc
-phvbo8gn Helvetica-Narrow-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
-phvr8gn Helvetica-Narrow " groffEncoding ReEncodeFont " <groff.enc
-phvro8gn Helvetica-Narrow-Oblique " groffEncoding ReEncodeFont " <groff.enc
-pncb8g NewCenturySchlbk-Bold " groffEncoding ReEncodeFont " <groff.enc
-pncbi8g NewCenturySchlbk-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
-pncr8g NewCenturySchlbk-Roman " groffEncoding ReEncodeFont " <groff.enc
-pncri8g NewCenturySchlbk-Italic " groffEncoding ReEncodeFont " <groff.enc
-pplb8g Palatino-Bold " groffEncoding ReEncodeFont " <groff.enc
-pplbi8g Palatino-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
-pplr8g Palatino-Roman " groffEncoding ReEncodeFont " <groff.enc
-pplri8g Palatino-Italic " groffEncoding ReEncodeFont " <groff.enc
-ptmb8g Times-Bold " groffEncoding ReEncodeFont " <groff.enc
-ptmbi8g Times-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
-ptmr8g Times-Roman " groffEncoding ReEncodeFont " <groff.enc
-ptmri8g Times-Italic " groffEncoding ReEncodeFont " <groff.enc
-pzcmi8g ZapfChancery-MediumItalic " groffEncoding ReEncodeFont " <groff.enc
-freeeuro FreeEuro <freeeuro.pfa
-psyrgo Symbol
-zpzdr-reversed ZapfDingbats
-
diff --git a/Master/texmf-dist/fonts/map/dvips/groff/troff.map b/Master/texmf-dist/fonts/map/dvips/groff/troff.map
deleted file mode 100644
index a7c50b45291..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/groff/troff.map
+++ /dev/null
@@ -1,41 +0,0 @@
-% troff.map.  Public domain.
-% MetaPost uses this in troff mode (which these days means groff).
-% 
-pagd8g AvantGarde-Demi " groffEncoding ReEncodeFont " <groff.enc
-pagdo8g AvantGarde-DemiOblique " groffEncoding ReEncodeFont " <groff.enc
-pagk8g AvantGarde-Book " groffEncoding ReEncodeFont " <groff.enc
-pagko8g AvantGarde-BookOblique " groffEncoding ReEncodeFont " <groff.enc
-pbkd8g Bookman-Demi " groffEncoding ReEncodeFont " <groff.enc
-pbkdi8g Bookman-DemiItalic " groffEncoding ReEncodeFont " <groff.enc
-pbkl8g Bookman-Light " groffEncoding ReEncodeFont " <groff.enc
-pbkli8g Bookman-LightItalic " groffEncoding ReEncodeFont " <groff.enc
-pcrb8g Courier-Bold " groffEncoding ReEncodeFont " <groff.enc
-pcrbo8g Courier-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
-pcrr8g Courier " groffEncoding ReEncodeFont " <groff.enc
-pcrro8g Courier-Oblique " groffEncoding ReEncodeFont " <groff.enc
-phvb8g Helvetica-Bold " groffEncoding ReEncodeFont " <groff.enc
-phvbo8g Helvetica-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
-phvr8g Helvetica " groffEncoding ReEncodeFont " <groff.enc
-phvro8g Helvetica-Oblique " groffEncoding ReEncodeFont " <groff.enc
-phvb8gn Helvetica-Narrow-Bold " groffEncoding ReEncodeFont " <groff.enc
-phvbo8gn Helvetica-Narrow-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
-phvr8gn Helvetica-Narrow " groffEncoding ReEncodeFont " <groff.enc
-phvro8gn Helvetica-Narrow-Oblique " groffEncoding ReEncodeFont " <groff.enc
-pncb8g NewCenturySchlbk-Bold " groffEncoding ReEncodeFont " <groff.enc
-pncbi8g NewCenturySchlbk-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
-pncr8g NewCenturySchlbk-Roman " groffEncoding ReEncodeFont " <groff.enc
-pncri8g NewCenturySchlbk-Italic " groffEncoding ReEncodeFont " <groff.enc
-pplb8g Palatino-Bold " groffEncoding ReEncodeFont " <groff.enc
-pplbi8g Palatino-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
-pplr8g Palatino-Roman " groffEncoding ReEncodeFont " <groff.enc
-pplri8g Palatino-Italic " groffEncoding ReEncodeFont " <groff.enc
-ptmb8g Times-Bold " groffEncoding ReEncodeFont " <groff.enc
-ptmbi8g Times-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
-ptmr8g Times-Roman " groffEncoding ReEncodeFont " <groff.enc
-ptmri8g Times-Italic " groffEncoding ReEncodeFont " <groff.enc
-pzcmi8g ZapfChancery-MediumItalic " groffEncoding ReEncodeFont " <groff.enc
-freeeuro FreeEuro <freeeuro.pfa
-psyrgo Symbol
-zpzdr-reversed ZapfDingbats
-psyr Symbol
-pzdr ZapfDingbats
diff --git a/Master/texmf-dist/fonts/map/dvips/metapost/troff-updmap.map b/Master/texmf-dist/fonts/map/dvips/metapost/troff-updmap.map
new file mode 100644
index 00000000000..0296ed52900
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/metapost/troff-updmap.map
@@ -0,0 +1,46 @@
+% troff-updmap.map.  Public domain.
+% 
+% This map file is just the same as troff.map, except that the entries
+% for psyr, psyro, and pzdr are removed.  Why?  Because those tfm names
+% already exist in the standard font support, as downloading the
+% StandardSymL and Dingbats fonts from URW.  Therefore the entries with
+% the Adobe names Symbol and ZapfDingbats causes a conflict.
+% --karl, 5nov07.
+% 
+pagd8g AvantGarde-Demi " groffEncoding ReEncodeFont " <groff.enc
+pagdo8g AvantGarde-DemiOblique " groffEncoding ReEncodeFont " <groff.enc
+pagk8g AvantGarde-Book " groffEncoding ReEncodeFont " <groff.enc
+pagko8g AvantGarde-BookOblique " groffEncoding ReEncodeFont " <groff.enc
+pbkd8g Bookman-Demi " groffEncoding ReEncodeFont " <groff.enc
+pbkdi8g Bookman-DemiItalic " groffEncoding ReEncodeFont " <groff.enc
+pbkl8g Bookman-Light " groffEncoding ReEncodeFont " <groff.enc
+pbkli8g Bookman-LightItalic " groffEncoding ReEncodeFont " <groff.enc
+pcrb8g Courier-Bold " groffEncoding ReEncodeFont " <groff.enc
+pcrbo8g Courier-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
+pcrr8g Courier " groffEncoding ReEncodeFont " <groff.enc
+pcrro8g Courier-Oblique " groffEncoding ReEncodeFont " <groff.enc
+phvb8g Helvetica-Bold " groffEncoding ReEncodeFont " <groff.enc
+phvbo8g Helvetica-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
+phvr8g Helvetica " groffEncoding ReEncodeFont " <groff.enc
+phvro8g Helvetica-Oblique " groffEncoding ReEncodeFont " <groff.enc
+phvb8gn Helvetica-Narrow-Bold " groffEncoding ReEncodeFont " <groff.enc
+phvbo8gn Helvetica-Narrow-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
+phvr8gn Helvetica-Narrow " groffEncoding ReEncodeFont " <groff.enc
+phvro8gn Helvetica-Narrow-Oblique " groffEncoding ReEncodeFont " <groff.enc
+pncb8g NewCenturySchlbk-Bold " groffEncoding ReEncodeFont " <groff.enc
+pncbi8g NewCenturySchlbk-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
+pncr8g NewCenturySchlbk-Roman " groffEncoding ReEncodeFont " <groff.enc
+pncri8g NewCenturySchlbk-Italic " groffEncoding ReEncodeFont " <groff.enc
+pplb8g Palatino-Bold " groffEncoding ReEncodeFont " <groff.enc
+pplbi8g Palatino-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
+pplr8g Palatino-Roman " groffEncoding ReEncodeFont " <groff.enc
+pplri8g Palatino-Italic " groffEncoding ReEncodeFont " <groff.enc
+ptmb8g Times-Bold " groffEncoding ReEncodeFont " <groff.enc
+ptmbi8g Times-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
+ptmr8g Times-Roman " groffEncoding ReEncodeFont " <groff.enc
+ptmri8g Times-Italic " groffEncoding ReEncodeFont " <groff.enc
+pzcmi8g ZapfChancery-MediumItalic " groffEncoding ReEncodeFont " <groff.enc
+freeeuro FreeEuro <freeeuro.pfa
+psyrgo Symbol
+zpzdr-reversed ZapfDingbats
+
diff --git a/Master/texmf-dist/fonts/map/dvips/metapost/troff.map b/Master/texmf-dist/fonts/map/dvips/metapost/troff.map
new file mode 100644
index 00000000000..a7c50b45291
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/metapost/troff.map
@@ -0,0 +1,41 @@
+% troff.map.  Public domain.
+% MetaPost uses this in troff mode (which these days means groff).
+% 
+pagd8g AvantGarde-Demi " groffEncoding ReEncodeFont " <groff.enc
+pagdo8g AvantGarde-DemiOblique " groffEncoding ReEncodeFont " <groff.enc
+pagk8g AvantGarde-Book " groffEncoding ReEncodeFont " <groff.enc
+pagko8g AvantGarde-BookOblique " groffEncoding ReEncodeFont " <groff.enc
+pbkd8g Bookman-Demi " groffEncoding ReEncodeFont " <groff.enc
+pbkdi8g Bookman-DemiItalic " groffEncoding ReEncodeFont " <groff.enc
+pbkl8g Bookman-Light " groffEncoding ReEncodeFont " <groff.enc
+pbkli8g Bookman-LightItalic " groffEncoding ReEncodeFont " <groff.enc
+pcrb8g Courier-Bold " groffEncoding ReEncodeFont " <groff.enc
+pcrbo8g Courier-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
+pcrr8g Courier " groffEncoding ReEncodeFont " <groff.enc
+pcrro8g Courier-Oblique " groffEncoding ReEncodeFont " <groff.enc
+phvb8g Helvetica-Bold " groffEncoding ReEncodeFont " <groff.enc
+phvbo8g Helvetica-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
+phvr8g Helvetica " groffEncoding ReEncodeFont " <groff.enc
+phvro8g Helvetica-Oblique " groffEncoding ReEncodeFont " <groff.enc
+phvb8gn Helvetica-Narrow-Bold " groffEncoding ReEncodeFont " <groff.enc
+phvbo8gn Helvetica-Narrow-BoldOblique " groffEncoding ReEncodeFont " <groff.enc
+phvr8gn Helvetica-Narrow " groffEncoding ReEncodeFont " <groff.enc
+phvro8gn Helvetica-Narrow-Oblique " groffEncoding ReEncodeFont " <groff.enc
+pncb8g NewCenturySchlbk-Bold " groffEncoding ReEncodeFont " <groff.enc
+pncbi8g NewCenturySchlbk-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
+pncr8g NewCenturySchlbk-Roman " groffEncoding ReEncodeFont " <groff.enc
+pncri8g NewCenturySchlbk-Italic " groffEncoding ReEncodeFont " <groff.enc
+pplb8g Palatino-Bold " groffEncoding ReEncodeFont " <groff.enc
+pplbi8g Palatino-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
+pplr8g Palatino-Roman " groffEncoding ReEncodeFont " <groff.enc
+pplri8g Palatino-Italic " groffEncoding ReEncodeFont " <groff.enc
+ptmb8g Times-Bold " groffEncoding ReEncodeFont " <groff.enc
+ptmbi8g Times-BoldItalic " groffEncoding ReEncodeFont " <groff.enc
+ptmr8g Times-Roman " groffEncoding ReEncodeFont " <groff.enc
+ptmri8g Times-Italic " groffEncoding ReEncodeFont " <groff.enc
+pzcmi8g ZapfChancery-MediumItalic " groffEncoding ReEncodeFont " <groff.enc
+freeeuro FreeEuro <freeeuro.pfa
+psyrgo Symbol
+zpzdr-reversed ZapfDingbats
+psyr Symbol
+pzdr ZapfDingbats
diff --git a/Master/tlpkg/tlpsrc/metapost.tlpsrc b/Master/tlpkg/tlpsrc/metapost.tlpsrc
index 2dedb39576d..a1b457bb10a 100644
--- a/Master/tlpkg/tlpsrc/metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/metapost.tlpsrc
@@ -1,3 +1,5 @@
+execute addMap troff-updmap.map
+#
 depend kpathsea
 #
 srcpattern f ignore
@@ -15,4 +17,9 @@ runpattern d texmf-dist/metapost/config
 runpattern d texmf-dist/metapost/misc
 runpattern d texmf-dist/metapost/support
 runpattern d texmf-dist/tex/generic/metapost
+#
+runpattern d texmf-dist/fonts/enc/dvips/metapost
+runpattern d texmf-dist/fonts/map/dvips/metapost
+runpattern d texmf-dist/fonts/afm/metapost
 runpattern d texmf-dist/fonts/tfm/metapost
+runpattern d texmf-dist/fonts/type1/metapost
-- 
cgit v1.2.3