summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-23 13:14:05 +0000
committerKarl Berry <karl@freefriends.org>2014-05-23 13:14:05 +0000
commit5372c651fd08be39b4de29f3f015361552a9bc2a (patch)
tree1ae71cf729ce2a2f538177960e05c405364025bf
parent085c563f2e85006c2deb8354b84e5bc9d3304690 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@34228 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl9
-rwxr-xr-xBuild/source/texk/texlive/w32_wrapper/runscript.tlu4
-rw-r--r--Master/texmf-dist/tex/texinfo/texinfo.tex12
3 files changed, 12 insertions, 13 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index b3687dc4bf5..aa71d1c3a5f 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 34139 2014-05-20 01:40:43Z preining $
+# $Id: tlmgr.pl 34217 2014-05-22 22:55:37Z karl $
#
# Copyright 2008-2014 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 34139 $';
-my $datrev = '$Date: 2014-05-20 03:40:43 +0200 (Tue, 20 May 2014) $';
+my $svnrev = '$Revision: 34217 $';
+my $datrev = '$Date: 2014-05-23 00:55:37 +0200 (Fri, 23 May 2014) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -4816,14 +4816,13 @@ sub check_runfiles {
foreach my $f (@duplicates) {
# assume tex4ht, xdy, afm stuff is ok, and don't worry about
# Changes, README et al. Other per-format versions.
- next if $f =~ /\.(afm|cfg|4hf|htf|xdy)$/;
+ next if $f =~ /\.(afm|cfg|exe|4hf|htf|xdy)$/;
next if $f
=~ /^((czech|slovak)\.sty
|Changes
|Makefile
|README
|cid2code\.txt
- |context\/stubs
|etex\.src
|kinsoku\.tex
|language\.dat
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index 2b8a2804f4f..daa1d4f6d6f 100755
--- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 31764 $", "%d+") or "0"
-local svndate = string.match("$Date: 2013-09-26 00:02:54 +0100 (Thu, 26 Sep 2013) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 33766 $", "%d+") or "0"
+local svndate = string.match("$Date: 2014-04-30 18:03:08 +0200 (Wed, 30 Apr 2014) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 0f2673c849e..6312dadbce0 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{2014-03-17.07}
+\def\texinfoversion{2014-05-20.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2146,7 +2146,7 @@ end
\let\tenttsl=\secttsl
\def\curfontsize{sec}%
\def\lsize{subsec}\def\lllsize{reduced}%
- \resetmathfonts \setleading{16pt}}
+ \resetmathfonts \setleading{17pt}}
\def\subsecfonts{%
\let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
\let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
@@ -8856,20 +8856,20 @@ end
{
\catcode`\_ = \active
\globaldefs=1
-\parseargdef\documentlanguage{\begingroup
- \let_=\normalunderscore % normal _ character for filenames
+\parseargdef\documentlanguage{%
\tex % read txi-??.tex file in plain TeX.
% Read the file by the name they passed if it exists.
+ \let_ = \normalunderscore % normal _ character for filename test
\openin 1 txi-#1.tex
\ifeof 1
- \documentlanguagetrywithoutunderscore{#1_\finish}%
+ \documentlanguagetrywithoutunderscore #1_\finish
\else
\globaldefs = 1 % everything in the txi-LL files needs to persist
\input txi-#1.tex
\fi
\closein 1
\endgroup % end raw TeX
-\endgroup}
+}
%
% If they passed de_DE, and txi-de_DE.tex doesn't exist,
% try txi-de.tex.