From 6ba3d172d7b2b046f16e24c371498b5bb0e4ffa4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 May 2012 19:48:49 +0000 Subject: updmap doc updates git-svn-id: svn://tug.org/texlive/trunk@26744 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/scripts/texlive/tlmgr.pl | 56 +++++++++++++++-------------------- Master/texmf/web2c/updmap-hdr.cfg | 20 ++----------- Master/texmf/web2c/updmap.cfg | 30 +++++++++++++------ 3 files changed, 48 insertions(+), 58 deletions(-) (limited to 'Master/texmf') 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 -=item B - =back The C 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 routinely call C 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 updates and maintains C in -C (while the other generated files are in -C), because that is the location where the fonts -are installed. +For managing your own fonts, please read the C +information and/or L. -In more detail: C remakes any of the five config files -C, C, C, C, -and C from the information present in the local TLPDB, plus +In more detail: C remakes any of the configuration files +C, C, C, and +C, from the information present in the local TLPDB, plus locally-maintained files. The locally-maintained files are C, -C, C, or C, -searched for in C in the respective directories. -The formerly supported C is not supported anymore, -since C 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, C, or +C, searched for in C 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 is no longer +read, since C now supports multiple C files. Thus, +local additions can and should be put into an C file in +C. Although C still exists, it is only +called internally by C 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 specifies the output file (defaults to the respective location in -C for C and C, and C -for C). If C<--dest> is given to C, it serves -as a basename onto which C<.dat> will be appended for the name of the -C output file, C<.def> will be -appended to the value for the name of the C output file, -and C<.dat.lua> to the name of the C file. (This is -just to avoid overwriting; if you want a specific name for each output -file, we recommend invoking C twice.) +C). If C<--dest> is given to C, it +serves as a basename onto which C<.dat> will be appended for the name of +the C output file, C<.def> will be appended to the value +for the name of the C output file, and C<.dat.lua> to the +name of the C file. (This is just to avoid +overwriting; if you want a specific name for each output file, we +recommend invoking C twice.) =item B<--localcfg> I @@ -6716,7 +6709,7 @@ location in C). =item B<--rebuild-sys> tells tlmgr to run necessary programs after config files have been -regenerated. These are: C after C, +regenerated. These are: C after C, C after C, 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 - -- cgit v1.2.3