From 347d616d3cb26d19d9c79f8b0439712cf5f9012b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 10 May 2017 17:56:24 +0000 Subject: context (May 9 10:39) git-svn-id: svn://tug.org/texlive/trunk@44279 c570f23f-e606-0410-a88d-b1316a301751 --- .../linked_scripts/context/stubs/unix/mtxrun | 36 ++++++++-------------- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 21 +++++++------ 2 files changed, 23 insertions(+), 34 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun b/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun index 89c1565511c..873770cacc4 100755 --- a/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun +++ b/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun @@ -7037,7 +7037,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-fil"] = package.loaded["util-fil"] or true --- original size: 7039, stripped down to: 5672 +-- original size: 7567, stripped down to: 5575 if not modules then modules={} end modules ['util-fil']={ version=1.001, @@ -7203,17 +7203,17 @@ end function files.readfixed2(f) local a,b=byte(f:read(2),1,2) if a>=0x80 then - return (0x100*a+b-0x10000)/256.0 + return (a-0x100)+b/0x100 else - return (0x100*a+b)/256.0 + return (a )+b/0x100 end end function files.readfixed4(f) local a,b,c,d=byte(f:read(4),1,4) if a>=0x80 then - return (0x1000000*a+0x10000*b+0x100*c+d-0x100000000)/65536.0 + return (0x100*a+b-0x10000)+(0x100*c+d)/0x10000 else - return (0x1000000*a+0x10000*b+0x100*c+d)/65536.0 + return (0x100*a+b )+(0x100*c+d)/0x10000 end end if extract then @@ -7267,8 +7267,6 @@ if fio and fio.readcardinal1 then files.readinteger2=fio.readinteger2 files.readinteger3=fio.readinteger3 files.readinteger4=fio.readinteger4 - files.readfixed2=fio.readfixed2 - files.readfixed4=fio.readfixed4 files.read2dot14=fio.read2dot14 files.setposition=fio.setposition files.getposition=fio.getposition @@ -7295,7 +7293,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sac"] = package.loaded["util-sac"] or true --- original size: 8697, stripped down to: 6981 +-- original size: 8716, stripped down to: 6754 if not modules then modules={} end modules ['util-sac']={ version=1.001, @@ -7503,9 +7501,9 @@ function streams.readfixed4(f) f[2]=j+1 local a,b,c,d=byte(f[1],i,j) if a>=0x80 then - return (0x1000000*a+0x10000*b+0x100*c+d-0x100000000)/65536.0 + return (0x100*a+b-0x10000)+(0x100*c+d)/0x10000 else - return (0x1000000*a+0x10000*b+0x100*c+d)/65536.0 + return (0x100*a+b )+(0x100*c+d)/0x10000 end end function streams.readfixed2(f) @@ -7514,9 +7512,9 @@ function streams.readfixed2(f) f[2]=j+1 local a,b=byte(f[1],i,j) if a>=0x80 then - return (0x100*a+b-0x10000)/256.0 + return (a-0x100)+b/0x100 else - return (0x100*a+b)/256.0 + return (a )+b/0x100 end end if extract then @@ -7596,16 +7594,6 @@ if sio and sio.readcardinal2 then f[2]=i+4 return readinteger4(f[1],i) end - function streams.readfixed2(f) - local i=f[2] - f[2]=i+2 - return readfixed2(f[1],i) - end - function streams.readfixed4(f) - local i=f[2] - f[2]=i+4 - return readfixed4(f[1],i) - end function streams.read2dot4(f) local i=f[2] f[2]=i+2 @@ -20430,8 +20418,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 841896 --- stripped bytes : 305446 +-- original bytes : 842443 +-- stripped bytes : 306317 -- end library merge diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 477aa7631af..facc7c47753 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 44201 2017-05-05 15:33:32Z karl $ +# $Id: tlmgr.pl 44249 2017-05-08 17:26:47Z karl $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 44201 $'; -my $datrev = '$Date: 2017-05-05 17:33:32 +0200 (Fri, 05 May 2017) $'; +my $svnrev = '$Revision: 44249 $'; +my $datrev = '$Date: 2017-05-08 19:26:47 +0200 (Mon, 08 May 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -595,7 +595,7 @@ for the full story.\n"; # # Try to open the packagelog file, but do NOT die when that does not work if (!open(PACKAGELOG, ">>$packagelogfile")) { - debug("Cannot open package log file $packagelogfile for appending\n"); + debug("Cannot open package log file for appending: $packagelogfile\n"); debug("Will not log package installation/removal/update for this run\n"); $packagelogfile = ""; } @@ -618,14 +618,14 @@ for the full story.\n"; $::no_execute_actions = 1 if (defined($opts{'no-execute-actions'})); # if we are asked to use persistent connections try to start it here - debug("tlmgr:main: do persistent downloads = $opts{'persistent-downloads'}\n"); + ddebug("tlmgr:main: do persistent downloads = $opts{'persistent-downloads'}\n"); if ($opts{'persistent-downloads'}) { TeXLive::TLUtils::setup_persistent_downloads() ; } if (!defined($::tldownload_server)) { debug("tlmgr:main: ::tldownload_server not defined\n"); } else { - debug("tlmgr:main: ::tldownload_server defined\n"); + debug("tlmgr:main: ::tldownload_server defined: $::tldownload_server\n"); } my $ret = execute_action($action, @ARGV); @@ -2389,7 +2389,7 @@ sub auto_remove_install_force_packages { } # # now take only the subset of packages that is in @todo - # note that @todo is already expanded in action_updated according + # note that @todo is already expanded in action_update according # to the --no-depends and --no-depends-at-all options # my %removals; @@ -7170,8 +7170,9 @@ The subcommand C allows adding and removing arbitrary additional texmf trees, completely under user control. C shows the list of additional trees, C I adds a tree to the list, and C I removes a tree from the list -(if present). The trees should not contain an C file. This works -by manipulating the Kpathsea variable C, in +(if present). The trees should not contain an C file (or files +might not be found if the C becomes stale). This works by +manipulating the Kpathsea variable C, in C. Example: tlmgr conf auxtrees add /quick/test/tree @@ -8809,7 +8810,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 44201 2017-05-05 15:33:32Z karl $ +$Id: tlmgr.pl 44249 2017-05-08 17:26:47Z karl $ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html -- cgit v1.2.3