summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-12-31 01:23:42 +0000
committerKarl Berry <karl@freefriends.org>2008-12-31 01:23:42 +0000
commit0ac5191dfdc3d42d7156477626157e2ca2614196 (patch)
treea21dfa3b7f4237a2be8f8ba1506e6f8ab82eb65b
parent30f6f90877cd5ab1fab0577d1880b048332b766f (diff)
doc/formatting tweaks
git-svn-id: svn://tug.org/texlive/trunk@11758 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr2.pl28
1 files changed, 10 insertions, 18 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr2.pl b/Master/texmf/scripts/texlive/tlmgr2.pl
index db71b23f3c1..2bcbe38647e 100755
--- a/Master/texmf/scripts/texlive/tlmgr2.pl
+++ b/Master/texmf/scripts/texlive/tlmgr2.pl
@@ -190,9 +190,6 @@ if (!defined($action) || !$action) {
die "$0: missing action; try --help if you need it.\n";
}
-# Often Windows will not have perldoc, but some Unix-based
-# installations may lack it also. We want to use it if we have it, to
-# get ASCII emphasis.
if ($opts{"help"}) {
# perldoc does ASCII emphasis on the output, so it's nice to use it.
# But not all Unix platforms have it, and on Windows our Config.pm
@@ -377,9 +374,9 @@ sub execute_action {
}
-#
-# run external programs based on the RET hash we've accumulated.
-# We return the number of unsuccessful runs, zero if all went well.
+
+# run external programs (mktexlsr, updmap-sys, etc.) as specified by the
+# RET hash. We return the number of unsuccessful runs, zero if all ok.
#
sub handle_ret_hash {
my (%ret) = @_;
@@ -437,6 +434,7 @@ sub handle_ret_hash {
}
}
}
+
return $errors / 256; # we were accumulating wait statuses
}
@@ -720,16 +718,10 @@ sub action_paper {
merge_into(\%ret, paper_all($texmfsysconfig, $newpaper));
#karl: merge_into(\%ret, TeXLive::TLPaper:paper_all($texmfsysconfig, $newpaper));
} else {
- # now we have as first argument a program
- my $prog = $action;
- # pass on everything to the paper_* subs
- # get rid of useless "paper" argument
- shift @ARGV;
- # see above for the selection of the output
- # if we want to change the output the value in %paper_config_path_component
- # has to be changed
+ my $prog = $action; # first argument is the program to change
+ shift @ARGV; # get rid of useless "paper" argument
merge_into(\%ret, &{$papersetting_subs{$prog}}($texmfsysconfig, @ARGV));
- #karl: merge_into(\%ret,TeXLive::TLPaper::paper_sub($prog,$texmfsysconfig,@ARGV));
+ #karl: merge_into(\%ret,TeXLive::TLPaper::do_paper($prog,$texmfsysconfig,@ARGV));
}
if ($localtlpdb->option_create_formats) {
$ret{"format"} = 1;
@@ -2838,9 +2830,9 @@ written to the terminal. This is a more detailed report than C<--list>.
=item B<--force>
-If updates to the tlmgr itself (and the underlying infrastructure) are
-present tlmgr will bail out and not perform the update unless this option
-is given (or B<--list> is given).
+If updates to tlmgr itself (that is, the infrastructure packages) are
+present, tlmgr will not perform the update unless this option is given.
+(C<--list> is still performed regardless of this option.)
=item B<--no-remove>