From 2c5001e5c56c5e9e9e9d1a01cc78d4c47790dbb8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 Jun 2012 02:34:56 +0000 Subject: /home/texlive/karl/Master/tlpkg/bin/tl-update-auto git-svn-id: svn://tug.org/texlive/trunk@26764 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/doc/man/man1/tlmgr.1 | 60 ++++++++++++++----------------- Master/texmf/doc/man/man1/tlmgr.man1.pdf | Bin 72968 -> 72677 bytes 2 files changed, 26 insertions(+), 34 deletions(-) (limited to 'Master/texmf') diff --git a/Master/texmf/doc/man/man1/tlmgr.1 b/Master/texmf/doc/man/man1/tlmgr.1 index e6a31819908..903bfefaa09 100644 --- a/Master/texmf/doc/man/man1/tlmgr.1 +++ b/Master/texmf/doc/man/man1/tlmgr.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "TLMGR 1" -.TH TLMGR 1 "2012-05-28" "perl v5.14.2" "User Contributed Perl Documentation" +.TH TLMGR 1 "2012-05-31" "perl v5.14.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -1041,40 +1041,34 @@ Do not ask for confirmation, remove immediately. .IX Item "generate language.dat.lua" .IP "\fBgenerate fmtutil\fR" 4 .IX Item "generate fmtutil" -.IP "\fBgenerate updmap\fR" 4 -.IX Item "generate updmap" .PD .PP The \f(CW\*(C`generate\*(C'\fR 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. -.PP The TeX Live installer and \f(CW\*(C`tlmgr\*(C'\fR routinely call \f(CW\*(C`generate\*(C'\fR for all of these files. .PP -For managing your own fonts, please see the documentation of -updmap, which supports multiple updmap.cfg files. So by simply -editing \s-1TEXMFLOCAL\s0's updmap.cfg they will be accounted for. -.PP -In any case, \f(CW\*(C`tlmgr\*(C'\fR updates and maintains \f(CW\*(C`updmap.cfg\*(C'\fR in -\&\f(CW\*(C`TEXMFDIST\*(C'\fR (while the other generated files are in -\&\f(CW\*(C`TEXMFSYSVAR\*(C'\fR), because that is the location where the fonts -are installed. +For managing your own fonts, please read the \f(CW\*(C`updmap \-\-help\*(C'\fR +information and/or . .PP -In more detail: \f(CW\*(C`generate\*(C'\fR remakes any of the five config files -\&\f(CW\*(C`language.dat\*(C'\fR, \f(CW\*(C`language.def\*(C'\fR, \f(CW\*(C`language.dat.lua\*(C'\fR, \f(CW\*(C`fmtutil.cnf\*(C'\fR, -and \f(CW\*(C`updmap.cfg\*(C'\fR from the information present in the local \s-1TLPDB\s0, plus +In more detail: \f(CW\*(C`generate\*(C'\fR remakes any of the configuration files +\&\f(CW\*(C`language.dat\*(C'\fR, \f(CW\*(C`language.def\*(C'\fR, \f(CW\*(C`language.dat.lua\*(C'\fR, and +\&\f(CW\*(C`fmtutil.cnf\*(C'\fR, from the information present in the local \s-1TLPDB\s0, plus locally-maintained files. .PP The locally-maintained files are \f(CW\*(C`language\-local.dat\*(C'\fR, -\&\f(CW\*(C`language\-local.def\*(C'\fR, \f(CW\*(C`language\-local.dat.lua\*(C'\fR, or \f(CW\*(C`fmtutil\-local.cnf\*(C'\fR, -searched for in \f(CW\*(C`TEXMFLOCAL\*(C'\fR in the respective directories. -The formerly supported \f(CW\*(C`updmap\-local.cfg\*(C'\fR is not supported anymore, -since \f(CW\*(C`updmap\*(C'\fR now supports multiple updmap.cfg files, so local -additions can be put into an updmap.cfg file in \s-1TEXMFLOCAL\s0. -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. +\&\f(CW\*(C`language\-local.def\*(C'\fR, \f(CW\*(C`language\-local.dat.lua\*(C'\fR, or +\&\f(CW\*(C`fmtutil\-local.cnf\*(C'\fR, searched for in \f(CW\*(C`TEXMFLOCAL\*(C'\fR 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. +.PP +(Historical note: The formerly supported \f(CW\*(C`updmap\-local.cfg\*(C'\fR is no longer +read, since \f(CW\*(C`updmap\*(C'\fR now supports multiple \f(CW\*(C`updmap.cfg\*(C'\fR files. Thus, +local additions can and should be put into an \f(CW\*(C`updmap.cfg\*(C'\fR file in +\&\f(CW\*(C`TEXMFLOCAL\*(C'\fR. Although \f(CW\*(C`generate updmap\*(C'\fR still exists, it is only +called internally by \f(CW\*(C`tlmgr\*(C'\fR and should not be invoked otherwise.) .PP Local files specify entries to be disabled with a comment line, namely one of these: @@ -1111,14 +1105,13 @@ Options: .IP "\fB\-\-dest\fR \fIoutput_file\fR" 4 .IX Item "--dest output_file" specifies the output file (defaults to the respective location in -\&\f(CW\*(C`TEXMFSYSVAR\*(C'\fR for \f(CW\*(C`language*\*(C'\fR and \f(CW\*(C`fmtutil\*(C'\fR, and \f(CW\*(C`TEXMFSYSDIST\*(C'\fR -for \f(CW\*(C`updmap\*(C'\fR). If \f(CW\*(C`\-\-dest\*(C'\fR is given to \f(CW\*(C`generate language\*(C'\fR, it serves -as a basename onto which \f(CW\*(C`.dat\*(C'\fR will be appended for the name of the -\&\f(CW\*(C`language.dat\*(C'\fR output file, \f(CW\*(C`.def\*(C'\fR will be -appended to the value for the name of the \f(CW\*(C`language.def\*(C'\fR output file, -and \f(CW\*(C`.dat.lua\*(C'\fR to the name of the \f(CW\*(C`language.dat.lua\*(C'\fR file. (This is -just to avoid overwriting; if you want a specific name for each output -file, we recommend invoking \f(CW\*(C`tlmgr\*(C'\fR twice.) +\&\f(CW\*(C`TEXMFSYSVAR\*(C'\fR). If \f(CW\*(C`\-\-dest\*(C'\fR is given to \f(CW\*(C`generate language\*(C'\fR, it +serves as a basename onto which \f(CW\*(C`.dat\*(C'\fR will be appended for the name of +the \f(CW\*(C`language.dat\*(C'\fR output file, \f(CW\*(C`.def\*(C'\fR will be appended to the value +for the name of the \f(CW\*(C`language.def\*(C'\fR output file, and \f(CW\*(C`.dat.lua\*(C'\fR to the +name of the \f(CW\*(C`language.dat.lua\*(C'\fR file. (This is just to avoid +overwriting; if you want a specific name for each output file, we +recommend invoking \f(CW\*(C`tlmgr\*(C'\fR twice.) .IP "\fB\-\-localcfg\fR \fIlocal_conf_file\fR" 4 .IX Item "--localcfg local_conf_file" specifies the (optional) local additions (defaults to the respective @@ -1126,7 +1119,7 @@ location in \f(CW\*(C`TEXMFLOCAL\*(C'\fR). .IP "\fB\-\-rebuild\-sys\fR" 4 .IX Item "--rebuild-sys" tells tlmgr to run necessary programs after config files have been -regenerated. These are: \f(CW\*(C`updmap\-sys\*(C'\fR after \f(CW\*(C`generate updmap\*(C'\fR, +regenerated. These are: \&\f(CW\*(C`fmtutil\-sys \-\-all\*(C'\fR after \f(CW\*(C`generate fmtutil\*(C'\fR, \&\f(CW\*(C`fmtutil\-sys \-\-byhyphen .../language.dat\*(C'\fR after \f(CW\*(C`generate language.dat\*(C'\fR, and @@ -1139,12 +1132,11 @@ succession before invoking these programs. .PP The respective locations are as follows: .PP -.Vb 5 +.Vb 4 \& tex/generic/config/language.dat (and language\-local.dat); \& 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). .Ve .SH "TLMGR CONFIGURATION FILE" .IX Header "TLMGR CONFIGURATION FILE" diff --git a/Master/texmf/doc/man/man1/tlmgr.man1.pdf b/Master/texmf/doc/man/man1/tlmgr.man1.pdf index cae8a535e0e..2b18d559bd4 100644 Binary files a/Master/texmf/doc/man/man1/tlmgr.man1.pdf and b/Master/texmf/doc/man/man1/tlmgr.man1.pdf differ -- cgit v1.2.3