From 2150201c886b3f54c5e4d768ff5109f377e8762b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 8 Jun 2012 23:25:32 +0000 Subject: consistency git-svn-id: svn://tug.org/texlive/trunk@26869 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 30 +++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index e55f0961d11..a319ff50fd9 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 26744 2012-05-31 19:48:49Z karl $ +# $Id: tlmgr.pl 26857 2012-06-08 00:31:28Z karl $ # # Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 26744 $'; -my $datrev = '$Date: 2012-05-31 21:48:49 +0200 (Thu, 31 May 2012) $'; +my $svnrev = '$Revision: 26857 $'; +my $datrev = '$Date: 2012-06-08 02:31:28 +0200 (Fri, 08 Jun 2012) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -4043,6 +4043,12 @@ sub action_generate { } } elsif ($what =~ m/^updmap$/i) { + tlwarn("$prg: generate updmap is no longer needed or supported.\n"); + tlwarn("$prg: Please read the documentation of the `updmap' program.\n"); + tlwarn("$prg: Goodbye.\n"); + exit(1); + + } elsif ($what =~ m/^_updmap$/i) { my $dest = $opts{"dest"} || "$TEXMFDIST/web2c/updmap.cfg"; debug("$prg: writing new updmap.cfg to $dest\n"); TeXLive::TLUtils::create_updmap($localtlpdb, $dest); @@ -6656,19 +6662,19 @@ 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.) +C. The C action no longer exists.) Local files specify entries to be disabled with a comment line, namely one of these: + #!NAME %!NAME --!NAME -where C uses C<#>, C and -C use C<%>, and C use C<-->. In any -case, the I is the respective format name, or hyphenation pattern -identifier. Examples: +where C uses C<#>, C and C use +C<%>, and C use C<-->. In all cases, the I is +the respective format name or hyphenation pattern identifier. +Examples: #!pdflatex %!german @@ -6682,9 +6688,9 @@ for the same item, if a different definition is desired. In general, except for the special disabling lines, the local files follow the same syntax as the master files. -The form C recreates both the C, the -C and the C files, while the forms with -extension recreates only the given language file. +The form C recreates all three files C, +C, and C, while the forms with an +extension recreates only that given language file. Options: -- cgit v1.2.3