diff options
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/fmtutil.pl | 22 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/updmap.pl | 17 |
2 files changed, 22 insertions, 17 deletions
diff --git a/Master/texmf-dist/scripts/texlive/fmtutil.pl b/Master/texmf-dist/scripts/texlive/fmtutil.pl index eb11426582e..51584b18a4a 100755 --- a/Master/texmf-dist/scripts/texlive/fmtutil.pl +++ b/Master/texmf-dist/scripts/texlive/fmtutil.pl @@ -20,14 +20,13 @@ my $TEXMFROOT; BEGIN { - $^W=1; + $^W = 1; $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; if ($?) { - print STDERR "fmtutil: Cannot find TEXMFROOT, aborting!\n"; - exit 1; + die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; } chomp($TEXMFROOT); - unshift (@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive"); + unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive"); require "mktexlsr.pl"; TeX::Update->import(); } @@ -40,7 +39,7 @@ $lastchdate =~ s/ \(.*$//; my $svnrev = '$Revision$'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; -my $version = "svn$svnrev ($lastchdate)"; +my $version = "r$svnrev ($lastchdate)"; use strict; use Getopt::Long qw(:config no_autoabbrev ignore_case_always); @@ -1136,7 +1135,7 @@ Where changes are saved: In general, the idea is that if a given config file is not writable, a higher-level one can be used. That way, the distribution's settings can be overridden for system-wide using TEXMFLOCAL, and then system - settings can be overridden again for a particular using using TEXMFHOME. + settings can be overridden again in a particular user's TEXMFHOME. Resolving multiple definitions of a format: @@ -1149,13 +1148,18 @@ Disabling formats: formats mentioned in lower priority (listed later) fmtutil.cnf files by writing, e.g., \#! <fmtname> <enginename> <hyphen> <args> - in the higher-priority fmtutil.cnf file. + in the higher-priority fmtutil.cnf file. (The \#! must be at the + beginning of the line, with at least one space or tab afterward, and + whitespace between each word on the list.) As an example, suppose you have want to disable the luajitlatex format. You can create the file \$TEXMFCONFIG/web2c/fmtutil.cnf with the content #! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini and call $prg. - + + (As it happens, the luajittex-related formats are precisely why the + --no-error-if-no-engine option exists, since luajittex cannot be + compiled on all platforms.) fmtutil vs. fmtutil-sys (fmtutil --sys): @@ -1167,7 +1171,7 @@ fmtutil vs. fmtutil-sys (fmtutil --sys): 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. -Report bugs to: tex-k\@tug.org +Report bugs to: tex-live\@tug.org TeX Live home page: <http://tug.org/texlive/> EOF ; diff --git a/Master/texmf-dist/scripts/texlive/updmap.pl b/Master/texmf-dist/scripts/texlive/updmap.pl index d91756ce688..a95297b24b4 100755 --- a/Master/texmf-dist/scripts/texlive/updmap.pl +++ b/Master/texmf-dist/scripts/texlive/updmap.pl @@ -21,8 +21,7 @@ BEGIN { $^W = 1; $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; if ($?) { - warn "updmap.pl: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; - exit 1; + die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; } chomp($TEXMFROOT); unshift(@INC, "$TEXMFROOT/tlpkg"); @@ -34,7 +33,7 @@ $lastchdate =~ s/ \(.*$//; my $svnrev = '$Revision$'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; -my $version = "svn$svnrev ($lastchdate)"; +my $version = "r$svnrev ($lastchdate)"; use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; @@ -2321,10 +2320,10 @@ Where and which updmap.cfg changes are saved: new config file is created in \$TEXMFCONFIG/web2c/updmap.cfg. In general, the idea is that if the user cannot write to a given - config file, a higher-level one can be used. As a typical example, - the distribution's settings can be overridden system-wide using - TEXMFLOCAL, and system settings can be overridden again for a - particular user with TEXMFHOME. + config file, a higher-level one can be used. That way, the + distribution's settings can be overridden system-wide using + TEXMFLOCAL, and system settings can be overridden again in a + particular user's TEXMFHOME. Resolving multiple definitions of a font: @@ -2341,7 +2340,9 @@ Disabling maps: \#! Map mapname.map or \#! MixedMap mapname.map - in the higher-priority updmap.cfg file. + in the higher-priority updmap.cfg file. (The \#! must be at the + beginning of the line, with at least one space or tab afterward, and + whitespace between each word on the list.) As an example, suppose you have a copy of MathTime Pro fonts and want to disable the Belleek version of the fonts; that is, |