arydshln (22feb19)

git-svn-id: svn://tug.org/texlive/trunk@50084 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 118 insertions, 67 deletions

diff --git a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf
index 6c8ac831604..163525d1a75 100644
--- a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf
+++ b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf
diff --git a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex
index 47c2b11361a..ce48ec65664 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/12/26 v1.75 ]
+[2019/02/21 v1.76 ]
 \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 acb08569590..593f12ed07a 100644
--- a/Master/texmf-dist/doc/latex/arydshln/arydshln.pdf
+++ b/Master/texmf-dist/doc/latex/arydshln/arydshln.pdf
diff --git a/Master/texmf-dist/source/latex/arydshln/arydshln.dtx b/Master/texmf-dist/source/latex/arydshln/arydshln.dtx
index 1372808d2b1..b574487cf6c 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{3685}
+%\CheckSum{3697}
 %% \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 @@
 %<driver>\ProvidesFile{arydshln-man.tex}
 % \fi
 % \ProvidesFile{arydshln.dtx}
-[2018/12/26 v1.75 ]
+[2019/02/21 v1.76 ]
 %
 % \iffalse
 %<*driver>
@@ -337,8 +337,13 @@
 % \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.}
-% % 
+%	 \cs{color@begingroup} and \cs{color@endgroup}, respectively.}
+% \changes{v1.76}{2019/02/21}
+% 	{The following are to cope with the change in \textsf{longtable}
+%	 bundled in \textsf{latex-tools} 2019-01-05 or later in which
+%	 \cs{LT@startpbox} and \cs{LT@endpbox} have
+%	 \cs{color@begingroup} and \cs{color@endgroup}, respectively.}
+%
 % 
 %
 % \def\EXCLAMATION{\texttt{!}}
@@ -1076,8 +1081,8 @@
 % 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, and a compatibility problem with \textsf{array} v2.4i and
-% later.
+% did not work, and compatibility problems with \textsf{array} v2.4i and
+% \textsf{longtable} in \textsf{latex-tools} 2019-01-05.
 %
 % The base implementation of \texttt{array} and \texttt{tabular}
 % environments, part of which the author gives new definitions referring
@@ -1085,7 +1090,7 @@
 % \LaTeXe{} (1997/12/01) to which Johannes Braams and other authors also
 % 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
+% (v0.9) written by Timothy van Zandt; and \textsf{longtable} (v4.11) and
 % \textsf{colortbl} (v0.1j) packages
 % written by David Carlisle; to make the style compatible with those
 % packages.
@@ -2967,14 +2972,22 @@
 % \changes{v1.75}{2018/12/26}
 %	{Replace \cs{@startpbox} with \cs{adl@org@startpbox} to avoid the
 %	 color-grouping problem.}
+% \changes{v1.76}{2019/02/21}
+%	{Replace \cs{adl@org@startpbox} with \cs{@startpbox} to do
+%	 color-grouping always and to invoke \cs{adl@LTstartpbox} through
+%	 \cs{@stratpbox} when \textsf{longtable} is in use.}
 % \begin{macro}{\adl@endmbox}
 % \changes{v1.71}{2004/08/31}
 %	{Introduced to the bug fix of \textsf{array}'s \texttt{m}-columns.}
+% \changes{v1.76}{2019/02/21}
+%	{Replace \cs{adl@org@endpbox} with what \cs{@endpbox} of
+%	 \textsf{array} has to perform color-grouping always.}
 % \SpecialIndex{\@finalstrut}
 % \SpecialIndex{\color@begingroup}
 % \SpecialIndex{\color@endgroup}
 % \SpecialIndex{\adl@box}
 % \SpecialIndex{\adl@colhtdp}
+% \SpecialIndex{\adl@LTstartpbox}
 %

 % The macros to make |\parbox| for `|p|', |\@@startpbox| and
 % \hbox{|\@@endpbox|}, are modified for height\slash depth measurement.  The
@@ -2990,7 +3003,7 @@
 % 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
+% we copy the new definition 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
@@ -3006,13 +3019,16 @@
 %

 % Thus we enclose a |$\vcenter{|\ldots|}$| construct in a |\hbox| and assign
 % 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.
+% |\adl@startmbox| and |\adl@endmbox| with |\@startpbox| and what
+% |\@endpbox| of \textsf{array} 2.4j has, in order to perform color-grouping
+% regardless of the version of \textsf{array}.  The latter macro also has
+% our own function to measure the height and depth of the |\hbox| by
+% |\adl@colhtdp|.  Note that |\@startpbox| in |\adl@startmbox| can be
+% different from the definition made here and, more specifically, will be
+% |\adl@LTstartpbox| when \textsf{longtable} is in use.  Also noote 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}
@@ -3024,13 +3040,14 @@
         \color@begingroup
         \setlength\hsize{#1}\@arrayparboxrestore
         \everypar{%
-                \vrule \@height \ht\@arstrutbox \@width \z@
+                \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}
+\def\adl@startmbox{\bgroup $\vcenter\@startpbox}
+\def\adl@endmbox{\@finalstrut\@arstrutbox \color@endgroup \egroup
+        $\egroup \adl@colhtdp \box\adl@box \hfil}
 
 %%^L
 %    \end{macrocode}
@@ -4920,6 +4937,7 @@
 % \SpecialIndex{\adl@ncol}
 % \SpecialIndex{\adl@columns}
 % \SpecialIndex{\adl@LTstartpbox}
+% \SpecialIndex{\adl@@LTstartpbox}
 % \SpecialIndex{\@startpbox}
 % \SpecialIndex{\@@startpbox}
 % \SpecialIndex{\adl@LTendpbox}
@@ -4937,6 +4955,13 @@
 % \changes{v1.75}{2018/12/26}
 % 	{Add description that \cs{adl@LTendpbox} is common for \cs{@endpbox}
 %	 and \cs{@@endpbox}.}
+% \changes{v1.76}{2019/02/21}
+% 	{Modified to add \cs{let}-assignment
+%	 $\cs{@startpbox}\EQ\cs{adl@LTstartpbox}$ if \textsf{array} is in
+%	 use, and to replace the RHS of \cs{let}-assignments of
+%	 \cs{@@startpbox} and \cs{@startpbox} for the case without
+%	 \textsf{array}, which was \cs{adl@LTstartpbox}, with newly
+%	 introduced \cs{adl@@LTstartpbox}.} 
 % 

 % The macro |\LT@make@row| is redefined for additional initialization which
 % must be done after the original |\LT@array| performs its own
@@ -4944,26 +4969,35 @@
 % version |\adl@org@LT@make@row| to initialize stuff only once, since
 % |\LT@make@row| is called repeatedly at each chunk.  Next |\adl@ncol| is
 % assigned to |\adl@columns| to give its value calculated in |\@mkpream|.
+% 
 % Then macros to begin\slash end |p|-boxes are made |\let|-equal to our own
-% version because the original |\LT@array| has done it with its own version.
-% 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 |\@@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}
+% version because the original |\LT@array| has done it with
+% \textsf{longtable}'s own version.  That is, if \textsf{array} is in use
+% |\@startpbox| is |\let|-equal to our own |\adl@LTstartpbox|, while
+% |\@@startpbox| and |\@startpbox| are |\let|-equal to another macro
+% |\adl@@LTstartpbox| of our own.  On the other hand, |\@@endpbox| and
+% |\@endpbox| are commonly |\let|-equal to our own |\adl@LTendpbox|.  Note
+% that these our own macros indirectly invoke |\color@begingroup| and
+% |\color@endgroup|, which are added to |\LT@startpbox| and |\LT@endpbox| of
+% \textsf{longtable} bundled in \textsf{latex-tools} 2019-01-05, to make the
+% color grouping effective regardless the version of \textsf{longtable}.
+% 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}
 %

 %    \begin{macrocode}
 \let\adl@org@LT@make@row\LT@make@row
 \def\LT@make@row{\let\LT@make@row\adl@org@LT@make@row
         \adl@columns\adl@ncol
-        \ifadl@usingarypkg\else
-                \let\@@startpbox\adl@LTstartpbox
-                \let\@startpbox\adl@LTstartpbox \fi
+        \ifadl@usingarypkg
+                \let\@startpbox\adl@LTstartpbox
+        \else
+                \let\@@startpbox\adl@@LTstartpbox
+                \let\@startpbox\adl@@LTstartpbox
+        \fi
         \let\@@endpbox\adl@LTendpbox
         \let\@endpbox\adl@LTendpbox
         \let\adl@@endmbox\adl@endmbox
@@ -4987,9 +5021,9 @@
 % {\tt p b} (open)&&\\
 % \qquad with \textsf{array}&	\cs{adl@act@classz}&
 %				\cs{adl@org@classz}\\
-% &				\quad$\to$\cs{LT@startpbox}&
+% &				\quad$\to$\cs{adl@LTstartpbox}&
 %				\quad$\to$\cs{LT@startpbox}\\
-% \qquad without \textsf{array}&\cs{adl@LTstartpbox}&
+% \qquad without \textsf{array}&\cs{adl@@LTstartpbox}&
 %				\cs{LT@startpbox}\\\hline
 % {\tt m} (open)&		\cs{adl@act@classz}&
 %				\cs{adl@org@classz}\\
@@ -5307,49 +5341,62 @@
 
 %    \end{macrocode}
 %

+% \begin{macro}{\adl@@LTstartpbox}
+% \changes{v1.76}{2019/02/21}
+% 	{Added for \texttt{p} columns without \textsf{array}.}
 % \begin{macro}{\adl@LTstartpbox}
+% \changes{v1.76}{2019/02/21}
+% 	{Modified to invoke \cs{color@begingroup} always.}
 % \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}.}
+% \changes{v1.76}{2019/02/21}
+% 	{Modified to invoke \cs{color@endroup} always.}
 % \begin{macro}{\adl@LTendmbox}
 % \changes{v1.72-1}{2016/03/19}
 % 	{Added to process footnotes in \texttt{m}-type columns appropriately.}
 % 

 % \SpecialIndex{\@startpbox}
 % \SpecialIndex{\@@startpbox}
+% \SpecialIndex{\adl@box}
 % \SpecialIndex{\@@endpbox}
 % \SpecialIndex{\LT@startpbox}
-% \SpecialIndex{\adl@act@@startpbox}
-% \SpecialIndex{\adl@act@@endpbox}
+% \SpecialIndex{\adl@act@startpbox}
+% \SpecialIndex{\adl@act@endpbox}
 %

 % Macros for opening/closing |p|-boxes are fairly simple.  The macro
-% |\adl@LTstartpbox{|\meta{w}|}| is |\let|-assigned to |\@@startpbox| by
-% |\LT@make@row| to open a |p|-box of $w$ wide by our own
-% |\adl@act@@startpbox| and performs a footnote related operation introduced
-% by \textsf{longtable}, when \textsf{array} is not in use.  Note that if
-% \textsf{array} is in use, a |p|-box is opened by codes embedded in
-% |\@preamble| and its initialization is done by
-% |\@startpbox|${}={}$|\LT@startpbox|, unnecessitating our own version of
-% opening macros.
+% |\adl@LTstartpbox{|\meta{w}|}| is |\let|-assigned to |\@startpbox| by
+% |\LT@make@row| to open a |p|-box of $w$ wide by
+% |\adl@act@startpbox| and performs a footnote related operation introduced
+% by \textsf{longtable}, when \textsf{array} is in use.  If not, this macro
+% is invoked from |\adl@@LTstartpbox| which is |\let|-equal to
+% |\@@startpbox| and is to assign the |p|-box to |\adl@box|.  Since 
+% |\adl@act@startpbox| is for opening |p|-box with \textsf{array}, it has
+% |\color@begingroup| in it and thus the color grouping is effective
+% regardless the version of \textsf{longtable} or \textsf{array}.
 % 
 % 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|.  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}
+% after doing our own ones by |\adl@act@endpbox|, which also has 
+% |\color@begingroup| for version-independent color grouping.
+% 
+% As for |m|-boxes, the opening operation is done by |\adl@startmbox| in
+% which $|\@startpbox|\allowbreak=|\adl@LTstartpbox|$ is invoked for the
+% footnote-related operation.  On the ohter hand, the closing operation is
+% done by |\adl@LTendmbox|, which is made |\let|-equal to |\adl@endmbox| by
+% our |\LT@make@row|, to perform our own operations by |\adl@@endmbox| in
+% which the originnal definition of |\adl@enmbox| is kept by |\LT@make@row|
+% too.  Since |\adl@LTstartpbox| and |\adl@@endmbox| have
+% |\color@begingroup| and |\color@endgroup|, the color-grouping is done
+% regardless of the version of \textsf{longtable} and \textsf{array}.
+% \end{macro}\end{macro}\end{macro}\end{macro}
 %

 %    \begin{macrocode}
-\def\adl@LTstartpbox#1{%
-        \adl@act@@startpbox{#1}\let\@footnotetext\LT@p@ftntext}
-\def\adl@LTendpbox{\adl@act@@endpbox \the\LT@p@ftn \global\LT@p@ftn{}}
+\def\adl@@LTstartpbox{\setbox\adl@box\vtop\adl@LTstartpbox}
+\def\adl@LTstartpbox#1{\adl@act@startpbox{#1}\let\@footnotetext\LT@p@ftntext}
+\def\adl@LTendpbox{\adl@act@endpbox \the\LT@p@ftn \global\LT@p@ftn{}}
 \def\adl@LTendmbox{\adl@@endmbox \the\LT@p@ftn \global\LT@p@ftn{}}
 
 %%^L
diff --git a/Master/texmf-dist/tex/latex/arydshln/arydshln.sty b/Master/texmf-dist/tex/latex/arydshln/arydshln.sty
index 08300466c32..2409a7828f7 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/12/26 v1.75 ]
+[2019/02/21 v1.76 ]
 %% Register Declaration
 
 \newdimen\dashlinedash \dashlinedash4pt %
@@ -329,13 +329,14 @@
         \color@begingroup
         \setlength\hsize{#1}\@arrayparboxrestore
         \everypar{%
-                \vrule \@height \ht\@arstrutbox \@width \z@
+                \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}
+\def\adl@startmbox{\bgroup $\vcenter\@startpbox}
+\def\adl@endmbox{\@finalstrut\@arstrutbox \color@endgroup \egroup
+        $\egroup \adl@colhtdp \box\adl@box \hfil}
 
 %%^L
 
@@ -803,9 +804,12 @@
 \let\adl@org@LT@make@row\LT@make@row
 \def\LT@make@row{\let\LT@make@row\adl@org@LT@make@row
         \adl@columns\adl@ncol
-        \ifadl@usingarypkg\else
-                \let\@@startpbox\adl@LTstartpbox
-                \let\@startpbox\adl@LTstartpbox \fi
+        \ifadl@usingarypkg
+                \let\@startpbox\adl@LTstartpbox
+        \else
+                \let\@@startpbox\adl@@LTstartpbox
+                \let\@startpbox\adl@@LTstartpbox
+        \fi
         \let\@@endpbox\adl@LTendpbox
         \let\@endpbox\adl@LTendpbox
         \let\adl@@endmbox\adl@endmbox
@@ -887,9 +891,9 @@
 \def\adl@LTixhline{\penalty-\@medpenalty \vskip\doublerulesep
         \adl@hline\relax\doublerulesep \global\let\adl@LThdlrow\@empty}
 
-\def\adl@LTstartpbox#1{%
-        \adl@act@@startpbox{#1}\let\@footnotetext\LT@p@ftntext}
-\def\adl@LTendpbox{\adl@act@@endpbox \the\LT@p@ftn \global\LT@p@ftn{}}
+\def\adl@@LTstartpbox{\setbox\adl@box\vtop\adl@LTstartpbox}
+\def\adl@LTstartpbox#1{\adl@act@startpbox{#1}\let\@footnotetext\LT@p@ftntext}
+\def\adl@LTendpbox{\adl@act@endpbox \the\LT@p@ftn \global\LT@p@ftn{}}
 \def\adl@LTendmbox{\adl@@endmbox \the\LT@p@ftn \global\LT@p@ftn{}}
 
 %%^L