summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-02 23:54:48 +0000
committerKarl Berry <karl@freefriends.org>2016-05-02 23:54:48 +0000
commit18e1e0676806d75d5accc5104cc3ab13865bda21 (patch)
treec24802de0f9c629f8e71c902a52893828f1f77a2 /Master/texmf-dist
parent9cff94f29a6c2ea3f4fafae25e86254a53a67eff (diff)
arydshln (29apr16)
git-svn-id: svn://tug.org/texlive/trunk@40847 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/arydshln/README7
-rw-r--r--Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdfbin270958 -> 272621 bytes
-rw-r--r--Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex2
-rw-r--r--Master/texmf-dist/doc/latex/arydshln/arydshln.pdfbin616003 -> 621380 bytes
-rw-r--r--Master/texmf-dist/source/latex/arydshln/arydshln.dtx193
-rw-r--r--Master/texmf-dist/tex/latex/arydshln/arydshln.sty30
6 files changed, 166 insertions, 66 deletions
diff --git a/Master/texmf-dist/doc/latex/arydshln/README b/Master/texmf-dist/doc/latex/arydshln/README
index a0c346c9359..4243b705453 100644
--- a/Master/texmf-dist/doc/latex/arydshln/README
+++ b/Master/texmf-dist/doc/latex/arydshln/README
@@ -1,4 +1,4 @@
-arydshln (v1.72): The package to draw dash-lines in array/tabular
+arydshln (v1.73): The package to draw dash-lines in array/tabular
[How to "make"]
@@ -34,8 +34,9 @@ arydshln (v1.72): 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 and v1.72 (this version)
+- Bugs found in v1.7 has been fixed in v1.71, v1.72 and v1.73 (this
+ version).
Enjoy!
-Hiroshi Nakashima <nakasima'AT'media'DOT'kyoto-u'DOT'ac'DOT'jp>
+Hiroshi Nakashima <h'DOT'nakashima'AT'media'DOT'kyoto-u'DOT'ac'DOT'jp>
diff --git a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf
index 202e7ac5b19..59846c23bf5 100644
--- a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf
+++ b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex
index 84b6d5231bb..773be3e2f59 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}
-[2016/03/19 v1.72 ]
+[2016/04/28 v1.73 ]
\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 ad853bbb55f..9a1f2912d26 100644
--- a/Master/texmf-dist/doc/latex/arydshln/arydshln.pdf
+++ b/Master/texmf-dist/doc/latex/arydshln/arydshln.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/arydshln/arydshln.dtx b/Master/texmf-dist/source/latex/arydshln/arydshln.dtx
index 3872f365e7c..a78ea130e03 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{3618}
+%\CheckSum{3618}
%% \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/03/19 v1.72 ]
+[2016/04/28 v1.73 ]
%
% \iffalse
%<*driver>
@@ -218,6 +218,8 @@
% \GlossaryParms \let\item\@idxitem \ignorespaces}
% \def\endtheglossary{\relax}
%
+% \let\EQ\relax \let\GT\relax \let\BAR\relax \let\NEQ\relax
+%
% \makeatother
% \errorcontextlines1000
%
@@ -314,11 +316,22 @@
% \texttt{m}-columns. (2004/7/31)}
%
% \changes{v1.72}{2016/03/19}
-% {Bug fix and revision of \S2.4.}
+% {Bug fix and revision of \S2.4. (2016/03/19)}
% \changes{v1.72-1}{2016/03/19}
-% {The following are for bug fix for footnotes in \textsf{longtable}'s
+% {The followings 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
+% (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}
+% is not properly processed in a \texttt{array}\slash
+% \texttt{tabular} environment if \textsf{longtable} is loaded.}
+%
%
%
% \def\EXCLAMATION{\texttt{!}}
@@ -495,6 +508,19 @@
%\multicolumn{2}{|l:}{AB}&C\\\hdashline\hdashline
%\end{tabular}
%\end{quote}
+%
+% \changes{v1.73-1}{2016/04/28}
+% {Add a paragraph describing the perfect contacts of vertical and
+% horizontal lines.}
+%
+% Note that the intersections of leftmost/rightmost vertical lines and
+% horizontal dash-lines are little bit different from those produced by
+% ordinary |array|\slash|tabular|. That is, with very careful examination
+% you will find that vertical lines of ordinary ones are {\em broken\/} with
+% 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.
%
% \DescribeMacro{\firsthdashline}\DescribeMacro{\lasthdashline}
% If you use \textsf{array}, the dashed version of |\firsthline| and
@@ -595,13 +621,13 @@
% other. Therefore, you will have dash-lines with consistent steps of gaps
% and spaces the lines in Figure~\ref{fig:mode}(1) are.
%
-% \begin{figure}[b]
+% \begin{figure}
% \catcode`\|12
% \tabcolsep0pt \setbox\strutbox\hbox{\vrule height14pt depth6pt width0pt}
% \def\mb{\makebox[20pt]}
% \dashlinedash3.01pt \dashlinegap3.01pt
% \def\example#1{\begin{tabular}[b]{|c:c;{2pt/2pt}c|}
-% \hline\noalign{\vskip-\arrayrulewidth}
+% \hline
% \mb{A}&\mb{A}&\mb{A}\\[-\arrayrulewidth]\hdashline
% \mb{B}&\mb{B}&\mb{B}\\[-\arrayrulewidth]\hdashline[2pt/2pt]
% \mb{C}&\mb{C}&\mb{C}\\[-\arrayrulewidth]\hline
@@ -998,6 +1024,8 @@
% {Thank to Morten H\o gholm.}
% \changes{v1.72-1}{2016/03/19}
% {Thank to Ma\"ieul Rouquette.}
+% \changes{v1.73}{2016/03/19}
+% {Thank to Ma\"ieul Rouquette again.}
%
% 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
@@ -1019,7 +1047,10 @@
% version; and 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.
+% 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.
%
% The base implementation of \texttt{array} and \texttt{tabular}
% environments, part of which the author gives new definitions referring
@@ -1213,7 +1244,7 @@
% \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=connect(h_k)).
+% && ^\forall k(i<k<i'\to r_k=\mathit{connect}(h_k)).
% \end{eqnarray*}
%
% With these definitions, we can classify all $e^i_j$ into ordered sets
@@ -1248,11 +1279,21 @@
% $\xi_k=g^i_j=\ldots=g^{i'}_{j'}$.
%
% \item
+% \changes{v1.73-1}{2016/04/28}
+% {Add the definition of $\eta_l$ and addition\slash subtraction of it
+% for $\tau_k$ and $\beta_k$.}
+%
% The top and bottom ends of $L_k$ are at $\tau_k$ and $\beta_k$ above the
% bottom of the |array|\slash|tabular|, where;
%$$
-% \tau_k=\sum_{l=i}^N h_l,\quad\beta_k=\sum_{l=i'+1}^N h_l.
+% \eta_l=\cases{h_l&$r_l=\mathit{connect(h_l)}$\cr
+% 0&otherwise},\quad
+% \tau_k=\eta_{i-1}+\sum_{l=i}^N h_l,\quad
+% \beta_k=-\eta_{i'+1}+\sum_{l=i'+1}^N h_l.
%$$
+% Note that $\eta_{i-1}$ and $\eta_{i'+1}$ are added\slash subtracted so that
+% the top\slash bottom of $L_k$ is at the top\slash bottom edge of the
+% horizontal lines above\slash below the set $S_k$.
% \end{itemize}
%
% The row to draw $L_1,\ldots,L_n$ is;
@@ -3722,26 +3763,28 @@
%\!$\LAMBDA\_\meta{}$; $R\_R^L$; $\gamma\_1$;\\
%\!\WHILE\ $\gamma\leq\GAMMA$ \DO\ \BEGIN\\
%\!\qquad\=
-% $\tau\_H$; $\beta\_H$; $\delta\_ \meta{$-1,\B$}$;
+% $\tau\_H$; $\beta\_H$; $\eta\_0$; $\delta\_ \meta{$-1,\B$}$;
% $\xi\_ \meta{$-1,\B$}$;\\
%\!\> ${\it conn}\_\FALSE$; ${\it double}\_\FALSE;$; $R'\_\meta{}$\\
%\!\> \WHILE\ $R\neq\meta{}$ \DO\ \BEGIN\\
%\!\>\qquad\= $\meta{$r,R$}\_R$;\\
%\!\> \> $\meta{$C,h$}\_r$;\\
-%\!\> \> \IF\ $C=\meta{}$ \THEN\\
-%\!\> \>\qquad\= ${\it add}(\tau,\beta,\delta,\xi)$;\\
-%\!\> \> \ELSE\IF\ $C\neq\meta{connect}$ \BEGIN\\
-%\!\> \> \> $\meta{$e,C'$}=C$; $\meta{$c,d,g$}=e$;\\
+%\!\> \> \IF\ $C=\meta{}$ \THEN\ \BEGIN\quad
+% ${\it add}(\tau,\beta,\delta,\xi)$; $\eta\_0$;\quad\END;\\
+%\!\> \> \ELSE\IF\ $C=\meta{connect}$ \THEN\quad $\eta\_h$;\\
+%\!\> \> \ELSE\ \BEGIN\\
+%\!\> \>\qquad\= $\meta{$e,C'$}=C$; $\meta{$c,d,g$}=e$;\\
%\!\> \> \> \IF\ $c=\gamma$ \THEN\ \BEGIN\\
%\!\> \> \>\qquad\= \IF\ $d=\delta\LAND g=\xi$ \THEN\ \BEGIN\\
%\!\> \> \> \>\qquad\= \IF\ $\lnot{\it conn}$ \THEN\ \BEGIN\\
-%\!\> \> \> \> \>\qquad\= $\tau\_\beta$;
+%\!\> \> \> \> \>\qquad\= $\tau\_\beta+\eta$;
% ${\it conn}\_\TRUE$;\\
%\!\> \> \> \> \> \END;\\
%\!\> \> \> \> \END;\\
%\!\> \> \> \> \ELSE\ \BEGIN\\
%\!\> \> \> \> \> ${\it add}(\tau,\beta,\delta,\xi)$;\\
-%\!\> \> \> \> \> $\delta\_d$; $\xi\_g$; $\tau\_\beta$;
+%\!\> \> \> \> \> $\delta\_d$; $\xi\_g$;
+% $\tau\_\beta+\eta$;
% ${\it conn}\_\TRUE$;\\
%\!\> \> \> \> \END;\\
%\!\> \> \> \> \IF\ $C'=\meta{\meta{$\gamma,?,?$},$?$}$ \THEN
@@ -3749,6 +3792,7 @@
%\!\> \> \> \> $C\_C'$;\\
%\!\> \> \> \END;\\
%\!\> \> \> \ELSE\quad ${\it add}(\tau,\beta,\delta,\xi)$;\\
+%\!\> \> \> $\eta\_0$;\\
%\!\> \> \END;\\
%\!\> \> $\beta\_\beta-h$; $R'\_\meta{$R',\meta{$C,h$}$}$\\
%\!\> \END;\\
@@ -3791,6 +3835,7 @@
% \SpecialIndex{\adl@vlrow}
% \SpecialIndex{\adl@columns}
% \SpecialIndex{\adl@currentcolumn}
+% \SpecialIndex{\adl@lastconn}
% \SpecialIndex{\adl@dash}
% \SpecialIndex{\adl@gap}
% \SpecialIndex{\adl@vlrow}
@@ -3798,6 +3843,10 @@
% \SpecialIndex{\ifadl@doublerule}
% \SpecialIndex{\adl@totalheight}
%
+% \changes{v1.73-1}{2016/04/28}
+% {Add $\eta\EQ\cs{adl@lastconn}$, its initialization and updates, and
+% the addition to $\tau$.}
+%
% Figure~\ref{fig-makevlr} shows the conceptual code of |\adl@makevlrL|.
% The correspondance of variables in the code and control sequences in the
% real implementation is as follows.
@@ -3811,8 +3860,10 @@
% \gamma& \rlap{\cs{adl@currentcolumn}}\\
% \tau& \cs{@tempcnta}&
% \beta& \cs{@tempcntb}&
-% \delta& \rlap{\cs{adl@dash}/\cs{adl@dashcolor}}\\
-% \xi& \rlap{\cs{adl@gap}/\cs{adl@gapcolor}}&\multicolumn2c{}&
+% \eta& \rlap{\cs{adl@lastconn}}\\
+% \delta& \rlap{\cs{adl@dash}/\cs{adl@dashcolor}}&
+% \multicolumn2c{}&
+% \xi& \rlap{\cs{adl@gap}/\cs{adl@gapcolor}}&\multicolumn2c{}\\
% H& \rlap{\cs{adl@totalheight}}\\
% {\it conn}& \rlap{\cs{ifadl@connected}}&\multicolumn2c{}&
% {\it double}& \rlap{\cs{ifadl@doublerule}}\\
@@ -3827,7 +3878,7 @@
% \changes{v1.4-2-8}{1999/06/25}
% {Modified to replace \cs{hfil} with \cs{hss} to prevent drawing
% vertical lines widen columns.}
-% The macro |\adl@makevlrL| corresponds to the line (2) and (30)--(36). Its
+% The macro |\adl@makevlrL| corresponds to the line (2) and (31)--(36). Its
% right-edge counterpart |\adl@makevlrR| has the same correspondance but the
% lines (1)--(2) are;
%
@@ -3838,9 +3889,9 @@
% \end{tabbing}
% \end{quote}
%
-% and (30)--(35) are;
+% and (31)--(36) are;
%
-% \begin{quote}\defprog\setcounter{enumi}{29}
+% \begin{quote}\defprog\setcounter{enumi}{30}
% \begin{tabbing}
%\!\qquad\=
% \IF\ {\it double} \THEN\quad
@@ -3888,13 +3939,17 @@
% \begin{macro}{\adl@makevlr}
% \changes{v1.7-3}{2004/5/21}
% {Modified to initialize \cs{adl@dashcolor} and \cs{adl@gapcolor}.}
+% \changes{v1.73-1}{2016/04/28}
+% {Add $\eta\EQ\cs{adl@lastconn}\gets0$.}
% \SpecialIndex{\adl@addvl}
-% The macro |\adl@makevlr| corresponds to the lines (3)--(4) and (29).
+% \SpecialIndex{\adl@lastconn}
+%
+% The macro |\adl@makevlr| corresponds to the lines (3)--(4) and (30).
% \end{macro}
%
% \begin{macrocode}
\def\adl@makevlr{\@tempcnta\adl@totalheight \@tempcntb\adl@totalheight
- \adl@dash\m@ne \adl@gap\m@ne
+ \let\adl@lastconn\z@ \adl@dash\m@ne \adl@gap\m@ne
\let\adl@dashcolor\relax \let\adl@gapcolor\relax
\adl@connectedfalse \adl@doublerulefalse \def\@tempb{}%
\expandafter\adl@imakevlr\adl@rows\@nil;%
@@ -3905,21 +3960,26 @@
%
% \begin{macro}{\adl@imakevlr}
% \begin{macro}{\adl@iimakevlr}
+%
+% \changes{v1.73-1}{2016/04/28}
+% {Modify the definition of \cs{adl@connect} to pass $h$ to
+% \cs{adl@@connect}.}
+%
% \begin{macro}{\adl@endmakevlr}
% \SpecialIndex{\@elt}
% \SpecialIndex{\adl@connect}
%
% The macro |\adl@imakevlr|\meta{$r$}|;| corresponds to the lines (5)--(6),
-% and the macro |\adl@iimakevlr(|\meta{$C$}|/|\meta{$h$}|)| to (7) and (27).
+% and the macro |\adl@iimakevlr(|\meta{$C$}|/|\meta{$h$}|)| to (7) and (28).
% \end{macro}\end{macro}\end{macro}
%
% \begin{macrocode}
\def\adl@imakevlr#1;{\def\@tempa{#1}\ifx\@tempa\@nnil \let\next\relax
\else \adl@iimakevlr#1\let\next\adl@imakevlr \fi \next}
\def\adl@iimakevlr(#1/#2){\let\@elt\adl@iiimakevlr
- \let\adl@connect\adl@@connect
+ \def\adl@connect{\adl@@connect#2}%
\let\adl@endmakevlr\adl@endmakevlrcut
- #1\adl@endmakevlr
+ #1\adl@endmakevlr
\let\@elt\relax \let\adl@connect\relax
\advance\@tempcntb-#2\edef\@tempb{\@tempb(\@tempc/#2);}}
@@ -3928,14 +3988,24 @@
% \begin{macro}{\adl@iiimakevlr}
% \changes{v1.7-3}{2004/5/21}
% {Modified to check color indentity.}
+% \changes{v1.73-1}{2016/04/28}
+% {Replace two occurences of $\tau\gets\beta$ with
+% $\tau\gets\beta+\eta$ and add $\eta\gets0$, where
+% $\eta\EQ\cs{adl@lastconn}$.}
% \begin{macro}{\adl@ivmakevlr}
% \changes{v1.7-3}{2004/5/21}
% {Modified not to see $d$ and $g$ which now have colors.}
% \begin{macro}{\adl@vmakevlr}
% \begin{macro}{\adl@endmakevlrcut}
+% \changes{v1.73-1}{2016/04/28}
+% {Add $\eta\EQ\cs{adl@lastconn}\gets0$.}
% \begin{macro}{\adl@endmakevlrconn}
% \begin{macro}{\adl@@connect}
-% The correspondance of the lines (8)--(29) is a little bit complicated. As
+% \changes{v1.73-1}{2016/04/28}
+% {Add $\eta\EQ\cs{adl@lastconn}\gets h$ with the added
+% argument $h$.}
+%
+% The correspondance of the lines (8)--(30) is a little bit complicated. As
% shown above, |\adl@iimakevlr| expands $C$ attaching the sentinel
% |\adl@endmakevlr|.
%
@@ -3943,8 +4013,8 @@
% \item
% If $C\neq\meta{}$ and $C\neq\meta{connect}$, $C$ has at least one
% |\@elt|\meta{$c$}\meta{$d$}\meta{$g$} which is made |\let|-equal to
-% |\adl@iiimakevlr| by |\adl@iimakevlr|. Thus the lines (10)--(21) and (25)
-% are performed by |\adl@iiimakevlr|.
+% |\adl@iiimakevlr| by |\adl@iimakevlr|. Thus the lines (10)--(21) and
+% (25)--(26) are performed by |\adl@iiimakevlr|.
%
% Then;
% \begin{enumerate}
@@ -3963,13 +4033,13 @@
%
% \item
% If $C=\meta{connect}$, i.e.\ it has only one element |\adl@connect|, the
-% macro |\adl@@connect| is invoked because it is |\let|-equal to
-% |\adl@connect|. The macro do nothing but implict $C\gets C\ {}
-% (=\meta{connect})$ and eating the sentinel.
+% macro |\adl@@connect| is invoked with $h$ because it is |\define|-dl to be
+% $|\adl@@connect|\meta{h}$. The macro performs (9) and implict $C\gets C\ {}
+% (=\meta{connect})$ eating the sentinel.
%
% \item
% If $C=\meta{}$, |\adl@endmakevlrcut| that is |\let|-equal to the sentinel
-% |\adl@endmakevlr| is invoked to perform (8)--(9) and implicit $C\gets C
+% |\adl@endmakevlr| is invoked to perform (8) and implicit $C\gets C
% \ (=\meta{})$.
% \end{enumerate}
% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
@@ -3988,24 +4058,31 @@
\fi\fi\fi\fi
\if@tempswa
\ifadl@connected\else
- \@tempcnta\@tempcntb \adl@connectedtrue \fi
+ \@tempcnta\@tempcntb
+ \advance\@tempcnta\adl@lastconn\relax
+ \adl@connectedtrue
+ \fi
\else
\adl@addvl
\adl@dash#2\relax \adl@gap#3\relax
\def\adl@dashcolor{#4}\def\adl@gapcolor{#5}%
- \@tempcnta\@tempcntb \adl@connectedtrue
+ \@tempcnta\@tempcntb
+ \advance\@tempcnta\adl@lastconn\relax
+ \adl@connectedtrue
\fi
\else
\adl@addvl
\def\next{\adl@vmakevlr\@elt{#1}{#2}{#3}{#4}{#5}}%
- \fi\next}
+ \fi
+ \let\adl@lastconn\z@ \next}
\def\adl@ivmakevlr#1{%
\ifnum#1=\adl@currentcolumn \adl@doubleruletrue \fi
\adl@vmakevlr\@elt{#1}}
\def\adl@vmakevlr#1\adl@endmakevlr{\def\@tempc{#1}}
-\def\adl@endmakevlrcut{\adl@addvl \def\@tempc{}}
+\def\adl@endmakevlrcut{\adl@addvl \let\adl@lastconn\z@ \def\@tempc{}}
\def\adl@endmakevlrconn{\def\@tempc{}}
-\def\adl@@connect\adl@endmakevlr{\def\@tempc{\adl@connect}}
+\def\adl@@connect#1\adl@endmakevlr{\def\adl@lastconn{#1}%
+ \def\@tempc{\adl@connect}}
% \end{macrocode}
%
@@ -4109,7 +4186,7 @@
% \meta{$\delta_c$}\meta{$\gamma_c$} ($x_l$ and $x_c$ are length and color)
% draws a sloid line if $\gamma_l=0$ or a dash-line otherwise in a |\vbox| of
% $\lambda=\tau-\beta$ high and |\raise|-s it by $\beta$. The method to
-% draw a dash line in the |\vbox| is analogous to that for holizontal line
+% draw a dash line in the |\vbox| is analogous to that for horizontal line
% shown in \S\ref{sec:imp-hline}, except that a line is surrounded by
% horizontal spaces of |\adl@vl@leftskip| and |\adl@vl@rightskip|. Coloring
% gaps is done by drawing a vertical rule setting $\gamma_c$ by |\set@color|
@@ -4652,6 +4729,12 @@
%
% \begin{macro}{\adl@LT@array}
% \begin{macro}{\LT@array}
+% \changes{v1.73-2}{2016/04/28}
+% {Add \cs{let}-assignment of \cs{adl@LThdashline} to
+% \cs{adl@hdashline} so that the \textsf{longtable} version of
+% \cs{adl@hdashline} is effective only in \texttt{longtable}
+% environment rather than globally.}
+%
% \begin{macro}{\adl@discard}
% \SpecialIndex{\adl@arrayinit}
% \SpecialIndex{\adl@ihdashline}
@@ -4661,12 +4744,13 @@
% Then we redefine the macro |\LT@array|, which is the heart of |\longtable|,
% saving its original definition in |\adl@LT@array|. The modified
% |\LT@array| first calls |\adl@arrayinit| to initialize the global data
-% structures, and sets |\ifadl@LTfirstpage| to true. Then |\adl@idashline|
-% and |\adl@discard| are made |\let|-equal to its \textsf{longtable} version
-% |\adl@LTidashline| and |\relax| (to inhibit expansion) respectively.
-% Then the macro calls |\adl@LTinactivate| if |\adl@inactive| is true, and
-% finally calls its original version |\adl@LT@array|. Note that since
-% |longtable| cannot be nested;
+% structures, and sets |\ifadl@LTfirstpage| to true. Then |\adl@dashline|,
+% |\adl@idashline| and |\adl@discard| are made |\let|-equal to the
+% \textsf{longtable} versions |\adl@LTdashline| and |\adl@LTidashline|, and
+% |\relax| (to inhibit expansion) respectively. Then the macro calls
+% |\adl@LTinactivate| if |\adl@inactive| is true, and finally calls its
+% original version |\adl@LT@array|. Note that since |longtable| cannot be
+% nested;
%
% \begin{itemize}
% \item
@@ -4716,7 +4800,8 @@
% \begin{macrocode}
\let\adl@LT@array\LT@array
\def\LT@array{\adl@arrayinit \adl@LTfirstpagetrue
- \let\adl@discard\relax \let\adl@ihdashline\adl@LTihdashline
+ \let\adl@discard\relax \let\adl@hdashline\adl@LThdashline
+ \let\adl@ihdashline\adl@LTihdashline
\ifadl@inactive \adl@LTinactivate \fi
\adl@LT@array}
\def\adl@LTinactivate{\adl@inactivate
@@ -4991,14 +5076,18 @@
% \label{sec:imp-lt-hlpbox}
%
% \begin{macro}{\LT@hline}
-% \begin{macro}{\adl@hdashline}
+% \begin{macro}{\adl@LThdashline}
% \changes{v1.7-1}{2004/5/21}
% {Keep original without shift up because it is done by
% \cs{adl@LThdline}.}
+% \changes{v1.73-2}{2016/04/28}
+% {Renamed from \cs{adl@hdashline} to make it effective only in
+% \texttt{longtable} environments.}
% \begin{macro}{\adl@LTihdashline}
% \begin{macro}{\adl@LTinactivehdl}
% \begin{macro}{\adl@LThdlrow}
% \SpecialIndex{\hline}
+% \SpecialIndex{\adl@hdashline}
% \SpecialIndex{\adl@ihdashline}
% \SpecialIndex{\adl@inactivehdl}
% \SpecialIndex{\adl@hcline}
@@ -5022,9 +5111,10 @@
% |\multispan| and |\leaders\hrule| or
% |\adl@hcline[|\meta{dash}|/|\meta{gap}|]|.
%
-% Note that |\adl@hdashline| is redefined here because its version without
-% \textsf{longtable} performs a part of the job done by |\adl@LThdline| as
-% shown soon.
+% Note that we define |\adl@LThdashline| to make |\adl@hdashline|
+% \cs{let}-equal to it in \textsf{longtable} environments because its
+% version without \textsf{longtable} performs a part of the job done by
+% |\adl@LThdline| as shown soon.
% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
%
% \begin{macrocode}
@@ -5035,7 +5125,7 @@
\gdef\adl@LThdlrow{\multispan{\LT@cols}\unskip
\leaders\hrule\@height\arrayrulewidth\hfill\cr}%
\adl@LThdline}
-\def\adl@hdashline#1{\noalign{\ifnum0=`}\fi
+\def\adl@LThdashline#1{\noalign{\ifnum0=`}\fi
\@ifnextchar[%]
{#1}%
{#1[\dashlinedash/\dashlinegap]}}
@@ -6155,5 +6245,6 @@
% \cs{ifadl@} from its name if it has one of them.}
% \Finale
% \newpage
+% \def\EQ{=} \def\GT{>} \def\BAR{|} \def\NEQ{\neq}
% \PrintChanges
\endinput
diff --git a/Master/texmf-dist/tex/latex/arydshln/arydshln.sty b/Master/texmf-dist/tex/latex/arydshln/arydshln.sty
index 2a62b393215..076a3ff007b 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
-[2016/03/19 v1.72 ]
+[2016/04/28 v1.73 ]
%% Register Declaration
\newdimen\dashlinedash \dashlinedash4pt %
@@ -542,7 +542,7 @@
\fi\fi\next}
\def\adl@makevlr{\@tempcnta\adl@totalheight \@tempcntb\adl@totalheight
- \adl@dash\m@ne \adl@gap\m@ne
+ \let\adl@lastconn\z@ \adl@dash\m@ne \adl@gap\m@ne
\let\adl@dashcolor\relax \let\adl@gapcolor\relax
\adl@connectedfalse \adl@doublerulefalse \def\@tempb{}%
\expandafter\adl@imakevlr\adl@rows\@nil;%
@@ -552,9 +552,9 @@
\def\adl@imakevlr#1;{\def\@tempa{#1}\ifx\@tempa\@nnil \let\next\relax
\else \adl@iimakevlr#1\let\next\adl@imakevlr \fi \next}
\def\adl@iimakevlr(#1/#2){\let\@elt\adl@iiimakevlr
- \let\adl@connect\adl@@connect
+ \def\adl@connect{\adl@@connect#2}%
\let\adl@endmakevlr\adl@endmakevlrcut
- #1\adl@endmakevlr
+ #1\adl@endmakevlr
\let\@elt\relax \let\adl@connect\relax
\advance\@tempcntb-#2\edef\@tempb{\@tempb(\@tempc/#2);}}
@@ -570,24 +570,31 @@
\fi\fi\fi\fi
\if@tempswa
\ifadl@connected\else
- \@tempcnta\@tempcntb \adl@connectedtrue \fi
+ \@tempcnta\@tempcntb
+ \advance\@tempcnta\adl@lastconn\relax
+ \adl@connectedtrue
+ \fi
\else
\adl@addvl
\adl@dash#2\relax \adl@gap#3\relax
\def\adl@dashcolor{#4}\def\adl@gapcolor{#5}%
- \@tempcnta\@tempcntb \adl@connectedtrue
+ \@tempcnta\@tempcntb
+ \advance\@tempcnta\adl@lastconn\relax
+ \adl@connectedtrue
\fi
\else
\adl@addvl
\def\next{\adl@vmakevlr\@elt{#1}{#2}{#3}{#4}{#5}}%
- \fi\next}
+ \fi
+ \let\adl@lastconn\z@ \next}
\def\adl@ivmakevlr#1{%
\ifnum#1=\adl@currentcolumn \adl@doubleruletrue \fi
\adl@vmakevlr\@elt{#1}}
\def\adl@vmakevlr#1\adl@endmakevlr{\def\@tempc{#1}}
-\def\adl@endmakevlrcut{\adl@addvl \def\@tempc{}}
+\def\adl@endmakevlrcut{\adl@addvl \let\adl@lastconn\z@ \def\@tempc{}}
\def\adl@endmakevlrconn{\def\@tempc{}}
-\def\adl@@connect\adl@endmakevlr{\def\@tempc{\adl@connect}}
+\def\adl@@connect#1\adl@endmakevlr{\def\adl@lastconn{#1}%
+ \def\@tempc{\adl@connect}}
\def\adl@addvlL{\ifadl@connected
\advance\@tempcnta-\@tempcntb
@@ -767,7 +774,8 @@
\let\adl@LT@array\LT@array
\def\LT@array{\adl@arrayinit \adl@LTfirstpagetrue
- \let\adl@discard\relax \let\adl@ihdashline\adl@LTihdashline
+ \let\adl@discard\relax \let\adl@hdashline\adl@LThdashline
+ \let\adl@ihdashline\adl@LTihdashline
\ifadl@inactive \adl@LTinactivate \fi
\adl@LT@array}
\def\adl@LTinactivate{\adl@inactivate
@@ -836,7 +844,7 @@
\gdef\adl@LThdlrow{\multispan{\LT@cols}\unskip
\leaders\hrule\@height\arrayrulewidth\hfill\cr}%
\adl@LThdline}
-\def\adl@hdashline#1{\noalign{\ifnum0=`}\fi
+\def\adl@LThdashline#1{\noalign{\ifnum0=`}\fi
\@ifnextchar[%]
{#1}%
{#1[\dashlinedash/\dashlinegap]}}