summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-12-24 23:26:36 +0000
committerKarl Berry <karl@freefriends.org>2015-12-24 23:26:36 +0000
commita3bde12ddd0f6630ae30eda498cf6824e2b66fba (patch)
tree65c924e7333d9ea1ff7a8ecda5bb45f68406252c
parent82f9afa0afb46184c964780dde8324cd64094e54 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@39194 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tests/TeXLive/TLConfig.pm5
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm37
-rw-r--r--Build/source/texk/texlive/tl_scripts/fmtutil.cnf7
-rw-r--r--Master/texmf-dist/tex/texinfo/texinfo.tex20
-rwxr-xr-xMaster/tlpkg/bin/check-files-by-format9
5 files changed, 42 insertions, 36 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index 4f9cee081c1..e1bdb5d4fed 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,3 +1,4 @@
+# $Id: TLConfig.pm 39006 2015-12-03 18:53:45Z karl $
# TeXLive::TLConfig.pm - module exporting configuration values
# Copyright 2007-2015 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -5,7 +6,7 @@
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 37643 $';
+my $svnrev = '$Revision: 39006 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -217,7 +218,7 @@ our $F_NOPOSTACTION = 4;
=head1 NAME
-C<TeXLive::TLConfig> -- TeX Live Configurations
+C<TeXLive::TLConfig> -- TeX Live Configuration module
=head1 SYNOPSIS
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 2fc4a3992b9..d26d17d30b4 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,3 +1,4 @@
+# $Id: TLUtils.pm 39054 2015-12-08 21:47:09Z karl $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007-2015 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -5,7 +6,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 37234 $';
+my $svnrev = '$Revision: 39054 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -20,7 +21,7 @@ sub module_revision {
=head1 NAME
-C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure
+C<TeXLive::TLUtils> -- utilities used in TeX Live infrastructure
=head1 SYNOPSIS
@@ -78,7 +79,7 @@ C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure
TeXLive::TLUtils::install_packages($from_tlpdb,$media,$to_tlpdb,$what,$opt_src, $opt_doc)>);
TeXLive::TLUtils::install_package($what, $filelistref, $target, $platform);
TeXLive::TLUtils::do_postaction($how, $tlpobj, $do_fileassocs, $do_menu, $do_desktop, $do_script);
- TeXLive::TLUtils::announce_execute_actions($how, @executes);
+ TeXLive::TLUtils::announce_execute_actions($how, @executes, $what);
TeXLive::TLUtils::add_symlinks($root, $arch, $sys_bin, $sys_man, $sys_info);
TeXLive::TLUtils::remove_symlinks($root, $arch, $sys_bin, $sys_man, $sys_info);
TeXLive::TLUtils::w32_add_to_path($bindir, $multiuser);
@@ -115,11 +116,9 @@ use vars qw(
$::LOGFILENAME @::LOGLINES
@::debug_hook @::ddebug_hook @::dddebug_hook @::info_hook @::warn_hook
@::install_packages_hook
- $::latex_updated
$::machinereadable
$::no_execute_actions
$::regenerate_all_formats
- $::tex_updated
$TeXLive::TLDownload::net_lib_avail
);
@@ -1935,10 +1934,11 @@ sub parse_into_keywords {
return($error, %ret);
}
-=item C<announce_execute_actions($how, $tlpobj)>
+=item C<announce_execute_actions($how, $tlpobj, $what)>
Announces that the actions given in C<$tlpobj> should be executed
-after all packages have been unpacked.
+after all packages have been unpacked. C<$what> provides
+additional information.
=cut
@@ -1955,12 +1955,10 @@ sub announce_execute_actions {
$::files_changed = 1;
return;
}
- if (defined($type) && ($type eq "latex-updated")) {
- $::latex_updated = 1;
- return;
- }
- if (defined($type) && ($type eq "tex-updated")) {
- $::tex_updated = 1;
+ if (defined($type) && ($type eq "rebuild-format")) {
+ # rebuild-format must feed in a hashref of a parse_AddFormat_line data
+ # the $tlp argument is not used
+ $::execute_actions{'enable'}{'formats'}{$what->{'name'}} = $what;
return;
}
if (!defined($type) || (($type ne "enable") && ($type ne "disable"))) {
@@ -3061,7 +3059,11 @@ sub parse_AddHyphen_line {
return %ret;
}
-
+#
+# return hash of items on AddFormat line LINE (which must not have the
+# leading "execute AddFormat"). If parse fails, hash will contain a key
+# "error" with a message.
+#
sub parse_AddFormat_line {
my $line = shift;
my %ret;
@@ -3070,7 +3072,7 @@ sub parse_AddFormat_line {
$ret{"mode"} = 1;
for my $p (quotewords('\s+', 0, "$line")) {
my ($a, $b);
- if ($p =~ m/^(name|engine|mode|patterns|options)=(.*)$/) {
+ if ($p =~ m/^(name|engine|mode|patterns|options|fmttriggers)=(.*)$/) {
$a = $1;
$b = $2;
} else {
@@ -3105,6 +3107,11 @@ sub parse_AddFormat_line {
$ret{"options"} = ( $b ? $b : "" );
next;
}
+ if ($a eq "fmttriggers") {
+ my @tl = split(',',$b);
+ $ret{"fmttriggers"} = \@tl ;
+ next;
+ }
# should not be reached at all
$ret{"error"} = "Unknown format directive $p";
return %ret;
diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
index d2bd6daf3ad..42283fa46a1 100644
--- a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
+++ b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue May 5 03:20:22 2015
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Mon Dec 7 03:15:59 2015
# Originally written by Thomas Esser, 1998. Public domain.
#
# As of TeX Live 2015, fmtutil reads *all* fmtutil.cnf files found.
@@ -112,11 +112,6 @@ ptex ptex - ptex.ini
eptex eptex language.def *eptex.ini
platex eptex language.dat *platex.ini
#
-# from t2:
-#! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
-#! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini
-#! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
-#
# from tex:
tex tex - tex.ini
#
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 34fd353a9dc..f140bba94b8 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/texinfo.tex
@@ -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{2015-12-17.20}
+\def\texinfoversion{2015-12-20.12}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5410,6 +5410,9 @@ end
}
\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
+ % If not much space left on page, start a new page.
+ \ifdim\pagetotal>0.8\vsize\vfill\eject\fi
+ %
% Grab any single-column material above us.
\output = {%
%
@@ -5467,7 +5470,7 @@ end
% since nobody clobbers \vsize.)
\global\doublecolumntopgap = \topskip
\global\advance\doublecolumntopgap by -1\baselineskip
- \global\advance\vsize by -1\doublecolumntopgap
+ \advance\vsize by -1\doublecolumntopgap
\vsize = 2\vsize
\topskip=0pt
\global\entrylinedepth=0pt\relax
@@ -5537,23 +5540,20 @@ end
\penalty0
%
\output = {%
- % Split the last of the double-column material. Leave it on the
- % current page, no automatic page break.
+ % Split the last of the double-column material.
\savemarks
\balancecolumns
%
- % If we end up splitting too much material for the current page,
- % though, there will be another page break right after this \output
- % invocation ends. Having called \balancecolumns once, we do not
+ % Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
- % definition right away. (We hope \balancecolumns will never be
- % called on to balance too much material, but if it is, this makes
- % the output somewhat more palatable.)
+ % definition right away.
\global\output = {\onepageout{\pagecontents\PAGE}}%
}%
\eject
\endgroup % started in \begindoublecolumns
\restoremarks
+ % Leave the double-column material on the current page, no automatic
+ % page break.
\box\balancedcolumns
%
% \pagegoal was set to the doubled \vsize above, since we restarted
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index 80d21267551..fa2704d8fc2 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -43,9 +43,12 @@ my $exclude_otf = { '*base*' => 'texmf-dist/fonts/opentype',
# 1 means pdfinfo issues errors but still exits successfully
# 2 means pdfinfo exits non-zero
my $exclude_pdf = {
- # author cannot fix:
- 'texmf-dist/doc/fonts/frcursive/frcursive.pdf' => 1, # 14nov11
- 'texmf-dist/doc/generic/pst-perspective/' => 1, # 17apr14
+ # 14nov11 author cannot fix:
+ 'texmf-dist/doc/fonts/frcursive/frcursive.pdf' => 1,
+ # 17apr14 unknown:
+ 'texmf-dist/doc/generic/pst-perspective/' => 1,
+ # 20dec15 "couldn't read xref table", but seems mostly ok:
+ 'texmf-dist/doc/latex/ksp-thesis/ksp-thesis.pdf' => 1,
# 15dec12 derekn says will be fixed in next xpdf after 3.03:
# (causes seg fault now):
'texmf-dist/doc/latex/ocgx/demo-ocgx.pdf' => -1,