From 17c7a9982754c99e891494680131de3d864ae09f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Dec 2018 23:27:20 +0000 Subject: arydshln (27dec18) git-svn-id: svn://tug.org/texlive/trunk@49521 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/arydshln/README | 6 +- .../texmf-dist/doc/latex/arydshln/arydshln-man.pdf | Bin 273441 -> 273178 bytes .../texmf-dist/doc/latex/arydshln/arydshln-man.tex | 2 +- Master/texmf-dist/doc/latex/arydshln/arydshln.pdf | Bin 623015 -> 625504 bytes .../texmf-dist/source/latex/arydshln/arydshln.dtx | 177 +++++++++++++++------ Master/texmf-dist/tex/latex/arydshln/arydshln.sty | 20 ++- 6 files changed, 145 insertions(+), 60 deletions(-) diff --git a/Master/texmf-dist/doc/latex/arydshln/README b/Master/texmf-dist/doc/latex/arydshln/README index f042ff4324d..e34683df4a4 100644 --- a/Master/texmf-dist/doc/latex/arydshln/README +++ b/Master/texmf-dist/doc/latex/arydshln/README @@ -1,4 +1,4 @@ -arydshln (v1.74): The package to draw dash-lines in array/tabular +arydshln (v1.75): The package to draw dash-lines in array/tabular [How to "make"] @@ -34,8 +34,8 @@ arydshln (v1.74): The package to draw dash-lines in array/tabular + Compatible with "array" (from v1.4), "colortab" (from v1.5), "longtable" (from v1.6) and "colortbl (from v1.7). -- Bugs found in v1.7 has been fixed in v1.71, v1.72, 1.73 and v1.74 (this - version). +- Bugs found in v1.7 has been fixed in the successive versions from v1.71 to + v1.74 (this version). Enjoy! diff --git a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf index 26d22f106d7..6c8ac831604 100644 Binary files a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf and b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf differ diff --git a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex index 1e3a10aad04..47c2b11361a 100644 --- a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex +++ b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex @@ -46,7 +46,7 @@ %% %% \ProvidesFile{arydshln-man.tex} -[2018/09/26 v1.74 ] +[2018/12/26 v1.75 ] \documentclass{ltxdoc} \usepackage{arydshln} \DisableCrossrefs diff --git a/Master/texmf-dist/doc/latex/arydshln/arydshln.pdf b/Master/texmf-dist/doc/latex/arydshln/arydshln.pdf index 1133e60981f..acb08569590 100644 Binary files a/Master/texmf-dist/doc/latex/arydshln/arydshln.pdf and b/Master/texmf-dist/doc/latex/arydshln/arydshln.pdf differ diff --git a/Master/texmf-dist/source/latex/arydshln/arydshln.dtx b/Master/texmf-dist/source/latex/arydshln/arydshln.dtx index 3f758f4f130..1372808d2b1 100644 --- a/Master/texmf-dist/source/latex/arydshln/arydshln.dtx +++ b/Master/texmf-dist/source/latex/arydshln/arydshln.dtx @@ -9,7 +9,7 @@ %% version 1 of the License, or any later version. % \fi % -%\CheckSum{3648} +%\CheckSum{3685} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -39,7 +39,7 @@ %\ProvidesFile{arydshln-man.tex} % \fi % \ProvidesFile{arydshln.dtx} -[2018/09/26 v1.74 ] +[2018/12/26 v1.75 ] % % \iffalse %<*driver> @@ -334,6 +334,10 @@ % \changes{v1.74}{2018/09/26} % {The following are to fix the bug in the \textsf{array}-compatible % mechanism by which \textsf{delarray} did not work well.} +% \changes{v1.75}{2018/12/26} +% {The following are to cope with the change in \textsf{array} v2.4i +% or later in which \cs{@startpbox} and \cs{@endpbox} have +% \cs{color@begingroup} and \cs{color@endgroup}, respectively.} % % % % @@ -1044,6 +1048,8 @@ % {Thank to Ma\"ieul Rouquette again.} % \changes{v1.74}{2018/09/26} % {Thank to Hironobu Yamashita.} +% \changes{v1.74}{2018/09/26} +% {Thank to Hironobu Yamashita for coloring problem.} % % The author thanks to Monty Hayes who gave the author the opportunity to % make this style, and Weimin Zhang and Takahiro Kubota who pointed out bugs @@ -1070,13 +1076,14 @@ % horizontal and vertical (dash-)lines which has hidden for 23 years (!!!!) % since the very first version of the package; and Hironobu Yamashita who % pointed out bugs hidden for 19 years (!!!!!) by which \textsf{delarray} -% did not work. +% did not work, and a compatibility problem with \textsf{array} v2.4i and +% later. % % The base implementation of \texttt{array} and \texttt{tabular} % environments, part of which the author gives new definitions referring % original ones, are written by Leslie Lamport as a part of \LaTeX-2.09 and % \LaTeXe{} (1997/12/01) to which Johannes Braams and other authors also -% contributed. The author also refers \textsf{array} package (v2.4c) +% contributed. The author also refers \textsf{array} package (v2.4j) % written by Frank Mittelbach and David Carlisle; \textsf{colortab} package % (v0.9) written by Timothy van Zandt; and \textsf{longtable} (v4.10) and % \textsf{colortbl} (v0.1j) packages @@ -1767,6 +1774,9 @@ % \begin{macro}{\adl@org@@endpbox} % \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{@@endpbox}.} +% \begin{macro}{\adl@org@startpbox} +% \changes{v1.75}{2018/12/26} +% {Introduced to restore \cs{@startpbox}.} % \begin{macro}{\adl@org@endpbox} % \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{@endpbox}.} @@ -1780,7 +1790,8 @@ % main purpose of them is to nullify the modification when dash-line % functions are inactive, while |\adl@org@cline| is also referred to in its % modified version. -% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro} +% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro} +% \end{macro}\end{macro}\end{macro} % % \begin{macrocode} \let\adl@org@arrayclassz\@arrayclassz @@ -1788,6 +1799,7 @@ \let\adl@org@classz\@classz \let\adl@org@@startpbox\@@startpbox \let\adl@org@@endpbox\@@endpbox +\let\adl@org@startpbox\@startpbox \let\adl@org@endpbox\@endpbox \let\adl@org@cline\cline @@ -2038,6 +2050,8 @@ % % \changes{v1.54-2}{2003/08/25} % {Add \cs{adl@argcr} to inactivation.} +% \changes{v1.75}{2018/12/26} +% {Add \cs{@startpbox} to inactivation.} % % \begin{itemize}\item[] % \SpecialIndex{\@arrayclassz} @@ -2045,6 +2059,7 @@ % \SpecialIndex{\@classz} % \SpecialIndex{\@@startpbox} % \SpecialIndex{\@@endpbox} +% \SpecialIndex{\@startpbox} % \SpecialIndex{\@endpbox} % \SpecialIndex{\adl@cr} % \SpecialIndex{\adl@argcr} @@ -2054,23 +2069,21 @@ % |\@classz|\quad % |\@@startpbox|\quad % |\@@endpbox|\\ +% |\@startpbox|\quad % |\@endpbox|\quad % |\adl@cr|\quad % |\adl@argcr|\quad % |\adl@endarray| % \end{itemize} % -% Note that we have to inactivate both |\@@endpbox| for \LaTeX{} and -% |\@endpbox| for \textsf{array}, while |\@startpbox| for \textsf{array} is -% not necessary because it is unmodified. Also note that\break|\@classz| -% has to be |\let|-equal to |\adl@org@classz| only if \textsf{array} is in -% use, because \LaTeX{} does not define |\@classz| but refers to it which is -% either |\@arrayclassz| or |\@tabclassz|. Yet another remark is that we -% have to conceal |\cr| for |\adl@cr|\slash|\adl@argcr| and |\crcr| for -% |\adl@endarray| by bracing them from \TeX's |\halign| mechanism that -% searches them when an |array|\slash|tabular| has an nested -% |array|\slash|tabular|. This could be done by a tricky |\let|-assignment -% such as; +% Note that |\@classz| has to be |\let|-equal to |\adl@org@classz| only if +% \textsf{array} is in use, because \LaTeX{} does not define |\@classz| but +% refers to it which is either |\@arrayclassz| or |\@tabclassz|. Yet +% another remark is that we have to conceal |\cr| for +% |\adl@cr|\slash|\adl@argcr| and |\crcr| for |\adl@endarray| by bracing +% them from \TeX's |\halign| mechanism that searches them when an +% |array|\slash|tabular| has an nested |array|\slash|tabular|. This could +% be done by a tricky |\let|-assignment such as; % % \begin{quote} % |\iffalse{\let\adl@cr\cr \iffalse}\fi| @@ -2108,6 +2121,7 @@ % \SpecialIndex{\@classz} % \SpecialIndex{\@@startpbox} % \SpecialIndex{\@@endpbox} +% \SpecialIndex{\@startpbox} % \SpecialIndex{\@endpbox} % \SpecialIndex{\adl@cr} % \SpecialIndex{\adl@argcr} @@ -2124,6 +2138,7 @@ % \SpecialIndex{\adl@org@classz} % \SpecialIndex{\adl@org@@startpbox} % \SpecialIndex{\adl@org@@endpbox} +% \SpecialIndex{\adl@org@startpbox} % \SpecialIndex{\adl@org@endpbox} % \SpecialIndex{\adl@cr} % \SpecialIndex{\adl@argcr} @@ -2138,6 +2153,7 @@ \ifadl@usingarypkg \let\@classz\adl@org@classz \fi \let\@@startpbox\adl@org@@startpbox \let\@@endpbox\adl@org@@endpbox + \let\@startpbox\adl@org@startpbox \let\@endpbox\adl@org@endpbox \def\adl@cr{\cr}% \def\adl@argcr##1{\cr}% @@ -2154,6 +2170,8 @@ % \begin{macro}{\adl@activate} % \changes{v1.54-2}{2003/08/25} % {Introduced to activate \cs{@arrayclassz} etc.\ again.} +% \changes{v1.75}{2018/12/26} +% {Add \cs{@startpbox} to activation.} % % On the other hand, if |\ifadl@inactive| is false, the macro |\adl@activate| % is called from |\@array| to make inactivated macros active again in order @@ -2173,6 +2191,7 @@ % \SpecialIndex{\@classz} % \SpecialIndex{\@@startpbox} % \SpecialIndex{\@@endpbox} +% \SpecialIndex{\@startpbox} % \SpecialIndex{\@endpbox} % \SpecialIndex{\adl@cr} % \SpecialIndex{\adl@argcr} @@ -2189,6 +2208,7 @@ % \SpecialIndex{\adl@act@classz} % \SpecialIndex{\adl@act@@startpbox} % \SpecialIndex{\adl@act@@endpbox} +% \SpecialIndex{\adl@act@startpbox} % \SpecialIndex{\adl@act@endpbox} % \SpecialIndex{\adl@act@cr} % \SpecialIndex{\adl@act@argcr} @@ -2206,6 +2226,7 @@ \ifadl@usingarypkg \let\@classz\adl@act@classz \fi \let\@@startpbox\adl@act@@startpbox \let\@@endpbox\adl@act@@endpbox + \let\@startpbox\adl@act@startpbox \let\@endpbox\adl@act@endpbox \let\adl@cr\adl@act@cr \let\adl@argcr\adl@act@argcr @@ -2930,51 +2951,85 @@ % % \begin{macro}{\@@startpbox} % \begin{macro}{\@@endpbox} +% \begin{macro}{\@startpbox} +% \changes{v1.75}{2018/12/26} +% {Introduced to cope with the \cs{color@begingroup}\slash +% \cs{color@endgroup} problem.} % \begin{macro}{\@endpbox} % \changes{v1.4-2-1}{1999/06/25} % {Introduced because \textsf{array} uses it.} +% \changes{v1.75}{2018/12/26} +% {Modified to ensure that the macro has \cs{color@endgroup} +% irrespective of \textsf{array}'s version.} % \begin{macro}{\adl@startmbox} % \changes{v1.71}{2004/08/31} % {Introduced to the bug fix of \textsf{array}'s \texttt{m}-columns.} +% \changes{v1.75}{2018/12/26} +% {Replace \cs{@startpbox} with \cs{adl@org@startpbox} to avoid the +% color-grouping problem.} % \begin{macro}{\adl@endmbox} % \changes{v1.71}{2004/08/31} % {Introduced to the bug fix of \textsf{array}'s \texttt{m}-columns.} % \SpecialIndex{\@finalstrut} -% \SpecialIndex{\@startpbox} +% \SpecialIndex{\color@begingroup} +% \SpecialIndex{\color@endgroup} % \SpecialIndex{\adl@box} % \SpecialIndex{\adl@colhtdp} % -% The macros to make |\parbox| for `|p|' (and `|b|' of -% \textsf{array}), |\@@startpbox| and \hbox{|\@@endpbox|}, are modified for -% height\slash depth measurement. The code for |\@@endpbox| is based on -% that of \LaTeXe{} to fix the bug of |\strut|-ing in \LaTeX-2.09, but -% |\@finalstrut| is manually expanded because it is not available in -% \LaTeX-2.09. -% -% In \textsf{array}, |\@@endpbox| is not used but |\@endpbox| is. -% Therefore, we |\let| them be equal. As for |\@startpbox|, however, we may -% not worry about it because we have modified \hbox{|\@classz|} in -% \S\ref{sec:imp-pream} for the measurement. However, we have to take care -% of |m|-type columns specially because its body |\vcenter| cannot be -% assigned directly to |\adl@box| by |\setbox|\footnote{ +% The macros to make |\parbox| for `|p|', |\@@startpbox| and +% \hbox{|\@@endpbox|}, are modified for height\slash depth measurement. The +% code for |\@@endpbox| is based on that of \LaTeXe{} to fix the bug of +% |\strut|-ing in \LaTeX-2.09, but |\@finalstrut| is manually expanded +% because it is not available in \LaTeX-2.09. +% +% In \textsf{array}, these two macros are not used but |\@startpbox| and +% |\@endpbox| are. Until v2.4h, the former may be untouched and the latter +% can be |\let|-equal to |\@@endpbox|. However in v2.4i, |\color@begingroup| +% and |\color@endgroup| are added to them to make the compatibility issue a +% little bit complicated. That is, our version of |\@endpbox| would have to +% have |\color@endgroup| if and only if \textsf{array} is v2.4i or later +% because |\@startpbox| has |\color@begingroup| in these versions, if we +% relied on the original |\@startpbox|. To avoid version dependent coding, +% we copy the new definitiopn of |\@starpbox| to ensure it has +% |\color@begingroup| and let our own |\@endpbox| with height\slash depth +% measurement have |\color@endgroup| irrespective of the version of +% \textsf{array}. Note that the assigning the box having |'p'| or |'b'| to +% |\adl@box| for the measurement is done in our own |\@classz| shown in +% \S\ref{sec:imp-pream}. +% +% As for |m|-type columns, we need a special care because its body +% |\vcenter| cannot be assigned directly to |\adl@box| by +% |\setbox|\footnote{ % % The author had forgotten this fact until Morten H\o gholm pointed out it. % Thanks Morten.}. % % Thus we enclose a |$\vcenter{|\ldots|}$| construct in a |\hbox| and assign -% it to |\adl@box|. The macro |\adl@startmbox| opens the construct with -% \textsf{array}'s |\@startpbox|, while |\adl@endmbox| closes it calling -% |\adl@org@endpbox| which is the unmodified |\@endpbox| of \textsf{array} -% and measures the height and depth of the |\hbox| by |\adl@colhtdp|. -% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro} +% it to |\adl@box|. The construct is opened and closed by the macros +% |\adl@startmbox| and |\adl@endmbox| with |\adl@org@startpbox| and +% |\adl@org@endpbox|, being unmodified |\@startpbox| and |\@endpbox| of +% \textsf{array} to avoid the version dependent color-grouping problem, and +% then the latter measures the height and depth of the |\hbox| by +% |\adl@colhtdp|. Note that the mechanism with |\vcenter| was replaced with +% a vertical shift of a box for '|m|' in v2.4f of \textsf{array}, but we +% stick the old mechanism to avoid version dependent coding. +% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro} % % \begin{macrocode} \def\@@startpbox#1{\setbox\adl@box\vtop\bgroup \hsize#1\@arrayparboxrestore} \def\@@endpbox{\unskip \ifhmode \nobreak \vrule\@width\z@\@height\z@\@depth\dp\@arstrutbox \fi \par \egroup \adl@colhtdp \box\adl@box \hfil} -\let\@endpbox\@@endpbox -\def\adl@startmbox{\bgroup $\vcenter\@startpbox} +\def\@startpbox#1{\bgroup + \color@begingroup + \setlength\hsize{#1}\@arrayparboxrestore + \everypar{% + \vrule \@height \ht\@arstrutbox \@width \z@ + \everypar{}}% +} +\def\@endpbox{\@finalstrut\@arstrutbox \color@endgroup \egroup + \adl@colhtdp \box\adl@box \hfil} +\def\adl@startmbox{\bgroup $\vcenter\adl@org@startpbox} \def\adl@endmbox{\adl@org@endpbox $\egroup \adl@colhtdp \box\adl@box \hfil} %%^L @@ -4578,6 +4633,9 @@ % \begin{macro}{\adl@act@classz} % \begin{macro}{\adl@act@@startpbox} % \begin{macro}{\adl@act@@endpbox} +% \begin{macro}{\adl@act@startpbox} +% \changes{v1.75}{2018/12/26} +% {Introduced because \cs{@startpbox} may be different from the original.} % \begin{macro}{\adl@act@endpbox} % \begin{macro}{\adl@act@cr} % \begin{macro}{\adl@act@argcr} @@ -4615,6 +4673,7 @@ % \end{macro}\end{macro}\end{macro}\end{macro}\end{macro} % \end{macro}\end{macro}\end{macro}\end{macro}\end{macro} % \end{macro}\end{macro}\end{macro}\end{macro}\end{macro} +% \end{macro} % % \begin{macrocode} \let\adl@act@arrayclassz\@arrayclassz @@ -4622,6 +4681,7 @@ \ifadl@usingarypkg \let\adl@act@classz\@classz \fi \let\adl@act@@startpbox\@@startpbox \let\adl@act@@endpbox\@@endpbox +\let\adl@act@startpbox\@startpbox \let\adl@act@endpbox\@endpbox \let\adl@act@cr\adl@cr \let\adl@act@argcr\adl@argcr @@ -4874,6 +4934,9 @@ % {Modified to add \cs{let}-assignments to \cs{adl@@endmbox} and % \cs{adl@endbmox} so that footnotes are correclty processed at the % closing of a \texttt{m}-type column.} +% \changes{v1.75}{2018/12/26} +% {Add description that \cs{adl@LTendpbox} is common for \cs{@endpbox} +% and \cs{@@endpbox}.} %  % The macro |\LT@make@row| is redefined for additional initialization which % must be done after the original |\LT@array| performs its own @@ -4886,12 +4949,13 @@ % Note that |\@@startpbox| and |\@statpbox| are |\let|-equal to our own % |\adl@LTstartpbox| if \textsf{array} is not in use because with % \textsf{array} opening a |p|-box is not done by |\@startpbox| but is -% embedded in |\@preamble|. Also note that we need |\adl@LTendmbox| to -% close |m|-boxes through our own closing macro |\adl@endmbox|, whose -% definition is kept in |\adl@@endmbox|, for \textsf{longtable}-specific -% operations for footnotes. Finally, the original version -% |\adl@org@LT@make@row| is called. -% \end{macro}\end{macro} +% embedded in |\@preamble|. Also note that |\@@endpbox| and |\@endpbox| are +% commonly |\let|-equal to |\adl@LTendpbox| because |\LT@startpbox| does not +% have |\color@begingroup| even with \textsf{array}. Yet another remark is +% that we need |\adl@LTendmbox| to close |m|-boxes through our own closing +% macro |\adl@endmbox|, whose definition is kept in |\adl@@endmbox|, for +% \textsf{longtable}-specific operations for footnotes. Finally, the +% original version |\adl@org@LT@make@row| is called. \end{macro}\end{macro} % % \begin{macrocode} \let\adl@org@LT@make@row\LT@make@row @@ -5245,6 +5309,9 @@ % % \begin{macro}{\adl@LTstartpbox} % \begin{macro}{\adl@LTendpbox} +% \changes{v1.75}{2018/12/26} +% {Add description that the macro is used for both of \cs{@endpbox} +% and \cs{@@endpbox}.} % \begin{macro}{\adl@LTendmbox} % \changes{v1.72-1}{2016/03/19} % {Added to process footnotes in \texttt{m}-type columns appropriately.} @@ -5266,13 +5333,17 @@ % |\@startpbox|${}={}$|\LT@startpbox|, unnecessitating our own version of % opening macros. % -% On the other hand, the closing macro |\adl@LTendpbox| for |p|(or +% On the other hand, the closing macro |\adl@LTendpbox| for |p| (or % |d|)-boxes is |\let|-equal to |\@endpbox| and |\@@endpbox| for the cases % with\slash without \textsf{array}, and performs the footnote operations -% after doing our own ones by |\adl@act@@endpbox|. Similarly, -% |\adl@LTendmbox| for |m|-boxes is |\let|-equal to |\adl@endmbox| and -% performs our own operations by |\adl@@endmbox| in which the originnal -% definition of |\adl@enmbox| is kept. +% after doing our own ones by |\adl@act@@endpbox|. Note that +% |\LT@startpbox| does not have |\color@begingroup| so far and thus this +% macro without |\color@endgroup| is common for the cases with and without +% \textsf{array}. +% +% Similarly, |\adl@LTendmbox| for |m|-boxes is |\let|-equal to +% |\adl@endmbox| and performs our own operations by |\adl@@endmbox| in which +% the originnal definition of |\adl@enmbox| is kept. % \end{macro}\end{macro}\end{macro} % % \begin{macrocode} @@ -5809,6 +5880,8 @@ % \begin{macro}{\adl@org@activate} % \begin{macro}{\adl@inactivate} % \begin{macro}{\adl@activate} +% \changes{v1.75}{2018/12/26} +% {Add inactivation of \cs{@startpbox}.} % \begin{macro}{\CT@setup} % \begin{macro}{\@endpbox} % Then we redefine |\adl@inactivate| and |\adl@activate| referring their @@ -5816,9 +5889,9 @@ % they make |\CT@setup| |\let|-equal to its original version |\adl@CT@setup| % if |\ADLinactivate| is in effect, or to our own version % |\adl@act@CT@setup| which will be defined soon. New |\adl@activate| also -% {\em inactivates} \hbox{|\@endpbox|} because our own one for column -% height\slash -% depth measuremnt is inappropriate with \textsf{colortbl} as explained soon. +% {\em inactivates} \hbox{|\@startpbox|} and \hbox{|\@endpbox|} because our +% own ones for column height\slash depth measuremnt is inappropriate with +% \textsf{colortbl} as explained soon. % \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro} % % \begin{macrocode} @@ -5826,7 +5899,7 @@ \let\adl@org@activate\adl@activate \def\adl@inactivate{\adl@org@inactivate \let\CT@setup\adl@CT@setup} \def\adl@activate{\adl@org@activate \let\CT@setup\adl@act@CT@setup - \let\@endpbox\adl@org@endpbox} + \let\@startpbox\adl@org@startpbox \let\@endpbox\adl@org@endpbox} % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/arydshln/arydshln.sty b/Master/texmf-dist/tex/latex/arydshln/arydshln.sty index 9b8999fcb5c..08300466c32 100644 --- a/Master/texmf-dist/tex/latex/arydshln/arydshln.sty +++ b/Master/texmf-dist/tex/latex/arydshln/arydshln.sty @@ -50,7 +50,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{arydshln}} \else\def\next[#1]{}\fi\next -[2018/09/26 v1.74 ] +[2018/12/26 v1.75 ] %% Register Declaration \newdimen\dashlinedash \dashlinedash4pt % @@ -94,6 +94,7 @@ \let\adl@org@classz\@classz \let\adl@org@@startpbox\@@startpbox \let\adl@org@@endpbox\@@endpbox +\let\adl@org@startpbox\@startpbox \let\adl@org@endpbox\@endpbox \let\adl@org@cline\cline @@ -132,6 +133,7 @@ \ifadl@usingarypkg \let\@classz\adl@org@classz \fi \let\@@startpbox\adl@org@@startpbox \let\@@endpbox\adl@org@@endpbox + \let\@startpbox\adl@org@startpbox \let\@endpbox\adl@org@endpbox \def\adl@cr{\cr}% \def\adl@argcr##1{\cr}% @@ -149,6 +151,7 @@ \ifadl@usingarypkg \let\@classz\adl@act@classz \fi \let\@@startpbox\adl@act@@startpbox \let\@@endpbox\adl@act@@endpbox + \let\@startpbox\adl@act@startpbox \let\@endpbox\adl@act@endpbox \let\adl@cr\adl@act@cr \let\adl@argcr\adl@act@argcr @@ -322,8 +325,16 @@ \def\@@endpbox{\unskip \ifhmode \nobreak \vrule\@width\z@\@height\z@\@depth\dp\@arstrutbox \fi \par \egroup \adl@colhtdp \box\adl@box \hfil} -\let\@endpbox\@@endpbox -\def\adl@startmbox{\bgroup $\vcenter\@startpbox} +\def\@startpbox#1{\bgroup + \color@begingroup + \setlength\hsize{#1}\@arrayparboxrestore + \everypar{% + \vrule \@height \ht\@arstrutbox \@width \z@ + \everypar{}}% +} +\def\@endpbox{\@finalstrut\@arstrutbox \color@endgroup \egroup + \adl@colhtdp \box\adl@box \hfil} +\def\adl@startmbox{\bgroup $\vcenter\adl@org@startpbox} \def\adl@endmbox{\adl@org@endpbox $\egroup \adl@colhtdp \box\adl@box \hfil} %%^L @@ -732,6 +743,7 @@ \ifadl@usingarypkg \let\adl@act@classz\@classz \fi \let\adl@act@@startpbox\@@startpbox \let\adl@act@@endpbox\@@endpbox +\let\adl@act@startpbox\@startpbox \let\adl@act@endpbox\@endpbox \let\adl@act@cr\adl@cr \let\adl@act@argcr\adl@argcr @@ -1040,7 +1052,7 @@ \let\adl@org@activate\adl@activate \def\adl@inactivate{\adl@org@inactivate \let\CT@setup\adl@CT@setup} \def\adl@activate{\adl@org@activate \let\CT@setup\adl@act@CT@setup - \let\@endpbox\adl@org@endpbox} + \let\@startpbox\adl@org@startpbox \let\@endpbox\adl@org@endpbox} \let\adl@CT@setup\CT@setup \def\CT@setup{\adl@CT@setup -- cgit v1.2.3