summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-22 23:37:33 +0000
committerKarl Berry <karl@freefriends.org>2017-01-22 23:37:33 +0000
commitb2ba0afced5c10391750914c16a2aa06cfaa6a96 (patch)
tree8a87b0b92f0038639e1078486bb4c2a56bcea2d3 /Master/texmf-dist/source/latex/tools
parentbc46c8f4627710df445115626d25161dcb2df985 (diff)
latex2e (22jan17)
git-svn-id: svn://tug.org/texlive/trunk@43024 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tools')
-rw-r--r--Master/texmf-dist/source/latex/tools/array.dtx24
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.dtx26
2 files changed, 31 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index e31656c5e07..2a648888065 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2014
+% Copyright 1993-2016
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -26,7 +26,7 @@
%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
%<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
%<+package>\ProvidesPackage{array}
-%<+package> [2014/10/28 v2.4c Tabular extension package (FMi)]
+%<+package> [2016/10/06 v2.4d Tabular extension package (FMi)]
%
% \fi
%
@@ -2126,10 +2126,15 @@
% \begin{macro}{\@halignto}
% \begin{macro}{\d@llarbegin}
% \begin{macro}{\d@llarend}
-% In order to relieve the \textsf{save stack} we assign the
-% replacement texts for =\@halignto= globally. =\d@llar= has to be
-% local since otherwise nested \textsf{tabular} and \textsf{array}
+% =\d@llar= has to be
+% locally asigned since otherwise nested \textsf{tabular} and \textsf{array}
% environments (via =\multicolumn=) are impossible.
+% For 25 years or so =\@halignto= was set globally (to save space on the
+% save stack, but that was a mistake: if there is a tabular in the
+% output routine (e.g., in the running header) then that tabular is
+% able overwrite the =\@halignto=
+% setting of a tabular in the main text resulting in a very weird error.
+% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
% \changes{v2.0g}{1992/06/18}{`d@llarbegin defined on toplevel.}
% When the new font selection scheme is in force we have to
% we surround all =\halign= entries
@@ -2151,9 +2156,10 @@
% \begin{macro}{\array}
% Our new definition of =\array= then reads:
% \changes{v2.0d}{1990/08/20}{`d@llar local to preamble.}
+% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
% \begin{macrocode}
\def\array{\col@sep\arraycolsep
- \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\gdef\@halignto{}%
+ \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%
% \end{macrocode}
% Since there might be an optional argument we call another
% macro which is also used by the other environments.
@@ -2176,18 +2182,20 @@
% The environments \textsf{tabular} and \textsf{tabular$*$} differ
% only in the initialisation of the command =\@halignto=. Therefore
% we define
+% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
% \begin{macrocode}
-\def\tabular{\gdef\@halignto{}\@tabular}
+\def\tabular{\def\@halignto{}\@tabular}
% \end{macrocode}
% and analogously for the star form. We evaluate the argument first
% using =\setlength= so that users of the \texttt{calc} package can
% write code like\\ =\begin{tabular*}{(\columnwidth-1cm)/2}...=
% \changes{v2.3l}{1998/05/13}{Use \cs{setlength} evaluate arg
% so that the calc package can be applied here (pr/2793)}
+% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
% \begin{macrocode}
\expandafter\def\csname tabular*\endcsname#1{%
\setlength\dimen@{#1}%
- \xdef\@halignto{to\the\dimen@}\@tabular}
+ \edef\@halignto{to\the\dimen@}\@tabular}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index 785cbacce30..11b159cbde2 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2016
+% Copyright 1993-2017
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -22,11 +22,10 @@
% \fi
%
% \iffalse
-%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016
+%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016 2017
%% David Carlisle Frank Mittelbach
%%
%% Development of this package was commissioned by Y&Y Inc.
-%% http://www.yandy.com
%
%
%<*dtx>
@@ -37,7 +36,7 @@
%<driver>\ProvidesFile{bm.drv}
% \fi
% \ProvidesFile{bm.dtx}
- [2016/07/07 v1.2b Bold Symbol Support (DPC/FMi)]
+ [2017/01/16 v1.2c Bold Symbol Support (DPC/FMi)]
%
% \iffalse
%<*driver>
@@ -1364,6 +1363,8 @@
% \begin{macro}{\bm@umathchar}
% \changes{v1.2a}{2016/02/27}
% {Macro added}
+% \changes{v1.2a}{2017/01/16}
+% {Test for zero table entry (\cs{boldmath}) added}
% Version of \verb|\bm@mathchar| for \verb|\Umathchar|, this is easier
% as no need to take apart the number, the match class and fam are provided
% as distinct arguments.
@@ -1371,14 +1372,17 @@
\def\bm@umathchar#1#2#3{%
\@tempcnta#2\relax
\count@\bm@table
-\ifx\count@=\m@ne
-% no bold
+\ifnum\count@=\z@
+ \bm@gr@up\boldmath{\Umathchar#1 #2 #3 }%
\else
- \advance\@tempcnta\count@
-\fi
-\bm@xadd{\Umathchar#1\space
- \the\@tempcnta\space\space
- #3\space}}
+ \ifnum\count@=\m@ne
+ \else
+ \advance\@tempcnta\count@
+ \fi
+ \bm@xadd{\Umathchar#1\space
+ \the\@tempcnta\space\space
+ #3\space}%
+\fi}
% \end{macrocode}
% \end{macro}
%