specify pdftex fontflags for non-downloaded base14 to avoid warnings; suggestion from Akira, 7 Jun 2013 18:58:38

git-svn-id: svn://tug.org/texlive/trunk@31831 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 247 insertions, 133 deletions

diff --git a/Master/texmf-dist/fonts/map/dvips/tetex/Makefile b/Master/texmf-dist/fonts/map/dvips/tetex/Makefile
new file mode 100644
index 00000000000..5bf72587417
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/tetex/Makefile
@@ -0,0 +1,51 @@
+# $Id$
+# Copyright 2013 Karl Berry.
+# You may freely use, modify, and/or distribute this file.
+#
+# Makefile to help with the base35/base14 support in TL.  See ./README.
+
+# The main texmf-dist directory.
+xmf = $(shell cd ../../../.. && pwd)
+
+# Pieces of the invocation.
+tmpdir = /tmp/umap
+umap_env  = TEXMFSYSVAR=$(tmpdir)
+#
+umap_prog = updmap-sys
+umap_opts = --copy --nohash --quiet
+umap_cnf  = --cnffile=$(xmf)/web2c/updmap.cfg
+#
+mapdir   = $(xmf)/fonts/map
+umap_out = --dvipdfmxoutputdir=$(mapdir)/dvipdfmx/updmap \
+  --dvipsoutputdir=$(mapdir)/dvips/updmap \
+  --pdftexoutputdir=$(mapdir)/pdftex/updmap
+#
+umap_opts_all = $(umap_opts) $(umap_cnf) $(umap_out)
+
+# Rerun updmap, diff results.
+makemaps:
+	rm -rf $(tmpdir)
+	$(umap_env) $(umap_prog) $(umap_opts_all)
+	svn status $(mapdir)  $(xmf)/web2c
+	svn diff $(mapdir) $(xmf)/web2c \
+	  >$(tmpdir)/sdiff
+
+# Conveniently show the pdftex-generated fontflags; inserted the results
+# (by hand) in pdftex35.map, 4oct13.  pdftex outputs the flag values in
+# the midst of the two-line warning messages.  The sed/etc. nonsense is
+# just to print the results nicely.  See $(base).tex for more.
+base = base14flags
+showflags:
+	pdflatex '\nonstopmode\input $(base).tex' >$(base).trn
+	sed -n -e 's,.*ded font ,,p' \
+	       -e 's,I.m using ,,'  \
+	       -e 's,: fix your map entry.,,p' \
+	    $(base).log \
+	| paste - - \
+	| tr -d '	`()'"'" \
+	| sort +1 \
+	| tee $(base).flags
+
+# Test with minimal LaTeX document.
+check:
+	pdflatex '\nonstopmode\input base14flags.ltx'
diff --git a/Master/texmf-dist/fonts/map/dvips/tetex/README b/Master/texmf-dist/fonts/map/dvips/tetex/README
index c13463b6054..25dfe191f6b 100644
--- a/Master/texmf-dist/fonts/map/dvips/tetex/README
+++ b/Master/texmf-dist/fonts/map/dvips/tetex/README
@@ -1,8 +1,10 @@
-Copyright 2011 Karl Berry
-You may freely use, modify, and/or distribute this file, without limitation.
+$Id$
+Copyright 2011-2013 Karl Berry.
+You may freely use, modify, and/or distribute this file.
 
 The idea behind these files is to define map entries for the 35 standard
-PostScript fonts, in the 8r, 8y, and 8z encodings.  
+PostScript fonts, in the 8r, 8y, and 8z encodings, plus the Y&Y "short"
+names (tir, hv, etc.) which also use 8y.
 
 We support these encodings here, instead of using the .map files from
 the ly1 and cs packages, because updmap supports various options to
@@ -13,7 +15,7 @@ anything about them should be included here for best results.
 
 Here's the idea:
 - the "base14" fonts are Courier, Helvetica, Times (x4 of each)
-  plus the singular Symbol and and ZapfDingbats.
+  plus the singular Symbol and ZapfDingbats.
 - the "base35" fonts add Avant Garde, New Century Schoolbook,
   Helvetica-Narrow and Palatino (x4 of each).
 
@@ -25,16 +27,19 @@ Here's the idea:
 
 - these days, it is recommended (and the default) to download
   everything, for both ps and pdf output.
+- but if base14 is not downloaded, we specify pdftex's fontflags to
+  avoid useless warnings.  (Only base14, not base35.)  See ./Makefile
+  and base14flags.*.
 
-Nevertheless, the files here support various combinations of the above:
+The files here support various combinations of the above:
 dvipdfm35.map - Adobe for base14, URW otherwise (dvipdfm syntax, obsolete).
 pdftex35.map  - Adobe for base14, URW otherwise (pdftex syntax).
 dvips35.map   - Adobe for everything.
 ps2pk35.map   - URW for everything (the default).
 
 These names (dvipdfm, pdftex, dvips, ps2pk) refer to usage and syntax,
-not to the programs by those names, as one might reasonably assume.  It
-is only updmap that reads these particular files, not the programs.
+not to the programs by those names, as one might reasonably assume.
+It is only updmap that reads these particular files, not the programs.
 
 It would have been simpler if we had generated these files from a
 program in the first place instead of maintaining these multiple
diff --git a/Master/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx b/Master/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx
new file mode 100644
index 00000000000..4435eba2958
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx
@@ -0,0 +1,12 @@
+% $Id$
+% (Trivial, uncopyrightable, public domain.)
+% 
+% This little LaTeX test file will see if pdftex gives missing flag
+% warnings about base14 fonts when they are not downloaded.
+% 
+\documentclass{article}
+\pdfmapfile{pdftex_ndl14.map}
+\usepackage{times}
+\begin{document}
+This is a test.
+\end{document}
diff --git a/Master/texmf-dist/fonts/map/dvips/tetex/base14flags.tex b/Master/texmf-dist/fonts/map/dvips/tetex/base14flags.tex
new file mode 100644
index 00000000000..a48ff00e666
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/tetex/base14flags.tex
@@ -0,0 +1,43 @@
+% $Id$
+% Copyright 2013 Karl Berry.
+% You may freely use, modify, and/or distribute this file.
+% 
+% Use each of the base14 fonts, explicitly eliminating fontflags from
+% the map entries.  This causes pdftex to internally generate them
+% (mapfile.c) and issue a warning including the value, so we can see
+% what they are.  (See ./Makefile for a little rule to extract the values.)
+%
+% Why do we go to the trouble of using flag values for the base14 fonts,
+% instead of eliminating the flag warning altogether in the source?
+% Because it's conceivable (though not practical) that someone would
+% want to specify some other font as not-downloaded, and hence want to
+% specify flags for it.  In general, it just seems safer to specify the
+% flags where they should be specified instead of ignoring the issue.
+
+\nopagenumbers
+\def\dofont#1#2{%
+  \pdfmapline{#1 #2 <8r.enc}%
+  \font\0 = #1 \0 \hbox{#1 #2}\space
+}
+
+% base14 only, not base35.
+\dofont{pcrb8r}{Courier-Bold}
+\dofont{pcrbo8r}{Courier-BoldOblique}
+\dofont{pcrr8r}{Courier}
+\dofont{pcrro8r}{Courier-Oblique}
+%
+\dofont{phvb8r}{Helvetica-Bold}
+\dofont{phvbo8r}{Helvetica-BoldOblique}
+\dofont{phvr8r}{Helvetica}
+\dofont{phvro8r}{Helvetica-Oblique}
+%
+\dofont{psyr}{Symbol}
+%
+\dofont{ptmb8r}{Times-Bold}
+\dofont{ptmbi8r}{Times-BoldItalic}
+\dofont{ptmr8r}{Times-Roman}
+\dofont{ptmri8r}{Times-Italic}
+%
+\dofont{pzdr}{ZapfDingbats}
+
+\end
diff --git a/Master/texmf-dist/fonts/map/dvips/tetex/pdftex35.map b/Master/texmf-dist/fonts/map/dvips/tetex/pdftex35.map
index cf282edff10..ae0226fe3bc 100644
--- a/Master/texmf-dist/fonts/map/dvips/tetex/pdftex35.map
+++ b/Master/texmf-dist/fonts/map/dvips/tetex/pdftex35.map
@@ -1,19 +1,11 @@
 % $Id$
 % Thomas Esser, 2002, public domain.
 % Purpose: LW35 fonts with pdftex specifics (download when transforming).
-% Use Adobe names for the 14 base PDF fonts, URW (and download) otherwise.
+% Use Adobe names for the 14 base PDF fonts and include pdftex fontflags,
+% URW (and download) otherwise.
+% See ./README for where the flags came from.
 % This file is used by updmap to generate pdftex_ndl14.map.
 
-% Old Y&Y, etc., names.  Keep since they don't hurt anything.
-cob Courier-Bold "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-cobo Courier-BoldOblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-com Courier "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-coo Courier-Oblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-hv Helvetica "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-hvb Helvetica-Bold "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-hvbo Helvetica-BoldOblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-hvo Helvetica-Oblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-
 %  Avant Garde
 pagd8r URWGothicL-Demi "TeXBase1Encoding ReEncodeFont" <8r.enc <uagd8a.pfb
 pagdo8r URWGothicL-DemiObli "TeXBase1Encoding ReEncodeFont" <8r.enc <uagdo8a.pfb
@@ -51,37 +43,47 @@ pbkl8z  URWBookmanL-Ligh         "XL2encoding ReEncodeFont" <xl2.enc <ubkl8a.pfb
 pbkli8z URWBookmanL-LighItal     "XL2encoding ReEncodeFont" <xl2.enc <ubkli8a.pfb
 
 %  Courier
-pcrb8r Courier-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-pcrbo8r Courier-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-pcrr8r Courier "TeXBase1Encoding ReEncodeFont" <8r.enc
-pcrr8rn NimbusMonL-Regu ".85 ExtendFont TeXBase1Encoding ReEncodeFont" <8r.enc <ucrr8a.pfb
-pcrro8r Courier-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+pcrb8r  Courier-Bold        262179 "TeXBase1Encoding ReEncodeFont" <8r.enc
+pcrbo8r Courier-BoldOblique 262243 "TeXBase1Encoding ReEncodeFont" <8r.enc
+pcrr8r  Courier                 35 "TeXBase1Encoding ReEncodeFont" <8r.enc
+pcrr8rn NimbusMonL-Regu            ".85 ExtendFont TeXBase1Encoding ReEncodeFont" <8r.enc <ucrr8a.pfb
+pcrro8r Courier-Oblique         99 "TeXBase1Encoding ReEncodeFont" <8r.enc
 %
-pcrb8y Courier-Bold "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-pcrbo8y Courier-BoldOblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-pcrr8y Courier "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-pcrro8y Courier-Oblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+pcrb8y  Courier-Bold        262179 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+pcrbo8y Courier-BoldOblique 262243 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+pcrr8y  Courier                 35 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+pcrro8y Courier-Oblique         99 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
 %
-pcrb8u    Courier-Bold        "XT2encoding ReEncodeFont" <xt2.enc
-pcrbo8u   Courier-BoldOblique "XT2encoding ReEncodeFont" <xt2.enc
-pcrro8u   Courier-Oblique     "XT2encoding ReEncodeFont" <xt2.enc
-pcrr8u    Courier             "XT2encoding ReEncodeFont" <xt2.enc
+pcrb8u  Courier-Bold        262179 "XT2encoding ReEncodeFont" <xt2.enc
+pcrbo8u Courier-BoldOblique 262243 "XT2encoding ReEncodeFont" <xt2.enc
+pcrro8u Courier-Oblique         35 "XT2encoding ReEncodeFont" <xt2.enc
+pcrr8u  Courier                 99 "XT2encoding ReEncodeFont" <xt2.enc
+% Y&Y:
+cob     Courier-Bold        262179 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+cobo    Courier-BoldOblique 262243 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+com     Courier                 35 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+coo     Courier-Oblique         99 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
 
 %  Helvetica
-phvb8r Helvetica-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvbo8r Helvetica-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvr8r Helvetica "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvro8r Helvetica-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvb8r   Helvetica-Bold        262176 "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvbo8r  Helvetica-BoldOblique 262240 "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvr8r   Helvetica                 32 "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvro8r  Helvetica-Oblique         96 "TeXBase1Encoding ReEncodeFont" <8r.enc
 %
-phvb8y Helvetica-Bold "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-phvbo8y Helvetica-BoldOblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-phvr8y Helvetica "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-phvro8y Helvetica-Oblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+phvb8y   Helvetica-Bold        262176 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+phvbo8y  Helvetica-BoldOblique 262240 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+phvr8y   Helvetica                 32 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+phvro8y  Helvetica-Oblique         96 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
 %
-phvb8z   Helvetica-Bold        "XL2encoding ReEncodeFont" <xl2.enc
-phvbo8z  Helvetica-BoldOblique "XL2encoding ReEncodeFont" <xl2.enc
-phvr8z   Helvetica             "XL2encoding ReEncodeFont" <xl2.enc
-phvro8z  Helvetica-Oblique     "XL2encoding ReEncodeFont" <xl2.enc
+phvb8z   Helvetica-Bold        262176 "XL2encoding ReEncodeFont" <xl2.enc
+phvbo8z  Helvetica-BoldOblique 262240 "XL2encoding ReEncodeFont" <xl2.enc
+phvr8z   Helvetica                 32 "XL2encoding ReEncodeFont" <xl2.enc
+phvro8z  Helvetica-Oblique         96 "XL2encoding ReEncodeFont" <xl2.enc
+% Y&Y:
+hv       Helvetica                 32 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+hvb      Helvetica-Bold        262176 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+hvbo     Helvetica-BoldOblique 262240 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+hvo      Helvetica-Oblique         96 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
 
 %  Helvetica Narrow
 phvb8rn  NimbusSanL-BoldCond     "TeXBase1Encoding ReEncodeFont" <8r.enc <uhvb8ac.pfb
@@ -148,39 +150,48 @@ pplr8z  URWPalladioL-Roma     "XL2encoding ReEncodeFont" <xl2.enc <uplr8a.pfb
 pplri8z URWPalladioL-Ital     "XL2encoding ReEncodeFont" <xl2.enc <uplri8a.pfb
 
 %  Symbol
-psyr Symbol
+psyr Symbol 4
+sy   Symbol 4
 psyro StandardSymL ".167 SlantFont" <usyr.pfb
 
 %  Times
-ptmb8r Times-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-ptmbi8r Times-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
-ptmbo8r NimbusRomNo9L-Medi ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmb8a.pfb
-ptmr8r Times-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
-ptmr8rn NimbusRomNo9L-Regu ".82 ExtendFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmr8a.pfb
-ptmri8r Times-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
-ptmro8r NimbusRomNo9L-Regu ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmr8a.pfb
-ptmrr8re NimbusRomNo9L-Regu "1.2 ExtendFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmr8a.pfb
+ptmb8r   Times-Bold       262178 "TeXBase1Encoding ReEncodeFont" <8r.enc
+ptmbi8r  Times-BoldItalic 262242 "TeXBase1Encoding ReEncodeFont" <8r.enc
+ptmbo8r  NimbusRomNo9L-Medi      ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmb8a.pfb
+ptmr8r   Times-Roman          34 "TeXBase1Encoding ReEncodeFont" <8r.enc
+ptmr8rn  NimbusRomNo9L-Regu      ".82 ExtendFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmr8a.pfb
+ptmri8r  Times-Italic         98 "TeXBase1Encoding ReEncodeFont" <8r.enc
+ptmro8r  NimbusRomNo9L-Regu      ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmr8a.pfb
+ptmrr8re NimbusRomNo9L-Regu      "1.2 ExtendFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmr8a.pfb
+%
+ptmb8y   Times-Bold       262178 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+ptmbi8y  Times-BoldItalic 262242 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+ptmbo8y  NimbusRomNo9L-Medi      ".167 SlantFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmb8a.pfb
+ptmr8y   Times-Roman          34 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+ptmri8y  Times-Italic         98 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+ptmro8y  NimbusRomNo9L-Regu      ".167 SlantFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmr8a.pfb
+ptmrr8ye NimbusRomNo9L-Regu      "1.2 ExtendFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmr8a.pfb
+ptmr8yn  NimbusRomNo9L-Regu      ".82 ExtendFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmr8a.pfb
 %
-ptmb8y Times-Bold "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-ptmbi8y Times-BoldItalic "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-ptmbo8y NimbusRomNo9L-Medi ".167 SlantFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmb8a.pfb
-ptmr8y Times-Roman "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-ptmri8y Times-Italic "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-ptmro8y NimbusRomNo9L-Regu ".167 SlantFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmr8a.pfb
-ptmrr8ye NimbusRomNo9L-Regu "1.2 ExtendFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmr8a.pfb
-ptmr8yn NimbusRomNo9L-Regu ".82 ExtendFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmr8a.pfb
+ptmb8z   Times-Bold       262178 "XL2encoding ReEncodeFont" <xl2.enc
+ptmbi8z  Times-BoldItalic 262242 "XL2encoding ReEncodeFont" <xl2.enc
+ptmr8z   Times-Roman          34 "XL2encoding ReEncodeFont" <xl2.enc
+ptmri8z  Times-Italic         98 "XL2encoding ReEncodeFont" <xl2.enc
 %
-ptmb8z   Times-Bold       "XL2encoding ReEncodeFont" <xl2.enc
-ptmbi8z  Times-BoldItalic "XL2encoding ReEncodeFont" <xl2.enc
-ptmr8z   Times-Roman      "XL2encoding ReEncodeFont" <xl2.enc
-ptmri8z  Times-Italic     "XL2encoding ReEncodeFont" <xl2.enc
+tib      Times-Bold       262178 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+tibi     Times-BoldItalic 262242 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+tibo     NimbusRomNo9L-Medi      ".167 SlantFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmb8a.pfb
+tii      Times-Italic         34 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
+tio      NimbusRomNo9L-Regu      ".167 SlantFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmr8a.pfb
+tir      Times-Roman          98 "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
 
 %  Zapf
 pzcmi8r URWChanceryL-MediItal "TeXBase1Encoding ReEncodeFont" <8r.enc <uzcmi8a.pfb
 pzcmi8y URWChanceryL-MediItal "TeXnANSIEncoding ReEncodeFont" <texnansi.enc <uzcmi8a.pfb
 pzcmi8z URWChanceryL-MediItal "XL2encoding ReEncodeFont" <xl2.enc <uzcmi8a.pfb
 %
-pzdr ZapfDingbats
+pzdr ZapfDingbats 4
+zd   ZapfDingbats 4
 %
 % raw
 rpagd URWGothicL-Demi "StandardEncoding ReEncodeFont" <8a.enc <uagd8a.pfb
@@ -195,12 +206,12 @@ rpcrb Courier-Bold
 rpcrbo Courier-BoldOblique
 rpcrr Courier
 rpcrro Courier-Oblique
-rphvb Helvetica-Bold
-rphvbo Helvetica-BoldOblique
+rphvb Helvetica-Bold 262176 
+rphvbo Helvetica-BoldOblique 262240 
 rphvbon NimbusSanL-BoldItal ".82 ExtendFont StandardEncoding ReEncodeFont" <8a.enc <uhvbo8a.pfb
 rphvbrn NimbusSanL-Bold ".82 ExtendFont StandardEncoding ReEncodeFont" <8a.enc <uhvb8a.pfb
-rphvr Helvetica
-rphvro Helvetica-Oblique
+rphvr Helvetica 32 
+rphvro Helvetica-Oblique 96 
 rphvron NimbusSanL-ReguItal ".82 ExtendFont StandardEncoding ReEncodeFont" <8a.enc <uhvro8a.pfb
 rphvrrn NimbusSanL-Regu ".82 ExtendFont StandardEncoding ReEncodeFont" <8a.enc <uhvr8a.pfb
 rpncb CenturySchL-Bold "StandardEncoding ReEncodeFont" <8a.enc <uncb8a.pfb
@@ -244,13 +255,6 @@ rtxptmbo NimbusRomNo9L-Medi ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.e
 rtxptmr Times-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
 rtxptmri Times-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
 rtxptmro NimbusRomNo9L-Regu ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmr8a.pfb
-sy Symbol
-tib Times-Bold "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-tibi Times-BoldItalic "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-tibo NimbusRomNo9L-Medi ".167 SlantFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmb8a.pfb
-tii Times-Italic "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
-tio NimbusRomNo9L-Regu ".167 SlantFont TeXnANSIEncoding ReEncodeFont" <texnansi.enc <utmr8a.pfb
-tir Times-Roman "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
 tmbi108r Times-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
 tmbo108r NimbusRomNo9L-Medi ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmb8a.pfb
 tmbu108r NimbusRomNo9L-MediItal "-.277 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmbi8a.pfb
@@ -259,4 +263,3 @@ tmri108r Times-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
 tmrm108r Times-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
 tmro108r NimbusRomNo9L-Regu ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmr8a.pfb
 tmui108r NimbusRomNo9L-ReguItal "-.277 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <utmri8a.pfb
-zd ZapfDingbats
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
index 1701ab79ca3..f0c949e56ef 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
@@ -5,14 +5,14 @@
 % A log of the run that created this file is available here:
 % /tmp/umap/web2c/updmap.log
 % pdftex35.map
-cob Courier-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-cobo Courier-BoldOblique " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-com Courier " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-coo Courier-Oblique " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-hv Helvetica " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-hvb Helvetica-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-hvbo Helvetica-BoldOblique " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-hvo Helvetica-Oblique " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+cob Courier-Bold 262179 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+cobo Courier-BoldOblique 262243 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+com Courier 35 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+coo Courier-Oblique 99 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+hv Helvetica 32 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+hvb Helvetica-Bold 262176 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+hvbo Helvetica-BoldOblique 262240 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+hvo Helvetica-Oblique 96 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 pagd8r URWGothicL-Demi " TeXBase1Encoding ReEncodeFont " <8r.enc <uagd8a.pfb
 pagd8y URWGothicL-Demi " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uagd8a.pfb
 pagd8z URWGothicL-Demi " XL2encoding ReEncodeFont " <xl2.enc <uagd8a.pfb
@@ -41,42 +41,42 @@ pbkli8y URWBookmanL-LighItal " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ub
 pbkli8z URWBookmanL-LighItal " XL2encoding ReEncodeFont " <xl2.enc <ubkli8a.pfb
 pbklo8r URWBookmanL-Ligh " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <ubkl8a.pfb
 pbklo8y URWBookmanL-Ligh " .167 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ubkl8a.pfb
-pcrb8r Courier-Bold " TeXBase1Encoding ReEncodeFont " <8r.enc
-pcrb8u Courier-Bold " XT2encoding ReEncodeFont " <xt2.enc
-pcrb8y Courier-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-pcrbo8r Courier-BoldOblique " TeXBase1Encoding ReEncodeFont " <8r.enc
-pcrbo8u Courier-BoldOblique " XT2encoding ReEncodeFont " <xt2.enc
-pcrbo8y Courier-BoldOblique " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-pcrr8r Courier " TeXBase1Encoding ReEncodeFont " <8r.enc
+pcrb8r Courier-Bold 262179 " TeXBase1Encoding ReEncodeFont " <8r.enc
+pcrb8u Courier-Bold 262179 " XT2encoding ReEncodeFont " <xt2.enc
+pcrb8y Courier-Bold 262179 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+pcrbo8r Courier-BoldOblique 262243 " TeXBase1Encoding ReEncodeFont " <8r.enc
+pcrbo8u Courier-BoldOblique 262243 " XT2encoding ReEncodeFont " <xt2.enc
+pcrbo8y Courier-BoldOblique 262243 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+pcrr8r Courier 35 " TeXBase1Encoding ReEncodeFont " <8r.enc
 pcrr8rn NimbusMonL-Regu " .85 ExtendFont TeXBase1Encoding ReEncodeFont " <8r.enc <ucrr8a.pfb
-pcrr8u Courier " XT2encoding ReEncodeFont " <xt2.enc
-pcrr8y Courier " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-pcrro8r Courier-Oblique " TeXBase1Encoding ReEncodeFont " <8r.enc
-pcrro8u Courier-Oblique " XT2encoding ReEncodeFont " <xt2.enc
-pcrro8y Courier-Oblique " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-phvb8r Helvetica-Bold " TeXBase1Encoding ReEncodeFont " <8r.enc
+pcrr8u Courier 99 " XT2encoding ReEncodeFont " <xt2.enc
+pcrr8y Courier 35 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+pcrro8r Courier-Oblique 99 " TeXBase1Encoding ReEncodeFont " <8r.enc
+pcrro8u Courier-Oblique 35 " XT2encoding ReEncodeFont " <xt2.enc
+pcrro8y Courier-Oblique 99 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+phvb8r Helvetica-Bold 262176 " TeXBase1Encoding ReEncodeFont " <8r.enc
 phvb8rn NimbusSanL-BoldCond " TeXBase1Encoding ReEncodeFont " <8r.enc <uhvb8ac.pfb
-phvb8y Helvetica-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+phvb8y Helvetica-Bold 262176 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 phvb8yn NimbusSanL-BoldCond " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uhvb8ac.pfb
-phvb8z Helvetica-Bold " XL2encoding ReEncodeFont " <xl2.enc
+phvb8z Helvetica-Bold 262176 " XL2encoding ReEncodeFont " <xl2.enc
 phvbn8z NimbusSanL-BoldCond " XL2encoding ReEncodeFont " <xl2.enc <uhvb8ac.pfb
-phvbo8r Helvetica-BoldOblique " TeXBase1Encoding ReEncodeFont " <8r.enc
+phvbo8r Helvetica-BoldOblique 262240 " TeXBase1Encoding ReEncodeFont " <8r.enc
 phvbo8rn NimbusSanL-BoldCondItal " TeXBase1Encoding ReEncodeFont " <8r.enc <uhvbo8ac.pfb
-phvbo8y Helvetica-BoldOblique " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+phvbo8y Helvetica-BoldOblique 262240 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 phvbo8yn NimbusSanL-BoldCondItal " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uhvbo8ac.pfb
-phvbo8z Helvetica-BoldOblique " XL2encoding ReEncodeFont " <xl2.enc
+phvbo8z Helvetica-BoldOblique 262240 " XL2encoding ReEncodeFont " <xl2.enc
 phvbon8z NimbusSanL-BoldCondItal " XL2encoding ReEncodeFont " <xl2.enc <uhvbo8ac.pfb
-phvr8r Helvetica " TeXBase1Encoding ReEncodeFont " <8r.enc
+phvr8r Helvetica 32 " TeXBase1Encoding ReEncodeFont " <8r.enc
 phvr8rn NimbusSanL-ReguCond " TeXBase1Encoding ReEncodeFont " <8r.enc <uhvr8ac.pfb
-phvr8y Helvetica " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+phvr8y Helvetica 32 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 phvr8yn NimbusSanL-ReguCond " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uhvr8ac.pfb
-phvr8z Helvetica " XL2encoding ReEncodeFont " <xl2.enc
+phvr8z Helvetica 32 " XL2encoding ReEncodeFont " <xl2.enc
 phvrn8z NimbusSanL-ReguCond " XL2encoding ReEncodeFont " <xl2.enc <uhvr8ac.pfb
-phvro8r Helvetica-Oblique " TeXBase1Encoding ReEncodeFont " <8r.enc
+phvro8r Helvetica-Oblique 96 " TeXBase1Encoding ReEncodeFont " <8r.enc
 phvro8rn NimbusSanL-ReguCondItal " TeXBase1Encoding ReEncodeFont " <8r.enc <uhvro8ac.pfb
-phvro8y Helvetica-Oblique " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+phvro8y Helvetica-Oblique 96 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 phvro8yn NimbusSanL-ReguCondItal " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uhvro8ac.pfb
-phvro8z Helvetica-Oblique " XL2encoding ReEncodeFont " <xl2.enc
+phvro8z Helvetica-Oblique 96 " XL2encoding ReEncodeFont " <xl2.enc
 phvron8z NimbusSanL-ReguCondItal " XL2encoding ReEncodeFont " <xl2.enc <uhvro8ac.pfb
 pncb8r CenturySchL-Bold " TeXBase1Encoding ReEncodeFont " <8r.enc <uncb8a.pfb
 pncb8y CenturySchL-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uncb8a.pfb
@@ -118,24 +118,24 @@ pplrr8re URWPalladioL-Roma " 1.2 ExtendFont TeXBase1Encoding ReEncodeFont " <8r.
 pplrr8ye URWPalladioL-Roma " 1.2 ExtendFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uplr8a.pfb
 pplru8r URWPalladioL-Ital " -.1763 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <uplri8a.pfb
 pplru8y URWPalladioL-Ital " -.1763 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uplri8a.pfb
-psyr Symbol
+psyr Symbol 4
 psyro StandardSymL " .167 SlantFont " <usyr.pfb
-ptmb8r Times-Bold " TeXBase1Encoding ReEncodeFont " <8r.enc
-ptmb8y Times-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-ptmb8z Times-Bold " XL2encoding ReEncodeFont " <xl2.enc
-ptmbi8r Times-BoldItalic " TeXBase1Encoding ReEncodeFont " <8r.enc
-ptmbi8y Times-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-ptmbi8z Times-BoldItalic " XL2encoding ReEncodeFont " <xl2.enc
+ptmb8r Times-Bold 262178 " TeXBase1Encoding ReEncodeFont " <8r.enc
+ptmb8y Times-Bold 262178 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+ptmb8z Times-Bold 262178 " XL2encoding ReEncodeFont " <xl2.enc
+ptmbi8r Times-BoldItalic 262242 " TeXBase1Encoding ReEncodeFont " <8r.enc
+ptmbi8y Times-BoldItalic 262242 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+ptmbi8z Times-BoldItalic 262242 " XL2encoding ReEncodeFont " <xl2.enc
 ptmbo8r NimbusRomNo9L-Medi " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmb8a.pfb
 ptmbo8y NimbusRomNo9L-Medi " .167 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <utmb8a.pfb
-ptmr8r Times-Roman " TeXBase1Encoding ReEncodeFont " <8r.enc
+ptmr8r Times-Roman 34 " TeXBase1Encoding ReEncodeFont " <8r.enc
 ptmr8rn NimbusRomNo9L-Regu " .82 ExtendFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmr8a.pfb
-ptmr8y Times-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+ptmr8y Times-Roman 34 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 ptmr8yn NimbusRomNo9L-Regu " .82 ExtendFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <utmr8a.pfb
-ptmr8z Times-Roman " XL2encoding ReEncodeFont " <xl2.enc
-ptmri8r Times-Italic " TeXBase1Encoding ReEncodeFont " <8r.enc
-ptmri8y Times-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-ptmri8z Times-Italic " XL2encoding ReEncodeFont " <xl2.enc
+ptmr8z Times-Roman 34 " XL2encoding ReEncodeFont " <xl2.enc
+ptmri8r Times-Italic 98 " TeXBase1Encoding ReEncodeFont " <8r.enc
+ptmri8y Times-Italic 98 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+ptmri8z Times-Italic 98 " XL2encoding ReEncodeFont " <xl2.enc
 ptmro8r NimbusRomNo9L-Regu " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmr8a.pfb
 ptmro8y NimbusRomNo9L-Regu " .167 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <utmr8a.pfb
 ptmrr8re NimbusRomNo9L-Regu " 1.2 ExtendFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmr8a.pfb
@@ -143,7 +143,7 @@ ptmrr8ye NimbusRomNo9L-Regu " 1.2 ExtendFont TeXnANSIEncoding ReEncodeFont " <te
 pzcmi8r URWChanceryL-MediItal " TeXBase1Encoding ReEncodeFont " <8r.enc <uzcmi8a.pfb
 pzcmi8y URWChanceryL-MediItal " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <uzcmi8a.pfb
 pzcmi8z URWChanceryL-MediItal " XL2encoding ReEncodeFont " <xl2.enc <uzcmi8a.pfb
-pzdr ZapfDingbats
+pzdr ZapfDingbats 4
 rpagd URWGothicL-Demi " StandardEncoding ReEncodeFont " <8a.enc <uagd8a.pfb
 rpagdo URWGothicL-DemiObli " StandardEncoding ReEncodeFont " <8a.enc <uagdo8a.pfb
 rpagk URWGothicL-Book " StandardEncoding ReEncodeFont " <8a.enc <uagk8a.pfb
@@ -156,12 +156,12 @@ rpcrb Courier-Bold
 rpcrbo Courier-BoldOblique
 rpcrr Courier
 rpcrro Courier-Oblique
-rphvb Helvetica-Bold
-rphvbo Helvetica-BoldOblique
+rphvb Helvetica-Bold 262176
+rphvbo Helvetica-BoldOblique 262240
 rphvbon NimbusSanL-BoldItal " .82 ExtendFont StandardEncoding ReEncodeFont " <8a.enc <uhvbo8a.pfb
 rphvbrn NimbusSanL-Bold " .82 ExtendFont StandardEncoding ReEncodeFont " <8a.enc <uhvb8a.pfb
-rphvr Helvetica
-rphvro Helvetica-Oblique
+rphvr Helvetica 32
+rphvro Helvetica-Oblique 96
 rphvron NimbusSanL-ReguItal " .82 ExtendFont StandardEncoding ReEncodeFont " <8a.enc <uhvro8a.pfb
 rphvrrn NimbusSanL-Regu " .82 ExtendFont StandardEncoding ReEncodeFont " <8a.enc <uhvr8a.pfb
 rpncb CenturySchL-Bold " StandardEncoding ReEncodeFont " <8a.enc <uncb8a.pfb
@@ -205,13 +205,13 @@ rtxptmbo NimbusRomNo9L-Medi " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r
 rtxptmr Times-Roman " TeXBase1Encoding ReEncodeFont " <8r.enc
 rtxptmri Times-Italic " TeXBase1Encoding ReEncodeFont " <8r.enc
 rtxptmro NimbusRomNo9L-Regu " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmr8a.pfb
-sy Symbol
-tib Times-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
-tibi Times-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+sy Symbol 4
+tib Times-Bold 262178 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+tibi Times-BoldItalic 262242 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 tibo NimbusRomNo9L-Medi " .167 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <utmb8a.pfb
-tii Times-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+tii Times-Italic 34 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 tio NimbusRomNo9L-Regu " .167 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <utmr8a.pfb
-tir Times-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
+tir Times-Roman 98 " TeXnANSIEncoding ReEncodeFont " <texnansi.enc
 tmbi108r Times-BoldItalic " TeXBase1Encoding ReEncodeFont " <8r.enc
 tmbo108r NimbusRomNo9L-Medi " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmb8a.pfb
 tmbu108r NimbusRomNo9L-MediItal " -.277 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmbi8a.pfb
@@ -220,7 +220,7 @@ tmri108r Times-Italic " TeXBase1Encoding ReEncodeFont " <8r.enc
 tmrm108r Times-Roman " TeXBase1Encoding ReEncodeFont " <8r.enc
 tmro108r NimbusRomNo9L-Regu " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmr8a.pfb
 tmui108r NimbusRomNo9L-ReguItal " -.277 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <utmri8a.pfb
-zd ZapfDingbats
+zd ZapfDingbats 4
 % allrunes.map
 fruabm fruabm <fruabm.pfb
 fruabn fruabn <fruabn.pfb