summaryrefslogtreecommitdiff
path: root/macros/latex-dev/base/lttab.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex-dev/base/lttab.dtx')
-rw-r--r--macros/latex-dev/base/lttab.dtx84
1 files changed, 53 insertions, 31 deletions
diff --git a/macros/latex-dev/base/lttab.dtx b/macros/latex-dev/base/lttab.dtx
index 54bffa5974..646015daf3 100644
--- a/macros/latex-dev/base/lttab.dtx
+++ b/macros/latex-dev/base/lttab.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2018
+% Copyright (C) 1993-2019
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -13,7 +13,7 @@
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
+% version 2008 or later.
%
% This file has the LPPL maintenance status "maintained".
%
@@ -31,7 +31,7 @@
%%% From File: lttab.dtx
%<*driver>
% \fi
-\ProvidesFile{lttab.dtx}[2018/12/30 v1.1p LaTeX Kernel (Columns)]
+\ProvidesFile{lttab.dtx}[2019/08/27 v1.1p LaTeX Kernel (Columns)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{lttab.dtx}
@@ -84,8 +84,9 @@
% \changes{v1.0c}{1994/05/07}{Removed surplus braces from
% \cs{@ifnextchar} constructs}
% \changes{v1.0f}{1994/05/21}{Use new error commands}
-% \changes{v1.0j}{1994/11/17}
-% {\cs{@tempa} to \cs{reserved@a}}
+% \changes{v1.0j}{1994/11/17}{\cs{@tempa} to \cs{reserved@a}}
+% \changes{v1.1q}{2019/08/27}{Remove several unnecessary \cs{gdef} definitions}
+% \changes{v1.1q}{2019/08/27}{Make various commands robust}
%
% \subsection{tabbing}
%
@@ -386,7 +387,7 @@
% a local variable). That this is allowed is a fundamental design
% flaw which is not going to be corrected now.
% \begin{macrocode}
-\gdef\@startline{%
+\def\@startline{%
\ifnum \@nxttabmar >\@hightab
\@badtab
\global\@nxttabmar \@hightab
@@ -401,7 +402,7 @@
%
% \begin{macro}{\@stopline}
% \begin{macrocode}
-\gdef\@stopline{%
+\def\@stopline{%
\unskip
\@stopfield
\if@rjfield
@@ -424,7 +425,7 @@
% \changes{v1.0d}{1994/05/13}
% {Colour support}
% \begin{macrocode}
-\gdef\@startfield{%
+\def\@startfield{%
\global\setbox\@curfield\hbox\bgroup\color@begingroup}
% \end{macrocode}
% \end{macro}
@@ -433,7 +434,7 @@
% \changes{v1.0d}{1994/05/13}
% {Colour support}
% \begin{macrocode}
-\gdef\@stopfield{%
+\def\@stopfield{%
\color@endgroup\egroup}
% \end{macrocode}
% \end{macro}
@@ -442,7 +443,7 @@
% \changes{v1.0d}{1994/05/13}
% {Colour support}
% \begin{macrocode}
-\gdef\@contfield{%
+\def\@contfield{%
\global\setbox\@curfield\hbox\bgroup\color@begingroup
\unhbox\@curfield}
% \end{macrocode}
@@ -450,38 +451,34 @@
%
% \begin{macro}{\@addfield}
% \begin{macrocode}
-\gdef\@addfield{\global\setbox\@curline\hbox{\unhbox
+\def\@addfield{\global\setbox\@curline\hbox{\unhbox
\@curline\unhbox\@curfield}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@ifatmargin}
% \begin{macrocode}
-\gdef\@ifatmargin{\ifdim \wd\@curline =\z@}
+\def\@ifatmargin{\ifdim \wd\@curline =\z@}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@tabcr}
% \begin{macrocode}
-\gdef\@tabcr{\@stopline \@ifstar{\penalty \@M \@xtabcr}\@xtabcr}
+\def\@tabcr{\@stopline \@ifstar{\penalty \@M \@xtabcr}\@xtabcr}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@xtabcr}
% \begin{macrocode}
-\gdef\@xtabcr{\@ifnextchar[\@itabcr{\@startline\ignorespaces}}
+\def\@xtabcr{\@ifnextchar[\@itabcr{\@startline\ignorespaces}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@itabcr}
% \begin{macrocode}
-\gdef\@itabcr[#1]{\vskip #1\@startline\ignorespaces}
+\def\@itabcr[#1]{\vskip #1\@startline\ignorespaces}
% \end{macrocode}
%
-% \begin{macrocode}
-\gdef\kill{\@stopfield\@startline\ignorespaces}
-% \end{macrocode}
-% \end{macro}
%
% \begin{macro}{\tabbing}
% \changes{v1.1f}{1995/10/23}{(CAR)Make \cs{@hightab} consistently a
@@ -489,7 +486,7 @@
% \changes{latex2e}{1993/12/13}{Removed optional argument of \cs{item}}
% We use |\relax| to prevent |\item| from scanning too far.
% \begin{macrocode}
-\gdef\tabbing{\lineskip \z@skip\let\>\@rtab\let\<\@ltab\let\=\@settab
+\def\tabbing{\lineskip \z@skip\let\>\@rtab\let\<\@ltab\let\=\@settab
\let\+\@tabplus\let\-\@tabminus\let\`\@tabrj\let\'\@tablab
\let\\=\@tabcr
\@hightab\@firsttab
@@ -512,7 +509,7 @@
%
% \begin{macro}{\endtabbing}
% \begin{macrocode}
-\gdef\endtabbing{%
+\def\endtabbing{%
\@stopline\ifnum\@tabpush >\z@ \@badpoptabs \fi\endtrivlist}
% \end{macrocode}
% \end{macro}
@@ -520,7 +517,7 @@
% \begin{macro}{\@rtab}
% Omitted |\global| added to |\@rtab| 17 Jun 86
% \begin{macrocode}
-\gdef\@rtab{\@stopfield\@addfield\ifnum \@curtab<\@hightab
+\def\@rtab{\@stopfield\@addfield\ifnum \@curtab<\@hightab
\global\advance\@curtab \@ne \else\@badtab\fi
\@tempdima\dimen\@curtab
\advance\@tempdima -\dimen\@curtabmar
@@ -534,7 +531,7 @@
% \changes{v1.1f}{1995/10/23}{(CAR)Ensure that \cs{@hightab} increases
% by at most one}
% \begin{macrocode}
-\gdef\@settab{\@stopfield\@addfield
+\def\@settab{\@stopfield\@addfield
\ifnum \@curtab <\@maxtab
\ifnum\@curtab =\@hightab
\advance\@hightab \@ne
@@ -552,7 +549,7 @@
%
% \begin{macro}{\@ltab}
% \begin{macrocode}
-\gdef\@ltab{\@ifatmargin\ifnum\@curtabmar >\@firsttab
+\def\@ltab{\@ifatmargin\ifnum\@curtabmar >\@firsttab
\global\advance\@curtab \m@ne \global\advance\@curtabmar\m@ne\else
\@badtab\fi\else
\@latex@error{\string\<\space in mid line}\@ehd\fi\ignorespaces}
@@ -561,7 +558,7 @@
%
% \begin{macro}{\@tabplus}
% \begin{macrocode}
-\gdef\@tabplus{%
+\def\@tabplus{%
\ifnum\@nxttabmar<\@hightab
\global\advance\@nxttabmar\@ne
\else
@@ -573,7 +570,7 @@
%
% \begin{macro}{\@tabminus}
% \begin{macrocode}
-\gdef\@tabminus{%
+\def\@tabminus{%
\ifnum\@nxttabmar>\@firsttab
\global\advance\@nxttabmar\m@ne
\else
@@ -585,7 +582,7 @@
%
% \begin{macro}{\@tabrj}
% \begin{macrocode}
-\gdef\@tabrj{%
+\def\@tabrj{%
\@stopfield\@addfield\global\@rjfieldtrue\@startfield\ignorespaces}
% \end{macrocode}
% \end{macro}
@@ -593,7 +590,7 @@
% \begin{macro}{\@tablab}
% |\setbox\@curline| made |\global| in |\@tablab|. 17 Jun 86
% \begin{macrocode}
-\gdef\@tablab{%
+\def\@tablab{%
\@stopfield
\global\setbox\@curline\hbox{%
\box\@curline
@@ -605,9 +602,16 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2019/10/01}%
+%<latexrelease> {\pushtabs}{Make commands robust}%
+% \end{macrocode}
+%
% \begin{macro}{\pushtabs}
% \begin{macrocode}
-\gdef\pushtabs{%
+\DeclareRobustCommand\pushtabs{%
\@stopfield\@addfield\global\advance\@tabpush \@ne \begingroup
\@contfield}
% \end{macrocode}
@@ -621,7 +625,7 @@
% a local variable). That this is allowed is a fundamental design
% flaw which is not going to be corrected now.
% \begin{macrocode}
-\gdef\poptabs{\@stopfield\@addfield
+\DeclareRobustCommand\poptabs{\@stopfield\@addfield
\ifnum \@tabpush >\z@
\endgroup
\global\advance\@tabpush \m@ne
@@ -636,7 +640,25 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macrocode}
+\DeclareRobustCommand\kill{\@stopfield\@startline\ignorespaces}
+% \end{macrocode}
+% \end{macro}
%
+% \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\pushtabs}{Make commands robust}%
+%<latexrelease>
+%<latexrelease>\kernel@make@fragile\pushtabs
+%<latexrelease>\kernel@make@fragile\poptabs
+%<latexrelease>\kernel@make@fragile\kill
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
+% \end{macrocode}
+%
% \begin{macro}{\tabbingsep}
% \begin{macrocode}
\newdimen\tabbingsep
@@ -785,7 +807,7 @@
%
% \begin{macro}{\extracolsep}
% \begin{macrocode}
-\def\extracolsep#1{\tabskip #1\relax}
+\DeclareRobustCommand\extracolsep[1]{\tabskip #1\relax}
% \end{macrocode}
% \end{macro}
%