summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-11 22:32:49 +0000
committerKarl Berry <karl@freefriends.org>2018-12-11 22:32:49 +0000
commitb8f67cb908880c8fdf6b03eb9c4d5219d7409171 (patch)
tree87574d214a3f39e7293bc54e2b40076ae052bed3 /Master/texmf-dist/tex/latex/tools
parent6ffd766f7627989e12bfb89d63f908de8c052c81 (diff)
latex(2e) (11dec18)
git-svn-id: svn://tug.org/texlive/trunk@49390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools')
-rw-r--r--Master/texmf-dist/tex/latex/tools/array.sty46
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol.sty29
-rw-r--r--Master/texmf-dist/tex/latex/tools/trace.sty52
-rw-r--r--Master/texmf-dist/tex/latex/tools/xr.sty10
4 files changed, 45 insertions, 92 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index f60e38cd37f..01af6d80549 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -45,7 +45,7 @@
\DeclareCurrentRelease{}{2018-04-30}
\ProvidesPackage{array}
- [2018/04/30 v2.4h Tabular extension package (FMi)]
+ [2018/11/13 v2.4j Tabular extension package (FMi)]
%%
\def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
@@ -95,31 +95,6 @@
\the@toks \the \count@ \relax}
\newdimen\col@sep
\def\@acol{\@addtopreamble{\hskip\col@sep}}
-\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
- \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
- \let\do@row@strut\relax
- \let\ar@align@mcell\relax
- \@xexpast #1*0x\@@
- \count@\m@ne
- \let\the@toks\relax
- \prepnext@tok
- \expandafter \@tfor \expandafter \@nextchar
- \expandafter :\expandafter =\@tempa \do
- {\@testpach
- \ifcase \@chclass \@classz \or \@classi \or \@classii
- \or \save@decl \or \or \@classv \or \@classvi
- \or \@classvii \or \@classviii \or \@classix
- \or \@classx \fi
- \@lastchclass\@chclass}%
- \ifcase\@lastchclass
- \@acol \or
- \or
- \@acol \or
- \@preamerr \thr@@ \or
- \@preamerr \tw@ \@addtopreamble\@sharp \or
- \or
- \else \@preamerr \@ne \fi
- \def\the@toks{\the\toks}}
\def\@classx{%
\ifcase \@lastchclass
\@acolampacol \or
@@ -140,7 +115,7 @@
\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or
\hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or
\setbox\ar@mcellbox\vbox
- \@startpbox{\@nextchar}\insert@column \@endpbox
+ \@startpbox{\@nextchar}\insert@column \@endpbox
\ar@align@mcell
\do@row@strut \or
\vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or
@@ -160,11 +135,6 @@
\box\ar@mcellbox
\fi}
-\def\@classix{\ifnum \@lastchclass = \thr@@
- \@preamerr \thr@@ \fi
- \@classx}
-\def\@classviii{\ifnum \@lastchclass >\z@
- \@preamerr 4\@chclass 6 \@classvi \fi}
\def\@arrayrule{\@addtopreamble \vline}
\def\@classvii{\ifnum \@lastchclass = \thr@@
\@preamerr \thr@@ \fi}
@@ -176,19 +146,17 @@
\fi}
\def\@classii{\advance \count@ \m@ne
\save@decl\prepnext@tok}
-\def\@classv{\save@decl
- \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
- \prepnext@tok}
\def\@classi{\@classvi
\ifcase \@chnum \@arrayrule \or
\@classv \fi}
\def\@startpbox#1{\bgroup
+ \color@begingroup
\setlength\hsize{#1}\@arrayparboxrestore
\everypar{%
\vrule \@height \ht\@arstrutbox \@width \z@
\everypar{}}%
}
-\def\@endpbox{\@finalstrut\@arstrutbox \egroup\hfil}
+\def\@endpbox{\@finalstrut\@arstrutbox \color@endgroup \egroup\hfil}
\def\@array[#1]#2{%
\@tempdima \ht \strutbox
\advance \@tempdima by\extrarowheight
@@ -244,7 +212,6 @@
\def\array{\col@sep\arraycolsep
\def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%
\@tabarray}
-\def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}}
\def\tabular{\def\@halignto{}\@tabular}
\expandafter\def\csname tabular*\endcsname#1{%
\setlength\dimen@{#1}%
@@ -254,7 +221,6 @@
\hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup
\let\d@llarend\endgroup
\@tabarray}
-\def\endarray{\crcr \egroup \egroup \gdef\@preamble{}}
\def\endtabular{\endarray $\egroup}
\expandafter\let\csname endtabular*\endcsname=\endtabular
\let\@ampacol=\relax \let\@expast=\relax
@@ -315,7 +281,9 @@
\def\save@decl{\toks \count@ = \expandafter\expandafter\expandafter
{\expandafter\@nextchar\the\toks\count@}}
\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
- \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
+ \let\@sharp\relax
+ \def\@startpbox##1{\unexpanded\expandafter{\expandafter
+ \@startpbox\expandafter{##1}}}\let\@endpbox\relax
\let\do@row@strut\relax
\let\ar@align@mcell\relax
\@temptokena{#1}\@tempswatrue
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index af85baa4a4a..a8548dc89ea 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -107,7 +107,7 @@
\DeclareCurrentRelease{}{2018-04-01}
\ProvidesPackage{multicol}
- [2018/04/20 v1.8s multicolumn formatting (FMi)]
+ [2018/11/09 v1.8u multicolumn formatting (FMi)]
%%
\DeclareOption{twocolumn}
{\PackageWarning{multicol}{May not work
@@ -941,8 +941,8 @@
not make sense.\MessageBreak
Going to balance anyway}%
\else
- \let\balance@columns@out
- \multi@column@out
+ \def\balance@columns@out
+ {\multi@column@out \penalty-\@Mvi }%
\fi
\begin{multicols}
}
@@ -1022,7 +1022,7 @@
\LRmulticolcolumns
\newcount\mc@col@check@num
-\newcommand\docolaction[4][1]{%
+\newcommand\docolaction{%
\ifx\mc@col@status@write\relax
\PackageError{multicol}%
{Option 'colaction' not selected}%
@@ -1037,7 +1037,17 @@
0\else
\csname mc@col-\the\mc@col@check@num
\endcsname
- \fi}%
+ \fi}%
+ \@ifstar
+ {\@docolactionstartrue \@docolaction}%
+ {\@docolactionstarfalse\@docolaction}%
+}
+\newcommand\@docolaction[4][1]{%
+ \edef\@docolactioncheck{\write\@auxout
+ {\string\mc@set@col@status
+ {mc@col-\the\mc@col@check@num}%
+ {\mc@col@type}}}%
+ \if@docolactionstar \@docolactioncheck \fi
\ifcase \mc@col@type\relax
\ifcase #1\or #2\or#3\or#4\fi
\or
@@ -1047,14 +1057,11 @@
\or
#4% % 3 last col
\else
- \ERROR
+ \ERRORwrongdefaultgiven
\fi
- \edef\next{\write\@auxout
- {\string\mc@set@col@status
- {mc@col-\the\mc@col@check@num}%
- {\mc@col@type}}}%
- \next
+ \if@docolactionstar \else \@docolactioncheck \fi
}
+\newif\if@docolactionstar
\def\mc@col@status#1{%
\gdef\mc@curr@col@status{#1}}
\def\mc@set@col@status#1#2{%
diff --git a/Master/texmf-dist/tex/latex/tools/trace.sty b/Master/texmf-dist/tex/latex/tools/trace.sty
index 2f0eb0b3ef2..e97fc31d741 100644
--- a/Master/texmf-dist/tex/latex/tools/trace.sty
+++ b/Master/texmf-dist/tex/latex/tools/trace.sty
@@ -36,12 +36,12 @@
%% given in the file `manifest.txt'.
%%
%%
-%% (C) Copyright 1999-2014 Frank Mittelbach
+%% (C) Copyright 1999-2018 Frank Mittelbach
%% All rights reserved.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{trace}
- [2014/10/28 v1.1d trace LaTeX code]
+ [2018/10/13 v1.1e trace LaTeX code]
\NeedsTeXFormat{LaTeX2e}[1998/12/01]
\DeclareOption{logonly}
{\let\tracingonline@p\z@}
@@ -56,7 +56,7 @@
\def\traceon{\let\conditionally@traceoff\unconditionally@traceoff
\tr@ce@n}
-\ifx\tracinggroups\undefined
+%% \tracinglostchars\z@
\def\tr@ce@n{%
\@tracingtrue
\tracingstats\tw@
@@ -64,37 +64,12 @@
\tracinglostchars\@ne
\tracingparagraphs\@ne
\errorcontextlines\maxdimen
- \tracingoutput\@ne
- \showboxbreadth\maxdimen
- \showboxdepth\maxdimen
- \errorstopmode
- \tracingmacros\tw@
- \tracingrestores\@ne
- \tracingcommands\tw@
- \tracingonline\tracingonline@p
- }
- \def\conditionally@traceoff{%
- \tracingrestores\z@
- \tracingcommands\z@
- \tracingpages\z@
- \tracingmacros\z@
- \tracingparagraphs\z@
- \tracingoutput\z@
- \showboxbreadth\m@ne
- \showboxdepth\m@ne
- \tracingstats\@ne
- }
-\else
- \def\tr@ce@n{%
- \@tracingtrue
- \tracingstats\tw@
- \tracingpages\@ne
- \tracinglostchars\@ne
- \tracingparagraphs\@ne
- \errorcontextlines\maxdimen
- \tracingoutput\@ne
- \showboxbreadth\maxdimen
- \showboxdepth\maxdimen
+ \ifnum\tracingoutput=\@ne
+ \else
+ \tracingoutput\tw@
+ \showboxbreadth\maxdimen
+ \showboxdepth\maxdimen
+ \fi
\errorstopmode
\tracingmacros\tw@
\tracinggroups\@ne
@@ -109,14 +84,15 @@
\tracingcommands\z@
\tracingpages\z@
\tracingmacros\z@
- \tracingoutput\z@
- \showboxbreadth\m@ne
- \showboxdepth\m@ne
+ \ifnum\tracingoutput=\tw@
+ \tracingoutput\z@
+ \showboxbreadth\m@ne
+ \showboxdepth\m@ne
+ \fi
\tracingstats\@ne
\tracingparagraphs\z@
\tracinggroups\z@
}
-\fi
\let\unconditionally@traceoff\conditionally@traceoff
\def\tracingall{\let\conditionally@traceoff\@empty
\let\tracingonline@p\@ne
diff --git a/Master/texmf-dist/tex/latex/tools/xr.sty b/Master/texmf-dist/tex/latex/tools/xr.sty
index 2a288dacafc..6fad3d0c7db 100644
--- a/Master/texmf-dist/tex/latex/tools/xr.sty
+++ b/Master/texmf-dist/tex/latex/tools/xr.sty
@@ -35,10 +35,10 @@
%% The list of all files belonging to the LaTeX `Tools Bundle' is
%% given in the file `manifest.txt'.
%%
-%% File: xr.dtx Copyright (C) 1994-1994 David Carlisle
+%% File: xr.dtx Copyright (C) 1994-1994 2018 David Carlisle
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xr}
- [1994/05/28 v5.02 eXternal References (DPC)]
+ [2018/10/01 v5.03 eXternal References (DPC)]
\def\externaldocument{\@ifnextchar[\XR@{\XR@[]}}
\def\XR@[#1]#2{{%
\makeatletter
@@ -62,11 +62,13 @@
\read\@inputcheck to\XR@line
\expandafter\XR@test\XR@line...\XR@}
\long\def\XR@test#1#2#3#4\XR@{%
+ \let\XR@next\@gobbletwo
\ifx#1\newlabel
- \newlabel{\XR@prefix#2}{#3}%
+ \let\XR@next\@firstoftwo%
\else\ifx#1\@input
- \edef\XR@list{\XR@list#2\relax}%
+ \let\XR@next\@secondoftwo
\fi\fi
+ \XR@next{\newlabel{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}%
\ifeof\@inputcheck\expandafter\XR@aux
\else\expandafter\XR@read\fi}