diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-01 21:12:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-01 21:12:14 +0000 |
commit | f496422c8703b52babe725eb473534648fad4367 (patch) | |
tree | febd2c0e8d52525785bc6d403caf5a2094f15e50 /Master/texmf-dist/source/latex/tools | |
parent | 8e612434e447670e242d9f964512bd2c04037d03 (diff) |
latex2e (1jun21)
git-svn-id: svn://tug.org/texlive/trunk@59424 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tools')
33 files changed, 366 insertions, 134 deletions
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.dtx b/Master/texmf-dist/source/latex/tools/afterpage.dtx index 600d221cb63..e5fa69f5152 100644 --- a/Master/texmf-dist/source/latex/tools/afterpage.dtx +++ b/Master/texmf-dist/source/latex/tools/afterpage.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/afterpage.ins b/Master/texmf-dist/source/latex/tools/afterpage.ins index 96cba1ed0ca..0cfc531f193 100644 --- a/Master/texmf-dist/source/latex/tools/afterpage.ins +++ b/Master/texmf-dist/source/latex/tools/afterpage.ins @@ -3,8 +3,8 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file is part of the Standard LaTeX `Tools Bundle'. @@ -45,8 +45,8 @@ The source is maintained by the LaTeX Project team and bug reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 1993-2020 -The LaTeX3 Project and any individual authors listed elsewhere +Copyright (C) 1993-2021 +The LaTeX Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx index ff963d7f514..84376a486b3 100644 --- a/Master/texmf-dist/source/latex/tools/array.dtx +++ b/Master/texmf-dist/source/latex/tools/array.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. @@ -33,7 +33,7 @@ %<+package>\DeclareCurrentRelease{}{2020-10-01} %<+package> %<+package>\ProvidesPackage{array} -%<+package> [2020/10/01 v2.5c Tabular extension package (FMi)] +%<+package> [2021/04/20 v2.5e Tabular extension package (FMi)] % % \fi % @@ -188,7 +188,7 @@ % David Carlisle\thanks{David kindly agreed on the inclusion % of the \texttt{\textbackslash{}newcolumntype} implementation, % formerly in -% \texttt{newarray.sty} into this package }} +% \texttt{newarray.sty} into this package.}} % % \date{Printed \today} % @@ -361,6 +361,56 @@ % columns have predefined widths. % \end{itemize} % +% +% \subsection{The behavior of the \texttt{\string\\} command} +% +% In the basic \texttt{tabular} implementation of \LaTeX{} the \cs{\bslash} +% command ending the rows of the \texttt{tabular} or \texttt{array} has +% a somewhat inconsistent behavior if its optional argument is used. The +% result then depends on the type of rightmost column and as remarked in +% Leslie Lamport's \LaTeX{} manual~\cite{bk:lamport} may not always produce the +% expected extra space. +% +% +% Without the \textsf{array} package the extra space requested by the +% optional argument of \cs{\bslash} is measured from the last baseline of +% the rightmost column (indicated by ``x'' in the following +% example). As a result, swapping the column will give different +% results: +% \begin{verbatim} +% \begin{tabular}[t]{lp{1cm}} +% 1 & 1\newline x \\[20pt] 2 & 2 \end{tabular} +% \begin{tabular}[t]{p{1cm}l} +% 1\newline 1 & x \\[20pt] 2 & 2 \end{tabular} +% \end{verbatim} +% \pagebreak +% If you run this without the \textsf{array} package you will get the +% following result: +% \begin{center} +% \begin{tabular}[t]{lp{1cm}} +% 1 & 1\newline x \\[32pt] 2 & 2 \end{tabular} +% \begin{tabular}[t]{p{1cm}l} +% 1\newline 1 & x \\[20pt] 2 & 2 \end{tabular} +% \end{center} +% In contrast, when the \textsf{array} package is loaded, the requested +% space in the optional argument is always measured from the baseline of +% the whole row and not from the last baseline of the rightmost column, thus +% swapping columns doesn't change the spacing and we same table height +% with an effective 8pt of extra space (as the second line already takes +% up 12pt of the requested 20pt): +% \begin{center} +% \begin{tabular}[t]{lp{1cm}} +% 1 & 1\newline x \\[20pt] 2 & 2 \end{tabular} +% \begin{tabular}[t]{p{1cm}l} +% 1\newline 1 & x \\[20pt] 2 & 2 \end{tabular} +% \end{center} +% +% This correction of behavior only makes a difference if the rightmost column +% is a \texttt{p}-column. Thus if you add the \textsf{array} +% package to an existing document, you should verify the spacing in all +% tables that have this kind of structure. +% +% % \subsection{Defining new column specifiers} % % \DeleteShortVerb{\=} @@ -1958,8 +2008,9 @@ % \changes{v2.2d}{1994/05/16}{Use \LaTeXe \cs{@finalstrut}} % \changes{v2.3g}{1996/05/07}{Add \cs{hfil} for tools/2120} % \changes{v2.4i}{2018/09/13}{Add group to prevent color leak (gh/72)} +% \changes{v2.5d}{2021/02/10}{Explicitly run \cs{par} at the end of pboxes} % \begin{macrocode} -\def\@endpbox{\@finalstrut\@arstrutbox \color@endgroup \egroup\hfil} +\def\@endpbox{\@finalstrut\@arstrutbox \par \color@endgroup \egroup\hfil} % \end{macrocode} % \end{macro} % @@ -2142,8 +2193,9 @@ % For further information see % \cite[Appendix D]{bk:knuth}. % \changes{v2.3c}{1995/04/23}{Avoid adding an ord atom in math} +% \changes{v2.5e}{2021/04/20}{Use \cs{protected} for \cs{\bslash} variant (gh/548)} % \begin{macrocode} -\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi +\protected\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi % \end{macrocode} % Then we test whether the user is using the star form and ignore % a possible star (I also disagree with this procedure, because a diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx index 096f6c4bc2a..2b56b92b547 100644 --- a/Master/texmf-dist/source/latex/tools/bm.dtx +++ b/Master/texmf-dist/source/latex/tools/bm.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. @@ -36,7 +36,7 @@ %<driver>\ProvidesFile{bm.drv} % \fi % \ProvidesFile{bm.dtx} - [2019/07/24 v1.2d Bold Symbol Support (DPC/FMi)] + [2021/04/25 v1.2e Bold Symbol Support (DPC/FMi)] % % \iffalse %<*driver> @@ -295,6 +295,23 @@ % between these two packages, this package defines |\boldsymbol| and % |\heavysymbol| as alternative names for |\bm| and |\hm|. % +% \section{Package Options} +% +% \subsection{Logging level} +% As described above, the \textsf{bm} package has to interrogate the font +% setup to try to find matching bold fonts for each font used in the |normal| +% math version. This can fail in various ways as there may be no bold font +% or a bold font may be found but no room is available to allocate it. +% The options |warn|, |info| and |silent| control whether messages that \textsf{bm} +% produces are sent to the terminal, or just to the log file (the default) or suppressed. +% +% \subsection{Poor Man's Bold} +% As discussed above, by default, if no real bold font is available, \textsf{bm} will use +% ``poor man's bold''. That is, over-printing the character with slight offsets. +% Since version 1.2e, the package now warns if a font is set up to use this over-printing and +% the package option |nopbm| is available which prevents its use in which case |\bm| will +% use the non-bold for characters from the affected font, +% % \StopEventually{} % % \section{Implementation} @@ -320,6 +337,20 @@ % {minor doc changes latex/3058} % % +% \changes{v1.2e}{2021/04/25} +% {Package options gh/71} +% Options to use or not use poor mans bold (over-printing) +% and level of warning messages. +% \begin{macrocode} +%<*package> +\DeclareOption{nopmb}{\let\bm@pmb@\@firstofone} +\DeclareOption{warn}{\def\bm@info{\PackageWarningNoLine{bm}}} +\DeclareOption{info}{\def\bm@info#1{\PackageInfo{bm}{#1\@gobble}}} +\DeclareOption{silent}{\let\bm@info\@gobble} +\ExecuteOptions{info} +\ProcessOptions\relax +%</package> +% \end{macrocode} % % The commands |\bm| and |\hm| work by defining a number of additional % symbol fonts corresponding to the standard ones @@ -368,6 +399,7 @@ % code, which is temporarily defined to |\bm|, to save wasting a csname. % Similarly |\bm@pmb|\ldots\ (which will be defined later) are used % as scratch macros. +% (This csname saving no longer used, setup command is |\bm@setup| not |\bm|). % % The general plan. Run through the fonts allocated to the normal math % version. Ignore \meta{math alphabet} allocations\footnote{For now?} @@ -393,15 +425,15 @@ % using |\boldmath| or poor man's bold.) % % \begin{macrocode} -\def\bm#1#2{% +\def\bm@setup#1#2{% % \end{macrocode} % This code can not work inside a group, as that would affect any symbol % font allocations, so instead use some scratch macros to save and % restore the definitions of commands we need to change locally. % \begin{macrocode} - \let\bm@pmb\install@mathalphabet - \let\bm@pmb@\getanddefine@fonts - \let\bm@pmb@@\or + \let\bm@install@mathalphabet\install@mathalphabet + \let\bm@getanddefine@fonts\getanddefine@fonts + \let\bm@or\or \edef\bm@general{\f@encoding/\f@family/\f@series/\f@shape/\f@size}% % \end{macrocode} % @@ -465,8 +497,12 @@ % \end{macrocode} % If they are the same, set this offset to $-1$, as a flag to use % poor man's bold. +% \changes{v1.2e}{2021/04/25} +% {make use of pmb optional and warn about it gh/71} % \begin{macrocode} \bm@define\m@ne + \bm@info{No #1 for \string##2% + \ifx\bm@pmb@\@firstofone\else, using \string\pmb\fi}% \else % \end{macrocode} % Else make a new name by adjoining |#1| to the name of the symbol font @@ -569,7 +605,7 @@ % \end{macrocode} % If the font has been allocated already, use the existing allocation. % \begin{macrocode} - \PackageInfo{bm}% + \bm@info {Symbol font \@tempa\space already defined.\MessageBreak Not overwriting it}% \fi @@ -613,9 +649,9 @@ % Put things back as they were. % \begin{macrocode} \expandafter\split@name\bm@general\@nil - \let\install@mathalphabet\bm@pmb - \let\getanddefine@fonts\bm@pmb@ - \let\or\bm@pmb@@} + \let\install@mathalphabet\bm@install@mathalphabet + \let\getanddefine@fonts\bm@getanddefine@fonts + \let\or\bm@or} % \end{macrocode} % \end{macro} % \end{macro} @@ -647,13 +683,13 @@ \def\bm@boldtable{\m@ne} \AtEndOfPackage{% \def\bm@gr@up#1#2{% - \bm@pmb{#2}}} + \bm@install@mathalphabet{#2}}} \else % \end{macrocode} % Otherwise use the definition of |\bm| above to set up |\bm@boldtable| % by comparing the fonts available in the normal and bold math versions. % \begin{macrocode} - \bm{bold}\bmmax + \bm@setup{bold}\bmmax % \end{macrocode} % % \begin{macro}{\mathbf} @@ -689,7 +725,7 @@ % \begin{macrocode} \ifx\mv@heavy\@undefined \else - \bm{heavy}\hmmax + \bm@setup{heavy}\hmmax \fi % \end{macrocode} % \end{macro} @@ -781,6 +817,8 @@ % you put something really strange in the arguments. % \changes{v0.11}{1997/01/06} % {\cs{@ifnextchar} made safe.} +% \changes{v1.2e}{2021/04/25} +% {treat \cs{kernel@ifnextchar} like \cs{@ifnextchar}} % \begin{macrocode} \def\@ifnextchar##1##2##3##4{% \if##1##4% @@ -789,6 +827,7 @@ \expandafter\@secondoftwo \fi {##2##4}{##3{##4}}}% + \let\kernel@ifnextchar\@ifnextchar % \end{macrocode} % For Vladimir Volovich\ldots % \changes{v1.0f}{1998/12/10} @@ -1397,6 +1436,8 @@ % \begin{macro}{\bm@pmb} % \changes{v0.10}{1997/01/04} % {Macro added} +% \changes{v1.2e}{2021/04/25} +% {option to make pmb a no-op} % Add a poor man's bold construction to the list being built. % \begin{macrocode} \def\bm@pmb#1{% @@ -1410,6 +1451,7 @@ % |\pmb| variant. (See \TeX{}Book, or AMS \textsf{amsbsy} package). % This one takes a bit more care to use smaller offsets in subscripts. % \begin{macrocode} +\ifx\bm@pmb@\@firstofone\else \def\bm@pmb@#1{{% \setbox\tw@\hbox{$\m@th\mkern.4mu$}% \mathchoice @@ -1434,6 +1476,7 @@ \raise1.5\dimen@\rlap{\copy\z@}% \kern\dimen@ \box\z@}}% +\fi % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/tools/bm.ins b/Master/texmf-dist/source/latex/tools/bm.ins index e963d1d88e2..c00a3e5cca4 100644 --- a/Master/texmf-dist/source/latex/tools/bm.ins +++ b/Master/texmf-dist/source/latex/tools/bm.ins @@ -3,8 +3,8 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file is part of the Standard LaTeX `Tools Bundle'. @@ -45,8 +45,8 @@ The source is maintained by the LaTeX Project team and bug reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 1993-2020 -The LaTeX3 Project and any individual authors listed elsewhere +Copyright (C) 1993-2021 +The LaTeX Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/calc.dtx b/Master/texmf-dist/source/latex/tools/calc.dtx index 62fe27489b2..78b6167fe6f 100644 --- a/Master/texmf-dist/source/latex/tools/calc.dtx +++ b/Master/texmf-dist/source/latex/tools/calc.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. @@ -25,7 +25,7 @@ %% Copyright (C) 1992--1995 %% Kresten Krab Thorup and Frank Jensen. %% Copyright (C) 1997--2007 -%% Kresten Krab Thorup, Frank Jensen and the LaTeX3 Project. +%% Kresten Krab Thorup, Frank Jensen and the LaTeX Project. %% %% The original authors (fj@hugin.dk and krab@daimi.aau.dk) have %% contributed this package to the LaTeX distribution. diff --git a/Master/texmf-dist/source/latex/tools/dcolumn.dtx b/Master/texmf-dist/source/latex/tools/dcolumn.dtx index 1899cce5560..069e633221d 100644 --- a/Master/texmf-dist/source/latex/tools/dcolumn.dtx +++ b/Master/texmf-dist/source/latex/tools/dcolumn.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/delarray.dtx b/Master/texmf-dist/source/latex/tools/delarray.dtx index 17cac2052cb..cc503707b0d 100644 --- a/Master/texmf-dist/source/latex/tools/delarray.dtx +++ b/Master/texmf-dist/source/latex/tools/delarray.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/enumerate.dtx b/Master/texmf-dist/source/latex/tools/enumerate.dtx index 3ce463e6015..150a7386b83 100644 --- a/Master/texmf-dist/source/latex/tools/enumerate.dtx +++ b/Master/texmf-dist/source/latex/tools/enumerate.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/fileerr.dtx b/Master/texmf-dist/source/latex/tools/fileerr.dtx index 16a95e28203..d9163041161 100644 --- a/Master/texmf-dist/source/latex/tools/fileerr.dtx +++ b/Master/texmf-dist/source/latex/tools/fileerr.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx index a5fb2964a98..b7208267736 100644 --- a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx +++ b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx index e5fffdfcd92..e8da56aa204 100644 --- a/Master/texmf-dist/source/latex/tools/ftnright.dtx +++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. @@ -314,7 +314,7 @@ % \newblock Addison-Wesley, Reading, Massachusetts, 1986. % % \bibitem{src:ltxiii94} -% \LaTeX3 project. +% \LaTeX\ Project. % \newblock \LaTeXe distribution, 1994. % \newblock Sources for {\LaTeXe} the successor to \LaTeX~2.09. % diff --git a/Master/texmf-dist/source/latex/tools/hhline.dtx b/Master/texmf-dist/source/latex/tools/hhline.dtx index b9234b5aa25..98d68024515 100644 --- a/Master/texmf-dist/source/latex/tools/hhline.dtx +++ b/Master/texmf-dist/source/latex/tools/hhline.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/indentfirst.dtx b/Master/texmf-dist/source/latex/tools/indentfirst.dtx index 7123be04c54..e54df284ae1 100644 --- a/Master/texmf-dist/source/latex/tools/indentfirst.dtx +++ b/Master/texmf-dist/source/latex/tools/indentfirst.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/layout.dtx b/Master/texmf-dist/source/latex/tools/layout.dtx index 8918ffdca48..de61aeae8c4 100644 --- a/Master/texmf-dist/source/latex/tools/layout.dtx +++ b/Master/texmf-dist/source/latex/tools/layout.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. @@ -30,7 +30,7 @@ %<+package>\ProvidesPackage{layout} %<+driver>\ProvidesFile{layout.drv} %\ProvidesFile{layout.dtx} - [2014/10/28 v1.2c Show layout parameters] + [2021-03-10 v1.2e Show layout parameters] % % A short driver is provided that can be extracted if necessary by % the \textsf{DocStrip} program provided with \LaTeXe. @@ -54,6 +54,17 @@ % \changes{v1.1d}{1994/09/08}{Stored texts in control sequences to % allow other languages} % +% \makeatletter +% \def\allowtofu{^^A +%\def\UTFviii@undefined@err##1{^^A +% \PackageWarning{inputenc}{Unicode character \expandafter +% \UTFviii@splitcsname\string##1\relax +% \MessageBreak +% not set up for use with LaTeX}^^A +% \raisebox{.8pt}{\fboxsep1pt\kern.1pt\fbox{$\cdot$}\kern.1pt}^^A +% }} +% \makeatother +% % \GetFileInfo{layout.dtx} % \title{Displaying page layout variables} % \author{Kent McPherson a.o.\thanks{Converted for \LaTeXe\ by @@ -172,6 +183,32 @@ \def\notshown{non mostrato} } % \end{macrocode} +% +% \changes{v1.2e}{2021-03-10}{Added option for Romanian (gh529)} +% \begin{macrocode} +\DeclareOption{romanian}{% + \def\Headertext{Antet} + \def\Bodytext{Corp} + \def\Footertext{Subsol} + \def\MarginNotestext{Note\\ Marginale} + \def\oneinchtext{un inch} + \def\notshown{neafi\textcommabelow sat} + } +% \end{macrocode} +% +% \changes{v1.2d}{2020-07-25}{Added option for Japanese (gh353)} +% \begin{allowtofu} +% \begin{macrocode} +\DeclareOption{japanese}{% + \def\Headertext{天} + \def\Bodytext{基本版面} + \def\Footertext{地} + \def\MarginNotestext{傍\\注} + \def\oneinchtext{1インチ} + \def\notshown{非表示} + } +% \end{macrocode} +% \end{allowtofu} % % This package has an option \Lopt{verbose}. Using it will make the % command |\layout| type some of the parameters on the terminal. diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx index 004d630fcec..457891dac72 100644 --- a/Master/texmf-dist/source/latex/tools/longtable.dtx +++ b/Master/texmf-dist/source/latex/tools/longtable.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. @@ -27,11 +27,17 @@ \ProvidesFile{longtable.dtx} %</dtx> %<package>\NeedsTeXFormat{LaTeX2e}[1995/06/01] +%<package>\providecommand\DeclareRelease[3]{} +%<package>\providecommand\DeclareCurrentRelease[2]{} +%<package> +%<package>\DeclareRelease{v4.13}{2020-01-02}{longtable-2020-01-07.sty} +%<package>\DeclareCurrentRelease{}{2020-02-07} +%<package> %<package>\ProvidesPackage{longtable} %<driver> \ProvidesFile{longtable.drv} % \fi % \ProvidesFile{longtable.dtx} - [2020/01/07 v4.13 Multi-page Table package (DPC)] + [2021-05-07 v4.16 Multi-page Table package (DPC)] % % \iffalse %<*driver> @@ -303,7 +309,7 @@ % (see below), the "LTchunksize" must be at least as large as the % number of rows in each of the head or foot sections. % -% This document specifies "\setcounter{LTchunksize}{10}". If you look +% This document specifies "\setcounter{LTchunksize}{200}". If you look % at the previous table, after the \emph{first} run of \LaTeX\ you will % see that various parts of the table do not line up. % \LaTeX\ will also have printed a warning that the column @@ -877,9 +883,11 @@ % \end{macro} % % \begin{macro}{\LTchunksize} -% Chunk size (The number of rows taken per "\halign"). Default 20. +% \changes{v4.14}{2020/02/07} +% {Increase default chunksize from 20 to 200} +% Chunk size (The number of rows taken per "\halign"). Default 200. % \begin{macrocode} -\newcount\LTchunksize \LTchunksize=20 +\newcount\LTchunksize \LTchunksize=200 % \end{macrocode} % \end{macro} % @@ -916,6 +924,14 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\LT@gbox} +% \changes{v4.14}{2020/02/07} +% {global box added (tools/2914)} +% \begin{macrocode} +\newbox\LT@gbox +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\LT@cols} % Counter for number of columns. % \begin{macrocode} @@ -1212,7 +1228,7 @@ % \end{macro} % % \begin{macro}{\LT@start} -% % \changes{v4.13}{2020/01/07} +% \changes{v4.13}{2020/01/07} % {fix issue https://github.com/davidcarlisle/dpctex/issues/8} % This macro starts the process of putting the table on the current % page. It is not called until either a "\\" or "\endlongtable" command @@ -1228,6 +1244,34 @@ \let\LT@start\endgraf \endgraf\penalty\z@\vskip\LTpre\endgraf % \end{macrocode} +% \changes{v4.14}{2020/02/07} +% {Guard against shrink glue on current page tools/3396 and github 183} +% This next block was suggested by Lars Hellström in pr tools/3396 +% He documents it as: +% +% The original problem occurs because TeX has not yet found an awfully bad +% "(b=*)" breakpoint and is therefore still collecting material to see if there +% is a really good break somewhere just ahead. As we know there aren't, we +% want to make it stop looking and break the page, so that "\pagetotal" will be +% for the page where the table will actually end up. To achieve this, we +% need to give \TeX\ an awfully bad, but legal, breakpoint. The simplest way of +% doing this seems to be to insert a "\kern" that counters the "\pageshrink" for +% the page, followed by a "\penalty" and a "\par" (to exercise the page builder). +% We also have to make sure that this breakpoint doesn't affect how the next +% page is broken, so we make the penalty 9999 (10000 is infinite and thus not +% a legal breakpoint) and cancel out the "\kern" with a new "\kern". +% +% I don't think this is the \emph{right} solution to the problem (that would be +% that the standard output routine has a feature for syncronizing with +% typesetting, as part of the preparations for switching output routine), but +% it's OK. Perhaps XOR will make it better. +% \begin{macrocode} + \ifdim \pagetotal<\pagegoal \else + \dimen@=\pageshrink + \advance \dimen@ 1sp % + \kern\dimen@\penalty 9999\endgraf \kern-\dimen@ + \fi +% \end{macrocode} % Start a new page if there is not enough room for the table head, foot, % and one extra line. % \begin{macrocode} @@ -1238,6 +1282,8 @@ % \end{macrocode} % \changes{v3.16}{1995/11/09} % {Measure the first line of the table} +% \changes{v4.15}{2021/04/18} +% {silence \cs{vbadness}} % At this point I used to add "\ht\@arstrutbox" and "\dp\@arstrutbox" % as a measure of a row size. However this can fail spectacularly % for "p" columns which might be much larger. Previous versions could @@ -1245,12 +1291,13 @@ % a head \emph{then} a `first head'! So now measure the first line of % the table accurately by "\vsplit"ting it out of the first chunk. % \begin{macrocode} - \dimen@ii\vfuzz + \edef\LT@reset@vfuzz{\vfuzz\the\vfuzz\vbadness\the\vbadness\relax}% \vfuzz\maxdimen - \setbox\tw@\copy\z@ - \setbox\tw@\vsplit\tw@ to \ht\@arstrutbox - \setbox\tw@\vbox{\unvbox\tw@}% - \vfuzz\dimen@ii + \vbadness\@M + \setbox\tw@\copy\z@ + \setbox\tw@\vsplit\tw@ to \ht\@arstrutbox + \setbox\tw@\vbox{\unvbox\tw@}% + \LT@reset@vfuzz \advance\dimen@ \ht \ifdim\ht\@arstrutbox>\ht\tw@\@arstrutbox\else\tw@\fi \advance\dimen@\dp @@ -1259,7 +1306,18 @@ % % \begin{macrocode} \advance\dimen@ -\pagegoal - \ifdim \dimen@>\z@\vfil\break\fi + \ifdim \dimen@>\z@ + \vfil\break + \else +% \end{macrocode} +% +% \changes{v4.14}{2020/02/07} +% {Guard against shrink glue on current page see github 183} +% The LT output routine does not handle shrink on the page, which can cause +% The first page to be over-long, so forget it is there. +% \begin{macrocode} + \ifdim\pageshrink>\z@\pageshrink\z@\fi + \fi % \end{macrocode} % Store height of page minus table foot in "\@colroom". % \changes{v3.14}{1995/05/02} @@ -1269,9 +1327,12 @@ % \end{macrocode} % If the foot is non empty, reduce the "\vsize" and "\@colroom" % accordingly. +% \changes{v4.14}{2020/02/07} +% {Rearrange vertical space tests for tools/3512 (floats on same page)} % \begin{macrocode} \ifvoid\LT@foot\else - \advance\vsize-\ht\LT@foot +% \advance\vsize-\ht\LT@foot + \global\advance\vsize-\ht\LT@foot \global\advance\@colroom-\ht\LT@foot \dimen@\pagegoal\advance\dimen@-\ht\LT@foot\pagegoal\dimen@ \maxdepth\z@ @@ -1350,8 +1411,15 @@ \fi % \end{macrocode} % Force one more go with the \env{longtable} output routine. +% \changes{v4.14}{2020/02/07} +% {Rearrange vertical space tests for tools/3512 (floats on same page)} % \begin{macrocode} \endgraf\penalty -\LT@end@pen + \ifvoid\LT@foot\else + \global\advance\vsize\ht\LT@foot + \global\advance\@colroom\ht\LT@foot + \dimen@\pagegoal\advance\dimen@\ht\LT@foot\pagegoal\dimen@ + \fi % \end{macrocode} % Now close the group to return to the standard routine. % \begin{macrocode} @@ -1361,9 +1429,11 @@ % table.\footnote{This can not be the correct. However if it is omitted, % there is a problem with marginpars, for example on page~3 of this % document. Any Output Routine Gurus out there?} +% \changes{v4.14}{2020/02/07} +% {Rearrange vertical space tests for tools/3512 (floats on same page)} % \begin{macrocode} \global\@mparbottom\z@ - \pagegoal\vsize +% \pagegoal\vsize \endgraf\penalty\z@\addvspace\LTpost % \end{macrocode} % Footnotes. As done in the \package{multicol} package. @@ -1431,8 +1501,10 @@ % So use the following variant. Added in v3.14. % \changes{v3.14}{1995/04/25} % {More fun with \cs{ifnum} cf tools/1571} +% \changes{v4.15}{2021/04/21} +% {protected (gh/584)} % \begin{macrocode} -\def\LT@tabularcr{% +\protected\def\LT@tabularcr{% \relax\iffalse{\fi\ifnum0=`}\fi \@ifstar {\def\crcr{\LT@crcr\noalign{\nobreak}}\let\cr\crcr @@ -1452,6 +1524,8 @@ % \begin{macro}{\LT@setprevdepth} % \changes{v4.05}{1996/11/12} % {Macro added} +% \changes{v4.14}{2020/02/07} +% {spurious \cs{global} removed} % This will be redefined to set the "\prevdepth" % at the start of a chunk. % \begin{macrocode} @@ -1471,7 +1545,7 @@ \global\advance\LT@rows\@ne \ifnum\LT@rows=\LTchunksize \gdef\LT@setprevdepth{% - \prevdepth\z@\global + \prevdepth\z@ \global\let\LT@setprevdepth\relax}% \expandafter\LT@xtabularcr \else @@ -1528,11 +1602,13 @@ % \begin{macro}{\LT@echunk} % \changes{v4.05}{1996/11/12} % {\cs{unskip} added for pagebreak support} +% \changes{v4.14}{2020/02/07} +% {allocated global box (tools/2914)} % This ends the current chunk, and removes the dummy row. % \begin{macrocode} \def\LT@echunk{% \crcr\LT@save@row\cr\egroup - \global\setbox\@ne\lastbox + \global\setbox\LT@gbox\lastbox % \end{macrocode} % The following line was added in v4.05. % \package{longtable} relies on "\lineskip" glue (which is 0pt) to @@ -1753,9 +1829,11 @@ % Loop through the last row, discarding glue, and saving box widths. At % V3.04 changed the scratch box to 2, as the new "\kill" requires that % "\box0" be preserved. +% \changes{v4.14}{2020/02/07} +% {allocated global box (tools/2914)} % \begin{macrocode} \setbox\tw@\hbox{% - \unhbox\@ne + \unhbox\LT@gbox \let\LT@old@row\LT@save@row \global\let\LT@save@row\@empty \count@\LT@cols @@ -1892,13 +1970,15 @@ % {Call \cs{LT@makecaption} not \cs{LT@mkcaption}} % \changes{v3.14}{1995/05/24} % {Add new control argument} +% \changes{v4.16}{2021/05/07} +% {use \cs{ext@table} gh/561} % \begin{macrocode} \def\LT@c@ption#1[#2]#3{% \LT@makecaption#1\fnum@table{#3}% \def\@tempa{#2}% \ifx\@tempa\@empty\else {\let\\\space - \addcontentsline{lot}{table}{\protect\numberline{\thetable}{#2}}}% + \addcontentsline{\ext@table}{table}{\protect\numberline{\thetable}{#2}}}% \fi} % \end{macrocode} % \end{macro} @@ -1927,6 +2007,8 @@ % and modified to call \cs{@makecaption}} % \changes{v3.14}{1995/05/02} % {Use the first arg to remove counter for star form} +% \changes{v4.15}{2021/03/28} +% {\cs{reset@font} for gh/133} % \begin{macrocode} \def\LT@makecaption#1#2#3{% \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth{% @@ -1934,6 +2016,7 @@ % Based on article class "\@makecaption", "#1" is "\@gobble" in star % form, and "\@firstofone" otherwise. % \begin{macrocode} + \reset@font \sbox\@tempboxa{#1{#2: }#3}% \ifdim\wd\@tempboxa>\hsize #1{#2: }#3% @@ -1973,13 +2056,17 @@ % vsplit off a bit of the last chunk, so that the last page did not just % have head and foot sections, but it is hard to do this in a consistent % manner.} +% \changes{v4.14}{2020/02/07} +% {Rearrange vertical space tests for tools/3512 (floats on same page)} % \begin{macrocode} \dimen@\pagegoal + \advance\dimen@\ht\LT@foot \advance\dimen@-\ht\LT@lastfoot \ifdim\dimen@<\ht\z@ \setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}% \@makecol \@outputpage + \global\vsize\@colroom \setbox\z@\vbox{\box\LT@head}% % \end{macrocode} % End of "\ifdim\dimen@<\ht\@cclc". @@ -1993,14 +2080,17 @@ % Reset "\@colroom". % \changes{v3.14}{1995/05/02} % {Reset \cs{@colroom}, for tools/1584} +% \changes{v4.14}{2020/02/07} +% {Rearrange vertical space tests for tools/3512 (floats on same page)} % \begin{macrocode} - \global\@colroom\@colht - \global\vsize\@colht +% \global\@colroom\@colht +% \global\vsize\@colht % \end{macrocode} % Put the last page of the table on to the main vertical list. +% \changes{v4.14}{2020/02/07} +% {Remove box from final page tools/3512} % \begin{macrocode} - \vbox - {\unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi}% + \unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi % \end{macrocode} % End of "\ifnum\outputpenalty > -\LT@end@pen". % \begin{macrocode} @@ -2139,10 +2229,12 @@ % \end{macro} % % \begin{macro}{\LT@p@ftntext} +% \changes{v4.15}{2021/03/28} +% {make long for gh/364} % Inside the `p' column, just save up the footnote text in a token % register. % \begin{macrocode} -\def\LT@p@ftntext#1{% +\long\def\LT@p@ftntext#1{% \edef\@tempa{\the\LT@p@ftn\noexpand\footnotetext[\the\c@footnote]}% \global\LT@p@ftn\expandafter{\@tempa{#1}}}% % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tools/longtable.ins b/Master/texmf-dist/source/latex/tools/longtable.ins index 7ada121ea95..92a04e00d4e 100644 --- a/Master/texmf-dist/source/latex/tools/longtable.ins +++ b/Master/texmf-dist/source/latex/tools/longtable.ins @@ -3,8 +3,8 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file is part of the Standard LaTeX `Tools Bundle'. @@ -45,8 +45,8 @@ The source is maintained by the LaTeX Project team and bug reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 1993-2020 -The LaTeX3 Project and any individual authors listed elsewhere +Copyright (C) 1993-2021 +The LaTeX Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx index 39bccef2d78..1d16a01c158 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.dtx +++ b/Master/texmf-dist/source/latex/tools/multicol.dtx @@ -77,7 +77,7 @@ %% not for the payment of a license fee per se (which might or might %% not follow from this evaluation). %% -%% The license fee, if any, can be payed either to the LaTeX3 fund +%% The license fee, if any, can be payed either to the LaTeX fund %% (see ltx3info.txt in the base LaTeX distribution) or to the author of %% the program who can be contacted at %% diff --git a/Master/texmf-dist/source/latex/tools/multicol.ins b/Master/texmf-dist/source/latex/tools/multicol.ins index f872b83cdee..c8838f8be22 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.ins +++ b/Master/texmf-dist/source/latex/tools/multicol.ins @@ -3,8 +3,8 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file is part of the Standard LaTeX `Tools Bundle'. @@ -45,8 +45,8 @@ The source is maintained by the LaTeX Project team and bug reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 1993-2020 -The LaTeX3 Project and any individual authors listed elsewhere +Copyright (C) 1993-2021 +The LaTeX Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/rawfonts.dtx b/Master/texmf-dist/source/latex/tools/rawfonts.dtx index 9c5daa57a50..f54aeaf44db 100644 --- a/Master/texmf-dist/source/latex/tools/rawfonts.dtx +++ b/Master/texmf-dist/source/latex/tools/rawfonts.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/shellesc.dtx b/Master/texmf-dist/source/latex/tools/shellesc.dtx index 3b96c3e9ee3..54027cada76 100644 --- a/Master/texmf-dist/source/latex/tools/shellesc.dtx +++ b/Master/texmf-dist/source/latex/tools/shellesc.dtx @@ -1,8 +1,8 @@ % \iffalse %% Source File: shellesc.dtx -%% Copyright (C) 2015-2020 +%% Copyright (C) 2015-2021 %% -%% The LaTeX3 Project and any individual authors listed elsewhere +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file may be distributed under the terms of the LPPL. @@ -36,7 +36,7 @@ % \title{The \textsf{shellesc} Package\thanks{This file % has version number \fileversion, last % revised \filedate.}} -% \author{\LaTeX3 project} +% \author{\LaTeX\ project} % \date{\filedate} % % diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx index 59eb699ae81..3c9236f2ef4 100644 --- a/Master/texmf-dist/source/latex/tools/showkeys.dtx +++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. @@ -22,7 +22,7 @@ % \fi % \iffalse %% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle -%% File: showkeys.dtx Copyright (C) 2006-2019 David Carlisle, LaTeX3 Project +%% File: showkeys.dtx Copyright (C) 2006-2019 David Carlisle, LaTeX Project % %<*dtx> \ProvidesFile{showkeys.dtx} diff --git a/Master/texmf-dist/source/latex/tools/somedefs.dtx b/Master/texmf-dist/source/latex/tools/somedefs.dtx index 120ad980781..825a93ec666 100644 --- a/Master/texmf-dist/source/latex/tools/somedefs.dtx +++ b/Master/texmf-dist/source/latex/tools/somedefs.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx index 577730e665b..a0f75fc4fa6 100644 --- a/Master/texmf-dist/source/latex/tools/tabularx.dtx +++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/tabularx.ins b/Master/texmf-dist/source/latex/tools/tabularx.ins index 05effd3342e..a0d39c2564a 100644 --- a/Master/texmf-dist/source/latex/tools/tabularx.ins +++ b/Master/texmf-dist/source/latex/tools/tabularx.ins @@ -3,8 +3,8 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file is part of the Standard LaTeX `Tools Bundle'. @@ -45,8 +45,8 @@ The source is maintained by the LaTeX Project team and bug reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 1993-2020 -The LaTeX3 Project and any individual authors listed elsewhere +Copyright (C) 1993-2021 +The LaTeX Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/theorem.dtx b/Master/texmf-dist/source/latex/tools/theorem.dtx index 0df7dbb7649..8543ff9d7cb 100644 --- a/Master/texmf-dist/source/latex/tools/theorem.dtx +++ b/Master/texmf-dist/source/latex/tools/theorem.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/tools.ins b/Master/texmf-dist/source/latex/tools/tools.ins index 5e978712215..15c64ac80ab 100644 --- a/Master/texmf-dist/source/latex/tools/tools.ins +++ b/Master/texmf-dist/source/latex/tools/tools.ins @@ -3,8 +3,8 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file is part of the Standard LaTeX `Tools Bundle'. @@ -49,8 +49,8 @@ reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 1993-2020 -The LaTeX3 Project and any individual authors listed elsewhere +Copyright (C) 1993-2021 +The LaTeX Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/trace.dtx b/Master/texmf-dist/source/latex/tools/trace.dtx index 4a08f569bb5..d10243f690b 100644 --- a/Master/texmf-dist/source/latex/tools/trace.dtx +++ b/Master/texmf-dist/source/latex/tools/trace.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. @@ -33,7 +33,7 @@ %<driver>\ProvidesFile{trace.drv} % \fi % \ProvidesFile{trace.dtx} - [2018/10/13 v1.1e trace LaTeX code] + [2021/04/18 v1.1f trace LaTeX code] % % \iffalse %<*driver> @@ -343,7 +343,7 @@ % % \begin{macro}{\traceon} % This macro ensures that |\conditionally@traceoff| is actually -% turning off switches (since |\tracinall| might have disabled it) +% turning off switches (since |\tracingall| might have disabled it) % and then calls |\tr@ce@n| to setup tracing. % \begin{macrocode} \def\traceon{\let\conditionally@traceoff\unconditionally@traceoff @@ -470,6 +470,8 @@ % |\tr@ce@n|, however there is no point in resetting % |\tracinglostchars| so we leave it alone. % \changes{v1.1c}{2003/04/30}{Reset \cs{tracingstats} to one} +% \changes{v1.1f}{2021/04/18} +% {Add \cs{tracingstacklevels} and \cs{tracinglostchars}=3} % \begin{macrocode} % \tracingstats\@ne %% \tracinglostchars\z@ @@ -498,13 +500,14 @@ % on last (in fact like before we disassemble |\tracingall| % and reorder it partially). % \begin{macrocode} - \def\tr@ce@n{% - \@tracingtrue + \edef\tr@ce@n{% + \noexpand\@tracingtrue \tracingstats\tw@ \tracingpages\@ne - \tracinglostchars\@ne + \tracinglostchars\thr@@ \tracingparagraphs\@ne \errorcontextlines\maxdimen + \ifdefined\tracingstacklevels \tracingstacklevels\maxdimen \fi % \end{macrocode} % We only change |\tracingoutput| if it hasn't already been enabled by % |\showoutput|. If that's not the case, we set it to 2 so that we @@ -512,12 +515,12 @@ % \changes{v1.1e}{2018/10/13}{Only reset \cs{tracingoutput} if not % set by \cs{showoutput} earlier} % \begin{macrocode} - \ifnum\tracingoutput=\@ne - \else + \noexpand\ifnum\tracingoutput=\@ne + \noexpand\else \tracingoutput\tw@ \showboxbreadth\maxdimen \showboxdepth\maxdimen - \fi + \noexpand\fi % \end{macrocode} % % \begin{macrocode} @@ -543,8 +546,11 @@ % |@tracing| switch and always set the primitives back to zero. % \changes{v1.1c}{2003/04/30}{Turn off \cs{tracingoutput}} % \changes{v1.1c}{2003/04/30}{Reset \cs{tracingstats} to one} +% \changes{v1.1f}{2021/04/18}{Add missing reset of \cs{errorcontextlines}} +% \changes{v1.1f}{2021/04/18} +% {Add \cs{tracingstacklevels} and \cs{tracinglostchars}=3} % \begin{macrocode} - \def\conditionally@traceoff{% + \edef\conditionally@traceoff{% \tracingassigns\z@ \tracingrestores\z@ \tracingcommands\z@ @@ -557,15 +563,17 @@ % \changes{v1.1e}{2018/10/13}{Only reset \cs{tracingoutput} if not % set by \cs{showoutput} earlier} % \begin{macrocode} - \ifnum\tracingoutput=\tw@ + \noexpand\ifnum\tracingoutput=\tw@ \tracingoutput\z@ \showboxbreadth\m@ne \showboxdepth\m@ne - \fi + \noexpand\fi % \end{macrocode} % % \begin{macrocode} \tracingstats\@ne + \ifdefined\tracingstacklevels \tracingstacklevels\z@ \fi + \errorcontextlines\m@ne \tracingparagraphs\z@ \tracinggroups\z@ } diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx index 2bba60465e0..eac06580e73 100644 --- a/Master/texmf-dist/source/latex/tools/varioref.dtx +++ b/Master/texmf-dist/source/latex/tools/varioref.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/varioref.ins b/Master/texmf-dist/source/latex/tools/varioref.ins index 951eedad891..559f1f28542 100644 --- a/Master/texmf-dist/source/latex/tools/varioref.ins +++ b/Master/texmf-dist/source/latex/tools/varioref.ins @@ -3,8 +3,8 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file is part of the Standard LaTeX `Tools Bundle'. @@ -45,8 +45,8 @@ The source is maintained by the LaTeX Project team and bug reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 1993-2020 -The LaTeX3 Project and any individual authors listed elsewhere +Copyright (C) 1993-2021 +The LaTeX Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx index e62886e0033..fcbaf28172e 100644 --- a/Master/texmf-dist/source/latex/tools/verbatim.dtx +++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx index a963886cde7..c0d0b90c0fc 100644 --- a/Master/texmf-dist/source/latex/tools/xr.dtx +++ b/Master/texmf-dist/source/latex/tools/xr.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx index ebe8d0f9478..adcfe154da3 100644 --- a/Master/texmf-dist/source/latex/tools/xspace.dtx +++ b/Master/texmf-dist/source/latex/tools/xspace.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 +% Copyright (C) 1993-2021 % -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. |