summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/tetex/updmap.pl146
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl56
-rw-r--r--Master/texmf/web2c/updmap-hdr.cfg20
-rw-r--r--Master/texmf/web2c/updmap.cfg30
4 files changed, 120 insertions, 132 deletions
diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl
index 7dbc7ec4880..c7c462f5e49 100755
--- a/Build/source/texk/tetex/updmap.pl
+++ b/Build/source/texk/tetex/updmap.pl
@@ -1880,7 +1880,7 @@ sub reset_root_home {
if (defined($envhome) && (-d $envhome)) {
# we want to avoid calling getpwuid as far as possible, so if
# $envhome is one of some usual values we accept it without worrying.
- if ($envhome =~ m,^(/|/root|/var/root)/*$, {
+ if ($envhome =~ m,^(/|/root|/var/root)/*$,) {
return;
}
# $HOME is defined, check what is the home of root in reality
@@ -1919,20 +1919,20 @@ Usage: $prg [OPTION] ... [COMMAND]
or: $prg-sys [OPTION] ... [COMMAND]
Update the default font map files used by pdftex, dvips, and dvipdfm(x),
-(and optionally pxdvi) as determined by all configuration files updmap.cfg
+and optionally pxdvi, as determined by all configuration files updmap.cfg
(the ones returned by running "kpsewhich --all updmap.cfg", but see below).
Among other things, these map files are used to determine which fonts
should be used as bitmaps and which as outlines, and to determine which
-fonts are included in the output.
+font files are included in the PDF or PostScript output.
By default, the TeX filename database (ls-R) is also updated.
Options:
--cnffile FILE read FILE for the updmap configuration
- (can be given multiple times, in which case
- all the files are used)
- --dvipdfmxoutputdir DIR specify output directory (dvipdfm syntax)
+ (can be given multiple times, in which case
+ all the files are used)
+ --dvipdfmxoutputdir DIR specify output directory (dvipdfm(x) syntax)
--dvipsoutputdir DIR specify output directory (dvips syntax)
--pdftexoutputdir DIR specify output directory (pdftex syntax)
--pxdvioutputdir DIR specify output directory (pxdvi syntax)
@@ -1947,16 +1947,16 @@ Options:
Commands:
--help show this message and exit
--version show version information and exit
- --showoptions OPTION show possible settings for OPTION
--showoption OPTION show the current setting of OPTION
- --setoption OPTION VALUE set OPTION to value
+ --showoptions OPTION show possible settings for OPTION
+ --setoption OPTION VALUE set OPTION to value; option names below
--setoption OPTION=VALUE as above, just different syntax
--enable MAPTYPE MAPFILE add "MAPTYPE MAPFILE" to updmap.cfg,
- where MAPTYPE is either Map, MixedMap, KanjiMap
+ where MAPTYPE is Map, MixedMap, or KanjiMap
--enable Map=MAPFILE add \"Map MAPFILE\" to updmap.cfg
--enable MixedMap=MAPFILE add \"MixedMap MAPFILE\" to updmap.cfg
--enable KanjiMap=MAPFILE add \"KanjiMap MAPFILE\" to updmap.cfg
- --disable MAPFILE disable MAPFILE, whether Map, MixedMap, or KanjiMap
+ --disable MAPFILE disable MAPFILE, of whatever type
--listmaps list all active and inactive maps
--listavailablemaps same as --listmaps, but without
unavailable map files
@@ -1964,29 +1964,30 @@ Commands:
Explanation of the map types: the (only) difference between Map and
MixedMap is that MixedMap entries are not added to psfonts_pk.map.
-KanjiMap entries are added to psfonts_t1.map and kanjix.map.
-The purpose is to help users with printers that render Type 1 outline
+The purpose is to help users with devices that render Type 1 outline
fonts worse than mode-tuned Type 1 bitmap fonts. So, MixedMap is used
for fonts that are available as both Type 1 and Metafont.
+KanjiMap entries are added to psfonts_t1.map and kanjix.map.
-Explanation of the possible OPTIONS (showoptions, showoptions, setoption):
+Explanation of the OPTION names for --showoptions, --showoptions, --setoption:
dvipsPreferOutline true|false (default true)
Whether dvips uses bitmaps or outlines, when both are available.
- dvipsDownloadBase35 true|false (default false)
+ dvipsDownloadBase35 true|false (default true)
Whether dvips includes the standard 35 PostScript fonts in its output.
pdftexDownloadBase14 true|false (default true)
Whether pdftex includes the standard 14 PDF fonts in its output.
pxdviUse true|false (default false)
- Whether maps for pxdvi (Japanese-patched xdvi) is under control of updmap.
+ Whether maps for pxdvi (Japanese-patched xdvi) are under updmap's control.
+ kanjiEmbed (any string)
+ kanjiVariant (any string)
+ See below.
LW35 URWkb|URW|ADOBEkb|ADOBE (default URWkb)
Adapt the font and file names of the standard 35 PostScript fonts.
URWkb URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb)
URW URW fonts with "vendor" filenames (e.g. n019064l.pfb)
ADOBEkb Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb)
ADOBE Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb)
- kanjiEmbed (any string)
- kanjiVariant (any string)
These options are only read and acted on by updmap; dvips, pdftex, etc.,
do not know anything about them. They work by changing the default map
@@ -1994,66 +1995,62 @@ Explanation of the possible OPTIONS (showoptions, showoptions, setoption):
command-line options or configuration files to the programs, as
explained at the beginning of updmap.cfg.
- The options kanjiEmbed and kanjiVariant govern special replacements
- in the map lines. If a map contains the string \@kanjiEmbed\@, then
- this will be replaced by the value of the respective option. Similarly
- for kanjiVariant. This way users of Japanese TeX can select different
- fonts to be included in the final pdf.
+ The options kanjiEmbed and kanjiVariant specify special replacements
+ in the map lines. If a map contains the string \@kanjiEmbed\@, then
+ this will be replaced by the value of that option; similarly for
+ kanjiVariant. In this way, users of Japanese TeX can select different
+ fonts to be included in the final output.
Explanation of trees and files normally used:
- updmap reads all the updmap.cfg files found by
- kpsewhich -all updmap.cfg
- in the order returned by kpsewhich. There is one exception to keep
- upgradability from earlier versions of TeX Live: If there is a file
- TEXMFLOCAL/web2c/updmap-local.cfg (which was formerly used by tlmgr
- to merge local fonts), then a (not necessarily existing) file
- TEXMFLOCAL/web2c/updmap.cfg is ignored and the updmap-local.cfg is
- used instead. In this case updmap recognizes also the syntax for
- disabling map files in the updmap-local.cfg (this syntax was different
- to what is used now!).
-
- According to the actions updmap might write to one of the given files or
- create a new updmap.cfg, see below for details.
-
- If multiple updmap.cfg files are found, all the map files mentioned
- in all the updmap.cfg files are merged.
-
- CAVEATS with multiple updmap.cfg files
- * where changes are saved
- If config files are given on the cmd line, then the first given will
- be used to save changes (by --setoption, --enable or --disable).
- If the config files are taken from kpsewhich, then the algorithm is
- more complex:
- - if one of \$TEXMFHOME/web2c/updmap.cfg or \$TEXMFCONFIG/web2c/updmap.cfg
- appears in the list of used files, then the one given *first* by
- kpsewhich --all, or equivalently, the one given by kpsewhich updmap.cfg,
- is used
- - if none of the above two are present, a new config file is created
- in \$TEXMFCONFIG/web2c/updmap.cfg (in case there are actual changes)
- and used
-
- * multiple font definitions
- If a font is defined multiple times in different maps, then the
- definition of the map file that comes from the highest priority
- updmap.cfg file is used.
- If a font is defined multiple times in the same map file, an
- arbitrary definition is used.
- In both cases warnings are issued.
-
- * disabling map files
- updmap.cfg files with higher priority can disable map files that
- are mentioned in lower priority updmap.cfg files by disabling
- them, i.e., writing
+ If --cnffile is specified on the command line (possibly multiple
+ times), its value(s) are used. Otherwise, updmap reads all the
+ updmap.cfg files found by running \`kpsewhich -all updmap.cfg',
+ in the order returned by kpsewhich. If multiple updmap.cfg files are
+ found, all the maps mentioned in all the updmap.cfg files are merged.
+
+ There is one exception to keep upgradability from earlier versions of
+ TeX Live: if a file TEXMFLOCAL/web2c/updmap-local.cfg exists (formerly
+ used by tlmgr to merge local fonts), then the file
+ TEXMFLOCAL/web2c/updmap.cfg is ignored (if it exists) and the
+ updmap-local.cfg is used instead. In this case, updmap recognizes the
+ previous syntax for disabling map files in updmap-local.cfg (this
+ syntax is different from what is used now).
+
+ According to the actions, updmap might write to one of the given files
+ or create a new updmap.cfg, described further below.
+
+ Where changes are saved: if config files are given on the command
+ line, then the first one given will be used to save any changes from
+ --setoption, --enable or --disable. If the config files are taken
+ from kpsewhich output, then the algorithm is more complex:
+ 1) If \$TEXMFHOME/web2c/updmap.cfg or \$TEXMFCONFIG/web2c/updmap.cfg
+ appears in the list of used files, then the one listed first by
+ kpsewhich --all (equivalently, the one returned by kpsewhich
+ updmap.cfg), is used.
+
+ 2) If neither of the above two are present and changes are made, a
+ new config file is created in \$TEXMFCONFIG/web2c/updmap.cfg.
+
+ Multiple definitions of a font:
+ If a font is defined in more than one map file, then the definition
+ coming from the first-listed updmap.cfg is used. If a font is
+ defined multiple times in the same map file, one is chosen
+ arbitrarily. In both cases a warning is issued.
+
+ Disabling maps:
+ updmap.cfg files with higher priority (listed earlier) can disable
+ maps mentioned in lower priority (listed later) updmap.cfg files by
+ writing, e.g.,
\#! Map mapname.map
or
\#! MixedMap mapname.map
- into the higher prioprity updmap.cfg file.
+ in the higher-priority updmap.cfg file.
- As an example take a user with a copy of the commercial MTPRO fonts.
- He wants to disable the belleek version of the fonts, that is
- disable the map belleek.map. The user should create a updmap.cfg file
- in \$TEXMFCONFIG/web2c/updmap.cfg with the content
+ As an example, suppose you have a copy of MathTime Pro fonts
+ and want to disable the Belleek version of the fonts; that is,
+ disable the map belleek.map. You can create the file
+ \$TEXMFCONFIG/web2c/updmap.cfg with the content
#! Map belleek.map
Map mt-plus.map
Map mt-yy.map
@@ -2066,13 +2063,14 @@ Explanation of trees and files normally used:
The log file is written to TEXMFVAR/web2c/updmap.log.
When updmap-sys is run, TEXMFSYSCONFIG and TEXMFSYSVAR are used
- instead. This is the only difference between updmap-sys and updmap.
+ instead of TEXMFCONFIG and TEXMFVAR, respectively. This is the only
+ difference between updmap-sys and updmap.
- Other locations can be used if overridden on the command line, or these
- trees don't exist, or you are not using the original TeX Live.
+ Other locations may be used if you give them on the command line, or
+ these trees don't exist, or you are not using the original TeX Live.
To see the precise locations of the various files that
- will be read and written, give the -n option (or read the man page).
+ will be read and written, give the -n option (or read the source).
For step-by-step instructions on making new fonts known to TeX, read
http://tug.org/fonts/fontinstall.html. For even more terse
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 9510b82ab50..051638bf901 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -6630,40 +6630,34 @@ Do not ask for confirmation, remove immediately.
=item B<generate fmtutil>
-=item B<generate updmap>
-
=back
The C<generate> action overwrites any manual changes made in the
respective files: it recreates them from scratch based on the
information of the installed packages, plus local adaptions.
-
The TeX Live installer and C<tlmgr> routinely call C<generate> for
all of these files.
-For managing your own fonts, please see the documentation of
-updmap, which supports multiple updmap.cfg files. So by simply
-editing TEXMFLOCAL's updmap.cfg they will be accounted for.
-
-In any case, C<tlmgr> updates and maintains C<updmap.cfg> in
-C<TEXMFDIST> (while the other generated files are in
-C<TEXMFSYSVAR>), because that is the location where the fonts
-are installed.
+For managing your own fonts, please read the C<updmap --help>
+information and/or L<http://tug.org/fonts/fontinstall.html>.
-In more detail: C<generate> remakes any of the five config files
-C<language.dat>, C<language.def>, C<language.dat.lua>, C<fmtutil.cnf>,
-and C<updmap.cfg> from the information present in the local TLPDB, plus
+In more detail: C<generate> remakes any of the configuration files
+C<language.dat>, C<language.def>, C<language.dat.lua>, and
+C<fmtutil.cnf>, from the information present in the local TLPDB, plus
locally-maintained files.
The locally-maintained files are C<language-local.dat>,
-C<language-local.def>, C<language-local.dat.lua>, or C<fmtutil-local.cnf>,
-searched for in C<TEXMFLOCAL> in the respective directories.
-The formerly supported C<updmap-local.cfg> is not supported anymore,
-since C<updmap> now supports multiple updmap.cfg files, so local
-additions can be put into an updmap.cfg file in TEXMFLOCAL.
-If local additions are present, the final file is made by starting
-with the main file, omitting any entries that the local file specifies
-to be disabled, and finally appending the local file.
+C<language-local.def>, C<language-local.dat.lua>, or
+C<fmtutil-local.cnf>, searched for in C<TEXMFLOCAL> in the respective
+directories. If local additions are present, the final file is made by
+starting with the main file, omitting any entries that the local file
+specifies to be disabled, and finally appending the local file.
+
+(Historical note: The formerly supported C<updmap-local.cfg> is no longer
+read, since C<updmap> now supports multiple C<updmap.cfg> files. Thus,
+local additions can and should be put into an C<updmap.cfg> file in
+C<TEXMFLOCAL>. Although C<generate updmap> still exists, it is only
+called internally by C<tlmgr> and should not be invoked otherwise.)
Local files specify entries to be disabled with a comment line, namely
one of these:
@@ -6699,14 +6693,13 @@ Options:
=item B<--dest> I<output_file>
specifies the output file (defaults to the respective location in
-C<TEXMFSYSVAR> for C<language*> and C<fmtutil>, and C<TEXMFSYSDIST>
-for C<updmap>). If C<--dest> is given to C<generate language>, it serves
-as a basename onto which C<.dat> will be appended for the name of the
-C<language.dat> output file, C<.def> will be
-appended to the value for the name of the C<language.def> output file,
-and C<.dat.lua> to the name of the C<language.dat.lua> file. (This is
-just to avoid overwriting; if you want a specific name for each output
-file, we recommend invoking C<tlmgr> twice.)
+C<TEXMFSYSVAR>). If C<--dest> is given to C<generate language>, it
+serves as a basename onto which C<.dat> will be appended for the name of
+the C<language.dat> output file, C<.def> will be appended to the value
+for the name of the C<language.def> output file, and C<.dat.lua> to the
+name of the C<language.dat.lua> file. (This is just to avoid
+overwriting; if you want a specific name for each output file, we
+recommend invoking C<tlmgr> twice.)
=item B<--localcfg> I<local_conf_file>
@@ -6716,7 +6709,7 @@ location in C<TEXMFLOCAL>).
=item B<--rebuild-sys>
tells tlmgr to run necessary programs after config files have been
-regenerated. These are: C<updmap-sys> after C<generate updmap>,
+regenerated. These are:
C<fmtutil-sys --all> after C<generate fmtutil>,
C<fmtutil-sys --byhyphen .../language.dat> after C<generate language.dat>,
and
@@ -6735,7 +6728,6 @@ The respective locations are as follows:
tex/generic/config/language.def (and language-local.def);
tex/generic/config/language.dat.lua (and language-local.dat.lua);
web2c/fmtutil.cnf (and fmtutil-local.cnf);
- web2c/updmap.cfg (and updmap-local.cfg).
=head1 TLMGR CONFIGURATION FILE
diff --git a/Master/texmf/web2c/updmap-hdr.cfg b/Master/texmf/web2c/updmap-hdr.cfg
index c2014eb4466..5f421eec0d2 100644
--- a/Master/texmf/web2c/updmap-hdr.cfg
+++ b/Master/texmf/web2c/updmap-hdr.cfg
@@ -1,21 +1,7 @@
# $Id$
#
# The updmap.cfg in this tree (TEXMFDIST) is generated by tlmgr by
-# concatenating updmap-hdr.cfg with all the Map and MixedMap lines
-# from an installation.
-#
-# To make local customizations to the map files, please use of the
-# following methods:
-#
-# 1) call
-# updmap-sys --enable Map=foo.map
-# for each map file. (Or MixedMap instead of Map, if your font has
-# both Metafont and outline definitions.) See the updmap --help
-# documentation. This will add lines to the updmap.cfg file in
-# TEXMFSYSCONFIG (creating it if necessary).
-#
-# 2) put all your additional fonts into TEXMFLOCAL and edit
-# TEXMFLOCAL/web2c/updmap.cfg.
-#
-# Manual edits to this updmap.cfg will be lost on update.
+# concatenating updmap-hdr.cfg with all updmap.cfg files found.
+# See the updmap --help information and/or
+# http://tug.org/fonts/fontinstall.html for more.
#
diff --git a/Master/texmf/web2c/updmap.cfg b/Master/texmf/web2c/updmap.cfg
index f49ff777758..dcc0bd8d5c0 100644
--- a/Master/texmf/web2c/updmap.cfg
+++ b/Master/texmf/web2c/updmap.cfg
@@ -1,7 +1,20 @@
+# $Id$
+# updmap.cfg for TEXMFMAIN - updmap options.
#
-# updmap.cfg
-# TEXMFMAIN
-# only the options are defined here
+# To make local customizations to the map files, please use of the
+# following methods:
+#
+# 1) run
+# updmap-sys --enable Map=foo.map
+# for each map file. (Or MixedMap instead of Map, if your font has
+# both Metafont and outline definitions.) See the updmap --help
+# documentation. This will add lines to the updmap.cfg file in
+# TEXMFSYSCONFIG (creating it if necessary).
+#
+# 2) put all your additional fonts into TEXMFLOCAL and edit
+# TEXMFLOCAL/web2c/updmap.cfg.
+#
+# Manual edits will be lost on update.
################################################################
@@ -59,7 +72,7 @@ pdftexDownloadBase14 true
#
# dvipdfmDownloadBase14
#
-# Should dvipdfm download the base 14 pdf fonts? Since some configurations
+# Should dvipdfm(x) download the base 14 pdf fonts? Since some configurations
# (ps / pdf tools / printers) use bad default fonts, it is safer to download
# the fonts. The pdf files will get bigger, though.
# Valid settings are true (download the fonts) or false (don't download
@@ -69,11 +82,10 @@ dvipdfmDownloadBase14 true
#
# kanjiEmbed
#
-# updmap generates a file kanjix.map for usage with dvipdfmx. Using this
-# option one can switch between not embedding any kanji font, and several
-# available.
+# updmap generates a file kanjix.map for usage with dvipdfmx. With this
+# option one can switch between not embedding any kanji font, or
+# any of the several available.
# Valid setting is any string. At updmap run time the @kanjiEmbed@ substring
-# in a map file name will be replaced with this settings, and the respective
+# in a map file name will be replaced with this value, and the respective
# map file used.
kanjiEmbed noEmbed
-