From 554485d7d87fdca34ffb1aa17679afe69e7ff648 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Feb 2019 21:53:56 +0000 Subject: dviasm (5feb19) git-svn-id: svn://tug.org/texlive/trunk@49945 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/dviasm/dviasm.py | 13 +++--- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 52 +++++++++++----------- 2 files changed, 33 insertions(+), 32 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/texlive/linked_scripts/dviasm/dviasm.py b/Build/source/texk/texlive/linked_scripts/dviasm/dviasm.py index 7d448afc33b..05ff94fc685 100755 --- a/Build/source/texk/texlive/linked_scripts/dviasm/dviasm.py +++ b/Build/source/texk/texlive/linked_scripts/dviasm/dviasm.py @@ -143,9 +143,10 @@ def PutUnsigned(q): return (0, PutByte(q)) def PutSigned(q): - if 0 <= q < 0x800000: return PutUnsigned(q) if q < -0x800000 or q >= 0x800000: return (3, PutSignedQuad(q)) + if q >= 0x8000: return (2, Put3Bytes(q)) if q < -0x8000: q += 0x1000000; return (2, Put3Bytes(q)) + if q >= 0x80: return (1, Put2Bytes(q)) if q < -0x80: q += 0x10000; return (1, Put2Bytes(q)) return (0, PutByte(q)) @@ -904,8 +905,8 @@ class DVI(object): for e in sorted(self.font_def.keys()): fp.write("fntdef: %s" % self.font_def[e]['name']) if self.font_def[e]['design_size'] != self.font_def[e]['scaled_size']: - fp.write(" (%s) " % self.by_pt_conv(self.font_def[e]['design_size'])) - fp.write(" at %s\n" % self.by_pt_conv(self.font_def[e]['scaled_size'])) + fp.write(" (%s) " % self.byconv(self.font_def[e]['design_size'])) + fp.write(" at %s\n" % self.byconv(self.font_def[e]['scaled_size'])) # DumpPages for page in self.pages: fp.write("\n[page" + (" %d"*10 % tuple(page['count'])) + "]\n") @@ -941,8 +942,8 @@ class DVI(object): if IsFontChanged(f, z): fp.write("fnt: %s " % cur_font) if self.font_def[cmd[1]]['design_size'] != self.font_def[cmd[1]]['scaled_size']: - fp.write("(%s) " % self.by_pt_conv(self.font_def[cmd[1]]['design_size'])) - fp.write("at %s\n" % self.by_pt_conv(cur_ssize)) + fp.write("(%s) " % self.byconv(self.font_def[cmd[1]]['design_size'])) + fp.write("at %s\n" % self.byconv(cur_ssize)) elif cmd[0] == GLYPHS: fp.write("setglyphs: %s\n" % self.DumpGlyphs(cmd[1][0], cmd[1][1])) elif cmd[0] == TEXT_GLYPHS: @@ -1129,7 +1130,7 @@ binary format. It is fully documented at http://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf http://ajt.ktug.kr/assets/2008/5/1/0201cho.pdf""" - version = """This is %prog-20171216 by Jin-Hwan Cho (Korean TeX Society) + version = """This is %prog-20190202 by Jin-Hwan Cho (Korean TeX Society) Copyright (C) 2007-2008 by Jin-Hwan Cho Copyright (C) 2011-2017 by Khaled Hosny diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index e8b1de5810a..467856363f1 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 49408 2018-12-13 23:12:47Z karl $ +# $Id: tlmgr.pl 49885 2019-01-31 19:27:00Z karl $ # -# Copyright 2008-2018 Norbert Preining +# Copyright 2008-2019 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 49408 $'; -my $datrev = '$Date: 2018-12-14 00:12:47 +0100 (Fri, 14 Dec 2018) $'; +my $svnrev = '$Revision: 49885 $'; +my $datrev = '$Date: 2019-01-31 11:27:00 -0800 (Thu, 31 Jan 2019) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -5108,7 +5108,7 @@ The Perl/Tk module is not shipped with the TeX Live installation. You have to install it to get the tlmgr GUI working. (INC = @INC) -See http://tug.org/texlive/distro.html#perltk for more details. +See https://tug.org/texlive/distro.html#perltk for more details. Goodbye. "; } @@ -6378,7 +6378,7 @@ sub action_shell { if ($cmd eq "protocol") { print "protocol $protocol\n"; } elsif ($cmd eq "help") { - print "Please see tlmgr help or http://tug.org/texlive/tlmgr.html.\n"; + print "Please see tlmgr help or https://tug.org/texlive/tlmgr.html.\n"; } elsif ($cmd eq "version") { print give_version(); } elsif ($cmd =~ m/^(quit|end|bye(bye)?)$/i) { @@ -6875,7 +6875,7 @@ but found a local copy so using that. You may want to try specifying an explicit or different CTAN mirror; see the information and examples for the -repository option at -http://tug.org/texlive/doc/install-tl.html +https://tug.org/texlive/doc/install-tl.html (or in the output of install-tl --help). END_NO_INTERNET @@ -7003,7 +7003,7 @@ TeX Live $TeXLive::TLConfig::ReleaseYear is frozen forever and will no longer be updated. This happens in preparation for a new release. If you're interested in helping to pretest the new release (when -pretests are available), please read http://tug.org/texlive/pretest.html. +pretests are available), please read https://tug.org/texlive/pretest.html. Otherwise, just wait, and the new release will be ready in due time. FROZEN # don't die here, we want to allow updates even if tlnet is frozen! @@ -7433,11 +7433,11 @@ tlmgr [I