From 2d2cee2e18ed2941b856f6316dc1324626b9db3b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 Oct 2013 18:33:49 +0000 Subject: 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 --- Master/texmf-dist/fonts/map/dvips/tetex/Makefile | 51 ++++++++ Master/texmf-dist/fonts/map/dvips/tetex/README | 19 ++- .../fonts/map/dvips/tetex/base14flags.ltx | 12 ++ .../fonts/map/dvips/tetex/base14flags.tex | 43 +++++++ .../texmf-dist/fonts/map/dvips/tetex/pdftex35.map | 143 +++++++++++---------- .../fonts/map/pdftex/updmap/pdftex_ndl14.map | 112 ++++++++-------- 6 files changed, 247 insertions(+), 133 deletions(-) create mode 100644 Master/texmf-dist/fonts/map/dvips/tetex/Makefile create mode 100644 Master/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx create mode 100644 Master/texmf-dist/fonts/map/dvips/tetex/base14flags.tex (limited to 'Master/texmf-dist') 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"