arydshln (2oct18)

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

6 files changed, 88 insertions, 42 deletions

diff --git a/Master/texmf-dist/doc/latex/arydshln/README b/Master/texmf-dist/doc/latex/arydshln/README
index 4243b705453..f042ff4324d 100644
--- a/Master/texmf-dist/doc/latex/arydshln/README
+++ b/Master/texmf-dist/doc/latex/arydshln/README
@@ -1,4 +1,4 @@
-arydshln (v1.73): The package to draw dash-lines in array/tabular
+arydshln (v1.74): The package to draw dash-lines in array/tabular
 
 [How to "make"]
 
@@ -34,7 +34,7 @@ arydshln (v1.73): 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 and v1.73 (this
+- Bugs found in v1.7 has been fixed in v1.71, v1.72, 1.73 and 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 59846c23bf5..26d22f106d7 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 773be3e2f59..1e3a10aad04 100644
--- a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex
+++ b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% Style file `arydshln'
-%% Copyright (C) 1993,1998-2016
+%% Copyright (C) 1993,1998-2018
 %%       Hiroshi Nakashima <h.nakasima'AT'media'DOT'kyoto-u'DOT'ac'DOT'jp>
 %%       (Kyoto Univ.)
 %% This program can be redistributed and/or modified under the terms
@@ -46,7 +46,7 @@
 %%
 %%
 \ProvidesFile{arydshln-man.tex}
-[2016/04/28 v1.73 ]
+[2018/09/26 v1.74 ]
 \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 9a1f2912d26..1133e60981f 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 a78ea130e03..3f758f4f130 100644
--- a/Master/texmf-dist/source/latex/arydshln/arydshln.dtx
+++ b/Master/texmf-dist/source/latex/arydshln/arydshln.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 %% Style file `arydshln'
-%% Copyright (C) 1993,1998-2016
+%% Copyright (C) 1993,1998-2018
 %%       Hiroshi Nakashima <h.nakasima'AT'media'DOT'kyoto-u'DOT'ac'DOT'jp>
 %%       (Kyoto Univ.)
 %% This program can be redistributed and/or modified under the terms
@@ -9,7 +9,7 @@
 %% version 1 of the License, or any later version.
 % \fi
 %
-%
\CheckSum{3618}
+%\CheckSum{3648}
 %% \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}
-[2016/04/28 v1.73 ]
+[2018/09/26 v1.74 ]
 %
 % \iffalse
 %<*driver>
@@ -318,20 +318,23 @@
 % \changes{v1.72}{2016/03/19}
 % 	{Bug fix and revision of \S2.4. (2016/03/19)}
 % \changes{v1.72-1}{2016/03/19}
-% 	{The followings are for bug fix for footnotes in \textsf{longtable}'s
+% 	{The following are for bug fix for footnotes in \textsf{longtable}'s
 % 	\texttt{m}-columns.}
 % 
 % \changes{v1.73}{2016/04/28}
 % 	{Bug fix.  (2016/04/28)}
 % \changes{v1.73-1}{2016/04/28}
-% 	{The followings are to fix the problem that the top edge a vertical
+% 	{The following are to fix the problem that the top edge a vertical
 %	 (dash-)line is at the bottom of a horizontal line rather than it
 %	 top.} 
 % \changes{v1.73-2}{2016/04/28}
-% 	{The followings are to fix the bug that \cs{hdashline}
+% 	{The following are to fix the bug that \cs{hdashline}
 %	 is not properly processed in a \texttt{array}\slash
 %	 \texttt{tabular} environment if \textsf{longtable} is loaded.}
-% 
+% \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.}
+% % 
 % 
 %
 % \def\EXCLAMATION{\texttt{!}}
@@ -520,7 +523,10 @@
 % small white specks at intersections, while in the example above they have
 % no specks.  In addition, the four corners of outermost rectangular also
 % have specks in ordinary ones, while those in the example above have
-% perfect contacts of L-shape.
+% perfect contacts of L-shape\footnote{

+% 

+% The top-left/right corners had specks before v1.73, the fix in which made
+% the topmost dash segment of a vertical dash-line a little bit shorter.}.
 %
 % \DescribeMacro{\firsthdashline}\DescribeMacro{\lasthdashline}
 % If you use \textsf{array}, the dashed version of |\firsthline| and
@@ -996,14 +1002,24 @@
 % \changes{v1.7}{2004/5/21}
 %	{Comment on vertical line coloring with \textsf{colortbl} is added.}
 %

-% 
 % As described in \S\ref{sec:usage-compat}, |\AC| and |\EAC| pair of
 % \textsf{colortab} such as |\AC&\EAC| cannot color the vertical line at
 % |&|.  Use |\ADLinactivate| if you want to have a ordinary table with
 % colored vertical lines.  Note that you may color vertical lines with
 % \textsf{colortbl} package.
-% \end{enumerate}
 %
+% \item
+% \changes{v1.74}{2018/09/26}
+% 	{Comment on \texttt{plextarydshln} is added.}
+% There should be a number of packages whose own |array|/|tabular|
+% implementations are not compatible with \textsf{arydshln}, though the
+% author has made efforts at the compatibility.  One of them is
+% \textsf{plext} package for Japanese typesetting but it has a style file
+% named |plextarydshln.sty| to solve the compatibility issue.  So if you use
+% the functionality of \textsf{arydshln} with \textsf{plext}, do
+% |\usepackage{plextarydshln}| instead of |\usepackage{arydshln}|.
+% \end{enumerate}
+% 
 % 
 %
 % \IndexPrologue{\newpage\section*{Index}
@@ -1026,6 +1042,8 @@
 % 	{Thank to Ma\"ieul Rouquette.}
 % \changes{v1.73}{2016/03/19}
 % 	{Thank to Ma\"ieul Rouquette again.}
+% \changes{v1.74}{2018/09/26}
+% 	{Thank to Hironobu Yamashita.}
 %
 % 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
@@ -1044,19 +1062,21 @@
 % incompatibility with \textsf{colortbl}; Morten H\o gholm who reported the
 % bug of |m|-type columns of \textsf{array} which had not manifested in five
 % (!!)\ years since the author realesed the first \textsf{array}-compatible
-% version; and Ma\"ieul Rouquette who reported another bug of |m|-type
+% version; Ma\"ieul Rouquette who reported another bug of |m|-type
 % columns of \textsf{longtable} with \textsf{array} which had peacefully
 % hidden in the package for eleven years and a half (!!!)\ since the author
 % made the bug fix shown above carelessly, yet another bug related to
 % \textsf{longtable}, and most surprisingly a problem on intersections of
 % horizontal and vertical (dash-)lines which has hidden for 23 years (!!!!)
-% since the very first version of the package.
+% 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.
 %
 % 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.3m)
+% contributed.  The author also refers \textsf{array} package (v2.4c)
 % 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
@@ -1103,7 +1123,7 @@
 % broken} if we assume every row has the standard height and depth.
 %
 % Moreover, even if we can measure the height\slash depth of each row (in
-% fact we will do as describe later), drawing dash-lines in each row will
+% fact we will do as described later), drawing dash-lines in each row will
 % not produce a good result.  Look at the following two examples closely.
 %

 %\begin{quote}
@@ -1130,11 +1150,11 @@
 % not have a continuous dash/gap sequence.
 %
 % The right example, which we wish to produce, is much better than the left.
-% In this example, the dash line is draw across two rows keeping continuous
+% In this example, the dash line is drawn across two rows keeping continuous
 % steps of dashes and gaps.  In order to have this result, we have to draw
 % the dash-line {\em after} two rows are built because it is necessary to
-% know the total hight and depth of two rows.  In general, if we know the
-% total hight and depth of rows and whether a column has a dash-line, we can
+% know the total height and depth of two rows.  In general, if we know the
+% total height and depth of rows and whether a column has a dash-line, we can
 % draw dash-lines by adding an extra row containing dash-lines.  For
 % example, the result shown above is obtained by the following row.
 %

@@ -1244,7 +1264,8 @@
 %	\togets&i<i'\LAND\\
 % &&	c^i_j=c^{i'}_{j'}\LAND d^i_j=d^{i'}_{j'}\LAND g^i_j=g^{i'}_{j'}\LAND
 %		p^i_j=p^{i'}_{j'}\LAND\\
-% &&	^\forall k(i<k<i'\to r_k=\mathit{connect}(h_k)).
+% &&	^\forall k(i<k<i'\to r_k\in
+% 	\{\mathit{connect}(h_k),\mathit{discard}(h_k)\}).
 % \end{eqnarray*}
 %

 % With these definitions, we can classify all $e^i_j$ into ordered sets
@@ -1595,6 +1616,7 @@
 % |\adl@box| and are updated if they are less.
 % \end{macro}\end{macro}
 %
+% \vskip-2ex\vskip0pt
 % \begin{macro}{\adl@heightsave}
 % \begin{macro}{\adl@depthsave}
 % Since we have to update these registers |\global|-ly to pass their values
@@ -1657,8 +1679,8 @@
 % following equations rather than those shown in \S\ref{sec:imp-ps1}.
 %$$
 % H=\sum_{l=1}^N h_l,\quad
-% \tau_k=H-\sum_{l=1}^{i-1} h_l,\quad
-% \beta_k=\tau_k-\sum_{l=i'}^i h_l.
+% \tau_k=H+\eta_{i-1}-\sum_{l=1}^{i-1} h_l,\quad
+% \beta_k=\tau_k-\eta_{i-1}-\eta_{i'-1}-\sum_{l=i'}^i h_l.
 %$$
 % |\adl@totalheight| contains $\sum_{l=1}^i h_l$ when the $i\th$ row is
 % built and thus its final value is $H$.  Since the data structure $R$ are
@@ -1704,7 +1726,7 @@
 % \end{itemize}
 %

 % \SpecialIndex{\@tempcnta}
-% \SpecialIndex{\@tempcnta}
+% \SpecialIndex{\@tempcntb}
 % We also use working |\count| registers |\@tempcnta| and |\@tempcntb|.
 %

 %    \begin{macrocode}
@@ -1851,11 +1873,21 @@
 % \begin{macro}{\@@array}
 % \changes{v1.4-2-1}{1999/06/25}
 %	{Introduced because \textsf{array} uses it.}
+% \changes{v1.74}{2018/09/26}
+% 	{Make \cs{@@array} \cs{let}-equal to \cs{@array} only when it is
+%	 made so by \textsf{array} and the equality is kept.}
 %

 % \SpecialIndex{\@tabarray}
 % Another stuff for the compatibility with \textsf{array} is to |\let| a
-% control sequence |\@@array| be equal to |\@array| because it is referred
-% in |\@tabarray| in \textsf{array}.
+% control sequence |\@@array| be equal to |\@array| if it is made so by
+% \textsf{array} and the equality is kept.  That is, with \textsf{array}
+% |\@@array| is invoked by |\@tabarray| and it is |\let|-equal to |\@array|
+% by default, while\break |\@@array| can be made different from |\@array| by
+% some other package, e.g., \textsf{delarray}, to do some special operations
+% defined in the package.  Therefore by the conditional equalization with
+% |\ifx|, our own |\@array| is directly invoked through |\@@array| if the
+% default equality is kept, while otherwise the package-dependent definition
+% of |\@@array| is respected.
 % \end{macro}
 %

 %    \begin{macrocode}
@@ -1868,7 +1900,7 @@
         \ifadl@inactive \adl@inactivate \else \adl@activate \fi
         \let\adl@noalign\noalign
         \adl@array}
-\let\@@array\@array
+\ifx\@@array\adl@array \let\@@array\@array \fi
 
 %    \end{macrocode}
 %
@@ -2965,7 +2997,7 @@
 % \changes{v1.4-2-1}{1999/06/25}
 %	{Introduced to do nothing if with \textsf{array}.}
 %

-% The macro |\multicolumn| is modified for the followings.
+% The macro |\multicolumn| is modified for the following.
 %

 % \begin{itemize}
 % \item
@@ -3180,7 +3212,7 @@
 % Additionally, if the extra space \meta{x} is negative, a vertical space of
 % $x$ is inserted below the row\footnote{

 %

-% Before v1.54, negative \meta{x} shrinks the hight of the row by $\vert
+% Before v1.54, negative \meta{x} shrinks the height of the row by $\vert
 % x\vert$.  Although the former result may be more appropriate if the row
 % has vertical lines than the current because lines extrude to the next row
 % now, new feature is considered compatible with original
@@ -3576,6 +3608,8 @@
 % \label{sec:imp-eoe}
 %
 % \begin{macro}{\endarray}
+% \changes{v1.74}{2018/09/26}
+% 	{Add conditional invokation of \cs{@arrayright}.}
 % \begin{macro}{\endtabular}
 % \changes{v1.7}{2004/5/21}
 %	{Modified to refer proper \cs{endarray} depending on the
@@ -3587,14 +3621,19 @@
 % |\endtabular(*)|, are modified so that they invoke |\adl@endarray| to draw
 % vertical lines just before closing |\halign|, and |\adl@arrayrestore| to
 % restore registers and data structures |\global|-ly modified in the
-% environment.
+% environment.  Note that \textsf{array} and related packages such as
+% \textsf{delarray} define a macro |\@arrayright| as the closing hook and
+% thus we invoke it if it is defined.
 % \end{macro}\end{macro}\end{macro}
+% 

+% \SpecialIndex{\@arrayright}
 %

 %    \begin{macrocode}
 
 %% End of Environment
 
-\def\endarray{\adl@endarray \egroup \adl@arrayrestore \egroup}
+\def\endarray{\adl@endarray \egroup \adl@arrayrestore \egroup
+        \csname @arrayright\endcsname}
 \def\endtabular{\endarray $\egroup}
 \expandafter\let\csname endtabular*\endcsname\endtabular
 
@@ -4737,6 +4776,7 @@
 %

 % \begin{macro}{\adl@discard}
 % \SpecialIndex{\adl@arrayinit}
+% \SpecialIndex{\adl@hdashline}
 % \SpecialIndex{\adl@ihdashline}
 % \SpecialIndex{\adl@LTihdashline}
 % \SpecialIndex{\ifadl@inactive}
@@ -5254,7 +5294,7 @@
 % \SpecialIndex{\adl@LTpagetotal}
 %

 % The macro |\LT@start| which puts (first) head and controls the page break
-% of the first page is modified for the followings.
+% of the first page is modified for the following.
 %

 % \begin{itemize}
 % \item
@@ -5859,6 +5899,8 @@
 % \begin{macro}{\adl@CT@end}
 % \begin{macro}{\CT@end}
 % \begin{macro}{\endarray}
+% \changes{v1.74}{2018/09/26}
+% 	{Add conditional invokation of \cs{@arrayright}.}
 % \begin{macro}{\endArray}
 % Yet another job is the save\slash restore of color information at the
 % beginning and end of the environment.  Since this is done by |\CT@start| and
@@ -5866,9 +5908,10 @@
 % to/from |\adl@dashgapcolor@save| referring their original version
 % |\adl@CT@start| and |\adl@CT@end|.  We also modify our own |\endarray| and 
 % its shorthand active version |\endArray| so that |\CT@end| is invoked at
-% the end of environment.  Note that we may not modify |\endtabular| because 
-% it refers |\endarray|.  Also note that |\CT@start| is invoked from
-% |\@tabarray| which we keep unchanged.
+% the end of environment together with |\@arrayright| if it is defined.
+% Note that we may not modify |\endtabular| because it refers |\endarray|.
+% Also note that |\CT@start| is invoked from |\@tabarray| which we keep
+% unchanged.
 % \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
 %

 %    \begin{macrocode}
@@ -5876,7 +5919,8 @@
 \def\CT@start{\adl@CT@start \let\adl@dashgapcolor@save\adl@dashgapcolor}
 \let\adl@CT@end\CT@end
 \def\CT@end{\adl@CT@end \global\let\adl@dashgapcolor\adl@dashgapcolor@save}
-\def\endarray{\adl@endarray \egroup \adl@arrayrestore \CT@end \egroup}
+\def\endarray{\adl@endarray \egroup \adl@arrayrestore \CT@end \egroup
+        \csname @arrayright\endcsname}
 \ifx\adl@notdefinable\undefined \let\endArray\endarray \fi
 
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/arydshln/arydshln.sty b/Master/texmf-dist/tex/latex/arydshln/arydshln.sty
index 076a3ff007b..9b8999fcb5c 100644
--- a/Master/texmf-dist/tex/latex/arydshln/arydshln.sty
+++ b/Master/texmf-dist/tex/latex/arydshln/arydshln.sty
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% Style file `arydshln'
-%% Copyright (C) 1993,1998-2016
+%% Copyright (C) 1993,1998-2018
 %%       Hiroshi Nakashima <h.nakasima'AT'media'DOT'kyoto-u'DOT'ac'DOT'jp>
 %%       (Kyoto Univ.)
 %% This program can be redistributed and/or modified under the terms
@@ -50,7 +50,7 @@
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \ProvidesPackage{arydshln}}
 \else\def\next[#1]{}\fi\next
-[2016/04/28 v1.73 ]
+[2018/09/26 v1.74 ]
 %% Register Declaration
 
 \newdimen\dashlinedash \dashlinedash4pt %
@@ -107,7 +107,7 @@
         \ifadl@inactive \adl@inactivate \else \adl@activate \fi
         \let\adl@noalign\noalign
         \adl@array}
-\let\@@array\@array
+\ifx\@@array\adl@array \let\@@array\@array \fi
 
 \def\adl@arrayinit{%
         \adl@arraysave
@@ -482,7 +482,8 @@
 
 %% End of Environment
 
-\def\endarray{\adl@endarray \egroup \adl@arrayrestore \egroup}
+\def\endarray{\adl@endarray \egroup \adl@arrayrestore \egroup
+        \csname @arrayright\endcsname}
 \def\endtabular{\endarray $\egroup}
 \expandafter\let\csname endtabular*\endcsname\endtabular
 
@@ -1056,7 +1057,8 @@
 \def\CT@start{\adl@CT@start \let\adl@dashgapcolor@save\adl@dashgapcolor}
 \let\adl@CT@end\CT@end
 \def\CT@end{\adl@CT@end \global\let\adl@dashgapcolor\adl@dashgapcolor@save}
-\def\endarray{\adl@endarray \egroup \adl@arrayrestore \CT@end \egroup}
+\def\endarray{\adl@endarray \egroup \adl@arrayrestore \CT@end \egroup
+        \csname @arrayright\endcsname}
 \ifx\adl@notdefinable\undefined \let\endArray\endarray \fi
 
 \def\hline{\noalign{\ifnum0=`}\fi