texlive[41545] trunk: sync
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 26 23:52:14 CEST 2016
Revision: 41545
http://tug.org/svn/texlive?view=revision&revision=41545
Author: karl
Date: 2016-06-26 23:52:14 +0200 (Sun, 26 Jun 2016)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/Build/source/texk/tests/TeXLive/TLConfig.pm
trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
trunk/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
trunk/Master/texmf-dist/fonts/map/glyphlist/glyphlist.txt
trunk/Master/texmf-dist/tex/texinfo/texinfo.tex
Modified: trunk/Build/source/texk/tests/TeXLive/TLConfig.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLConfig.pm 2016-06-26 01:15:19 UTC (rev 41544)
+++ trunk/Build/source/texk/tests/TeXLive/TLConfig.pm 2016-06-26 21:52:14 UTC (rev 41545)
@@ -5,7 +5,7 @@
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 40652 $';
+my $svnrev = '$Revision: 41437 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -58,9 +58,6 @@
# Generally not tested.
$MinRelease = 2016;
-# users can NOT upgrade due to internal changes, force a full installation
-#$MinRelease = $ReleaseYear;
-
# Meta Categories do not ship files, but only call for other packages.
our @MetaCategories = qw/Collection Scheme/;
our $MetaCategoriesRegexp = '(Collection|Scheme)';
Modified: trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLUtils.pm 2016-06-26 01:15:19 UTC (rev 41544)
+++ trunk/Build/source/texk/tests/TeXLive/TLUtils.pm 2016-06-26 21:52:14 UTC (rev 41545)
@@ -5,7 +5,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 41175 $';
+my $svnrev = '$Revision: 41437 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -2755,14 +2755,15 @@
my @lines = ();
my $usermode = $tlpdb->setting( "usertree" );
if (-r "$root/$headfile") {
- # we might be in user mode and do *not* want that the generation
- # of the configuration file just boils out.
open (INFILE, "<$root/$headfile")
|| die "open($root/$headfile) failed, but -r ok: $!";
@lines = <INFILE>;
close (INFILE);
- } else {
- die ("Giving up.") if (!$usermode);
+ } elsif (!$usermode) {
+ # we might be in user mode and then do *not* want the generation
+ # of the configuration file to just bail out.
+ tldie ("TLUtils::_create_config_files: giving up, unreadable: "
+ . "$root/$headfile\n")
}
push @lines, @$tlpdblinesref;
if (defined($localconf) && -r $localconf) {
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-06-26 01:15:19 UTC (rev 41544)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-06-26 21:52:14 UTC (rev 41545)
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: fmtutil.pl 40678 2016-04-22 13:16:07Z siepo $
+# $Id: fmtutil.pl 41529 2016-06-23 03:12:14Z preining $
# fmtutil - utility to maintain format files.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -24,11 +24,11 @@
TeX::Update->import();
}
-my $svnid = '$Id: fmtutil.pl 40678 2016-04-22 13:16:07Z siepo $';
-my $lastchdate = '$Date: 2016-04-22 15:16:07 +0200 (Fri, 22 Apr 2016) $';
+my $svnid = '$Id: fmtutil.pl 41529 2016-06-23 03:12:14Z preining $';
+my $lastchdate = '$Date: 2016-06-23 05:12:14 +0200 (Thu, 23 Jun 2016) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 40678 $';
+my $svnrev = '$Revision: 41529 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -91,7 +91,9 @@
our $texmfconfig = $TEXMFCONFIG;
our $texmfvar = $TEXMFVAR;
our $alldata;
-our %opts = ( quiet => 0 );
+# command line options with defaults
+# 20160623 - switch to turn on strict mode
+our %opts = ( quiet => 0 , strict => 1 );
# make a list of all the commands (as opposed to options), so we can
# reasonably check for multiple commands being (erroneously) given.
@@ -117,7 +119,7 @@
"no-error-if-no-format",
"nohash",
"recorder",
- "strict",
+ "strict!",
"quiet|silent|q",
"catcfg",
"dolinks",
@@ -1280,9 +1282,9 @@
--no-error-if-no-engine=ENGINE1,ENGINE2,...
exit successfully even if a required engine
is missing, if it is included in the list.
+ --no-strict don't exit with bad status if a format fails to build
--nohash don't update ls-R files
--recorder pass the -recorder option and save .fls files
- --strict exit with bad status if a format fails to build
--quiet be silent
--catcfg (does nothing, exists for compatibility)
--dolinks (does nothing, exists for compatibility)
Modified: trunk/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib
===================================================================
--- trunk/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib 2016-06-26 01:15:19 UTC (rev 41544)
+++ trunk/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib 2016-06-26 21:52:14 UTC (rev 41545)
@@ -17,7 +17,7 @@
%%% telephone = "+1 801 581 5254",
%%% FAX = "+1 801 581 4148",
%%% URL = "http://www.math.utah.edu/~beebe",
-%%% checksum = "41397 17031 69759 684646",
+%%% checksum = "30705 17031 69762 684678",
%%% email = "beebe at math.utah.edu, beebe at acm.org,
%%% beebe at computer.org (Internet)",
%%% codetable = "ISO/ASCII",
@@ -12800,8 +12800,8 @@
month = nov # "\slash " # dec,
year = "1989",
CODEN = "AALEE5",
- ISSN = "0736-721X",
- ISSN-L = "0736-721X",
+ ISSN = "1094-3641 (print), 1557-9476 (electronic)",
+ ISSN-L = "1094-3641",
bibdate = "Sat Nov 12 21:50:04 1994",
bibsource = "http://www.math.utah.edu/pub/tex/bib/texbook3.bib",
abstract = "Describes a set of macros designed for the purpose of
Modified: trunk/Master/texmf-dist/fonts/map/glyphlist/glyphlist.txt
===================================================================
--- trunk/Master/texmf-dist/fonts/map/glyphlist/glyphlist.txt 2016-06-26 01:15:19 UTC (rev 41544)
+++ trunk/Master/texmf-dist/fonts/map/glyphlist/glyphlist.txt 2016-06-26 21:52:14 UTC (rev 41545)
@@ -1,43 +1,26 @@
-# ###################################################################################
-# Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this documentation file to use, copy, publish, distribute,
-# sublicense, and/or sell copies of the documentation, and to permit
-# others to do the same, provided that:
-# - No modification, editing or other alteration of this document is
-# allowed; and
-# - The above copyright notice and this permission notice shall be
-# included in all copies of the documentation.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this documentation file, to create their own derivative works
-# from the content of this document to use, copy, publish, distribute,
-# sublicense, and/or sell the derivative works, and to permit others to do
-# the same, provided that the derived work is not represented as being a
-# copy or version of this document.
-#
-# Adobe shall not be liable to any party for any loss of revenue or profit
-# or for indirect, incidental, special, consequential, or other similar
-# damages, whether based on tort (including without limitation negligence
-# or strict liability), contract or other legal or equitable grounds even
-# if Adobe has been advised or had reason to know of the possibility of
-# such damages.\xCA The Adobe materials are provided on an "AS IS" basis.\xCA
-# Adobe specifically disclaims all express, statutory, or implied
-# warranties relating to the Adobe materials, including but not limited to
-# those concerning merchantability or fitness for a particular purpose or
-# non-infringement of any third party rights regarding the Adobe
-# materials.
-# ###################################################################################
+# -----------------------------------------------------------
+# Copyright 2002, 2010, 2015 Adobe Systems Incorporated.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you
+# may not use this file except in compliance with the License. You may
+# obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0.html
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+# -----------------------------------------------------------
# Name: Adobe Glyph List
# Table version: 2.0
# Date: September 20, 2002
+# URL: https://github.com/adobe-type-tools/agl-aglfn
#
-# See http://partners.adobe.com/asn/developer/typeforum/unicodegn.html
+# Format: two semicolon-delimited fields:
+# (1) glyph name--upper/lowercase letters and digits
+# (2) Unicode scalar value--four uppercase hexadecimal digits
#
-# Format: Semicolon-delimited fields:
-# (1) glyph name
-# (2) Unicode scalar value
A;0041
AE;00C6
AEacute;01FC
@@ -4319,4 +4302,4 @@
zstroke;01B6
zuhiragana;305A
zukatakana;30BA
-#--end
+#END
Modified: trunk/Master/texmf-dist/tex/texinfo/texinfo.tex
===================================================================
--- trunk/Master/texmf-dist/tex/texinfo/texinfo.tex 2016-06-26 01:15:19 UTC (rev 41544)
+++ trunk/Master/texmf-dist/tex/texinfo/texinfo.tex 2016-06-26 21:52:14 UTC (rev 41545)
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2016-06-07.21}
+\def\texinfoversion{2016-06-18.21}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5964,18 +5964,32 @@
\global\advance\dimen@ by 1pt
\repeat
}%
- \multiply\dimen at ii by 4
- \divide\dimen at ii by 5
- \ifdim\ht3<\dimen at ii
- % Column heights are too different, so don't make their bottoms
- % flush with each other. The glue at the end of the second column
- % allows a second column to stretch, reducing the difference in
- % height between the two.
- \setbox0=\vbox to\dimen@{\unvbox1\vfill}%
- \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}%
+ \ifdim2\ht1>\vsize
+ % The left column has come out longer than the page itself. (Note
+ % that we have doubled \vsize for the double columns, so
+ % the actual height of the page is 0.5\vsize). Just split the last
+ % of the double column material roughly in half.
+ \setbox2=\box0
+ \setbox0 = \vsplit2 to \dimen at ii
+ \setbox0=\vbox to\dimen at ii{\unvbox0}%
+ \setbox2=\vbox to\dimen at ii{\unvbox2}%
\else
- \setbox0=\vbox to\dimen@{\unvbox1}%
- \setbox2=\vbox to\dimen@{\unvbox3}%
+ \multiply\dimen at ii by 5
+ \divide\dimen at ii by 4
+ \global\setbox3 = \copy0
+ \global\setbox1 = \vsplit3 to \dimen at ii
+ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
+ \ifdim\ht3<\dimen at ii
+ % Column heights are too different, so don't make their bottoms
+ % flush with each other. The glue at the end of the second column
+ % allows a second column to stretch, reducing the difference in
+ % height between the two.
+ \setbox0=\vbox to\dimen@{\unvbox1\vfill}%
+ \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}%
+ \else
+ \setbox0=\vbox to\dimen@{\unvbox1}%
+ \setbox2=\vbox to\dimen@{\unvbox3}%
+ \fi
\fi
\fi
%
More information about the tex-live-commits
mailing list