From 5a8b6166df4251221c0e16567631422c192fc793 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Mar 2016 21:19:43 +0000 Subject: arydshln (20mar16) git-svn-id: svn://tug.org/texlive/trunk@40087 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/arydshln/README | 8 +- .../texmf-dist/doc/latex/arydshln/arydshln-man.pdf | Bin 173998 -> 270958 bytes .../texmf-dist/doc/latex/arydshln/arydshln-man.tex | 8 +- Master/texmf-dist/doc/latex/arydshln/arydshln.pdf | Bin 461090 -> 616003 bytes .../texmf-dist/source/latex/arydshln/arydshln.dtx | 606 ++++++++++++--------- Master/texmf-dist/tex/latex/arydshln/arydshln.sty | 11 +- 6 files changed, 356 insertions(+), 277 deletions(-) diff --git a/Master/texmf-dist/doc/latex/arydshln/README b/Master/texmf-dist/doc/latex/arydshln/README index 1e274fbaf9d..a0c346c9359 100644 --- a/Master/texmf-dist/doc/latex/arydshln/README +++ b/Master/texmf-dist/doc/latex/arydshln/README @@ -1,4 +1,4 @@ -arydshln (v1.71): The package to draw dash-lines in array/tabular +arydshln (v1.72): The package to draw dash-lines in array/tabular [How to "make"] @@ -32,8 +32,10 @@ arydshln (v1.71): The package to draw dash-lines in array/tabular available. + Compatible with "array" (from v1.4), "colortab" (from v1.5), - "longtable" (from v1.6) and "colortbl (now!!). + "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) Enjoy! -Hiroshi Nakashima +Hiroshi Nakashima diff --git a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.pdf index 7156e32244e..202e7ac5b19 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 0dbdd168c19..84b6d5231bb 100644 --- a/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex +++ b/Master/texmf-dist/doc/latex/arydshln/arydshln-man.tex @@ -21,9 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% Style file `arydshln' -%% Copyright (C) 1993,1998-2004 -%% Hiroshi Nakashima -%% (Kyoto Univ. / Toyohashi Univ. of Tech.) +%% Copyright (C) 1993,1998-2016 +%% Hiroshi Nakashima +%% (Kyoto Univ.) %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN %% archives in directory macros/latex/base/lppl.txt; either @@ -46,7 +46,7 @@ %% %% \ProvidesFile{arydshln-man.tex} -[2004/08/31 v1.71 ] +[2016/03/19 v1.72 ] \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 88b589a1ba9..ad853bbb55f 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 77df7b4f27b..3872f365e7c 100644 --- a/Master/texmf-dist/source/latex/arydshln/arydshln.dtx +++ b/Master/texmf-dist/source/latex/arydshln/arydshln.dtx @@ -1,15 +1,15 @@ % \iffalse %% Style file `arydshln' -%% Copyright (C) 1993,1998-2004 -%% Hiroshi Nakashima -%% (Kyoto Univ. / Toyohashi Univ. of Tech.) +%% Copyright (C) 1993,1998-2016 +%% Hiroshi Nakashima +%% (Kyoto Univ.) %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN %% archives in directory macros/latex/base/lppl.txt; either %% version 1 of the License, or any later version. % \fi % -% \CheckSum{3605} +% \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 @@ %\ProvidesFile{arydshln-man.tex} % \fi % \ProvidesFile{arydshln.dtx} -[2004/08/31 v1.71 ] +[2016/03/19 v1.72 ] % % \iffalse %<*driver> @@ -224,13 +224,16 @@ % % % \changes{v1.0}{1993/04/01} -% {The style was born on a good day \ldots} +% {The style was born on a good day \ldots\ (1993/04/01)} % \changes{v1.05}{1993/06/18} % {Cope with \texttt{\char`\\\char`\\} with negative optional -% vertical space.} +% vertical space. (1993/06/18)} % \changes{v1.1}{1993/06/24} % {Save and restore the \texttt{\char`\\catcode} for -% `\texttt{@}'.} +% `\texttt{@}'. (1993/06/24)} +% +% \changes{v1.2}{1998/07/16} +% {Various changes shown below. (1998/07/16)} % \changes{v1.2-1}{1998/07/16} % {Add this document.} % \changes{v1.2-2}{1998/07/16} @@ -241,40 +244,49 @@ % {Add the feature of explicit dash/gap specification.} % \changes{v1.2-5}{1998/07/16} % {Fix some bugs and change codes.} -% \changes{v1.4-1}{1999/06/25} -% {Make compatible with array package and add new features.} % -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.3}{1998/10/08} +% {Fix one bug shown below. (1998/10/08)} +% +% \changes{v1.4}{1999/06/25} +% {Make compatible with array package and add new features. (1999/06/25)} +% +% \changes{v1.4-1}{1999/06/25} % {The following are changes of this document.} % -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {The following are for the general compatibility with \textsf{array}.} -% \changes{v1.4-3-2}{1999/06/25} +% \changes{v1.4-2-2}{1999/06/25} % {The following are to control the effective width of vertical lines.} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {The following are for inactivation of dash-line functions.} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {The following are for drawing mode to cope with the bug of % \cs{xlearders}.} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {The following are to implement dashed version of \cs{firsthline} % and \cs{lasthline} of \textsf{array}.} -% \changes{v1.4-3-6}{1999/06/25} +% \changes{v1.4-2-6}{1999/06/25} % {The following are to fix the bug by which the depth of % \texttt{array}\slash\texttt{tabular} was always zero.} -% \changes{v1.4-3-7}{1999/06/25} +% \changes{v1.4-2-7}{1999/06/25} % {The following are to rename macros for \cs{cdashline}.} -% \changes{v1.4-3-8}{1999/06/25} +% \changes{v1.4-2-8}{1999/06/25} % {The following are to cope with very narrow or negative wide columns.} -% \changes{v1.4-4}{2000/07/04} -% {Released to CTAN.} +% \changes{v1.4-3}{2000/07/04} +% {Released to CTAN on 2000/07/04.} % +% \changes{v1.5}{2000/07/12} +% {Make compatible with \textsf{colortab}, and fix bugs. (2000/07/12)} % \changes{v1.5-1}{2000/07/12} % {The following are for the compatibility with \textsf{colortab}.} % \changes{v1.5-2}{2002/06/26} % {The following are for bug fix of \cs{adl@putlrc}.} % \changes{v1.5-3}{2003/07/11} % {The following are for bug fix of \cs{adl@inactivate}.} +% +% \changes{v1.54}{2003/08/25} +% {Bug fixes. (2003/08/25)} % \changes{v1.54-1}{2003/08/25} % {The following are for bug fix of \cs{adl@@vl}.} % \changes{v1.54-2}{2003/08/25} @@ -282,11 +294,13 @@ % \changes{v1.54-3}{2003/08/25} % {The following are miscellaneous modifications.} % -% \changes{v1.6-1}{2003/08/25} -% {The following are for the compatibility with \textsf{longtable}.} +% \changes{v1.6}{2003/08/25} +% {The following are for the compatibility with +% \textsf{longtable}. (2003/08/25)} % -% \changes{v1.7}{2003/05/21} -% {The following are for the compatibility with \textsf{colortbl}.} +% \changes{v1.7}{2004/05/21} +% {The following are for the compatibility with +% \textsf{colortbl}. (2004/05/21)} % \changes{v1.7-1}{2004/5/21} % {The following are for null-wide horizontal lines.} % \changes{v1.7-2}{2004/5/21} @@ -295,9 +309,16 @@ % \changes{v1.7-3}{2004/5/21} % {The following are for vertical line coloring.} % -% \changes{v1.71-1}{2004/7/31} +% \changes{v1.71}{2004/7/31} % {The following are for bug fix for \textsf{array}'s +% \texttt{m}-columns. (2004/7/31)} +% +% \changes{v1.72}{2016/03/19} +% {Bug fix and revision of \S2.4.} +% \changes{v1.72-1}{2016/03/19} +% {The following are for bug fix for footnotes in \textsf{longtable}'s % \texttt{m}-columns.} +% % % % \def\EXCLAMATION{\texttt{!}} @@ -307,7 +328,7 @@ % % \title{The \textsf{arydshln} package\thanks{ % This file has version number \fileversion, last revised \filedate.}} -% \author{Hiroshi Nakashima\\(Toyohashi Univ. of Tech.)} +% \author{Hiroshi Nakashima\\(Kyoto University)} % \date{\filedate} % \maketitle % @@ -332,11 +353,11 @@ % % In March of the year, Monty Hayes complained of this problem encouraging % the author to make a new version \textsf{arydshln} to solve the problem. -% The new style also has new features, such as allowing `|:|' to specify +% The new style also has new features, such as allowing `|:|' to specify a % vertical dash-line in preamble, and |\cdashline| being a counterpart of % |\cline|. % -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {The history on the compatibility with \textsf{array} package.} % In March 1999, Sebastian Rahtz kindly invited the style, which had been % improved following the bug report from Takahiro Kubota, to be included in @@ -353,7 +374,7 @@ % compatible with \textsf{colortab} style to let the author work on the % compatibility issue again. % -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {The history on the compatibility with \textsf{longtable} package.} % In Feburary 2001, Craig Leech reported another compatibility problem with % \textsf{longtable}. Although the author promised that the problem would @@ -361,8 +382,8 @@ % % Two years and a half! Sorry Craig.} % -% until three other complaints. Then the author attacked the problem hoping -% it is the last compatibility issue\footnote{ +% until three other complaints were made. Then the author attacked the +% problem hoping it is the last compatibility issue\footnote{ % % But his hope was dashed as described below.}. % @@ -382,7 +403,7 @@ % \subsection{Loading Package} % \label{sec:usage-load} % -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Explanation of package loading is added.} % % The package is usable to both \LaTeXe{} and \LaTeX-2.09 users with their @@ -400,7 +421,7 @@ % % \changes{v1.5-1}{2000/7/12} % {Caution about loading order of \textsf{colortab} is added.} -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Caution about loading order of \textsf{longtable} is added.} % \changes{v1.7}{2004/5/21} % {Caution about loading order of \textsf{colortbl} is added.} @@ -447,7 +468,7 @@ % |\multicolumn|. % % \DescribeMacro{\hdashline}\DescribeMacro{\cdashline} -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Description of \cs{first}\slash\texttt{lasthdashline} is added.} % It is also simple to draw a horizontal dash-line. Use |\hdashline| and % |\cdashline| as the counterparts of |\hline| and |\cline|. @@ -542,7 +563,7 @@ %\end{tabular} %\end{quote} % -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Description of the real width of vertical lines is added.} % % \DescribeMacro{\ADLnullwide} @@ -562,14 +583,17 @@ % \subsection{Finer Tuning} % \label{sec:usage-finer} % -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Description of drawing mode is added.} +% \changes{v1.72-2}{1999/06/25} +% {Revise \S2.4 reflecting the fix of \cs{xleaders}.} +%  % To draw dash-lines, we use a powerful primitive of \TeX{} called |\xleaders|. % It replicates a segment that consist of a dash and gap so that a dash-line % has as many segments as possible and distributes {\it remainder} space to % make the spaces between adjacent dash segments (almost) equal to each % other. Therefore, you will have dash-lines with consistent steps of gaps -% and spaces as the left and upper lines in Figure~\ref{fig:mode}(1) are. +% and spaces the lines in Figure~\ref{fig:mode}(1) are. % % \begin{figure}[b] % \catcode`\|12 @@ -591,40 +615,50 @@ % \label{fig:mode} % \end{figure} % -% However, because of a bug (or buggy feature) of |\xleaders|, there is a -% small possibility that a dash segment near the right\slash bottom end -% drops as right and lower lines in (1) of the figure shows. To cope with this -% problem, you may change the {\it drawing mode} by -% |\ADLdrawingmode|\Meta{$m$} as follows. +% However, because of a bug (or buggy feature) of |\xleaders|, there {\em +% had been} a small possibility that a dash segment near the right\slash +% bottom end drops, until it was fixed in the version of 3.141592\footnote{ +%  +% By pointing out this problem, the author got a check of \$327.68 plus a +% significantly large amount of interest from DEK\@. Wow!!}. +%  +% Though the fix ultimately made any effort to cope with the problem +% unnecessary, the pacakge still gives you alternative {\em drawing modes} +% which you may specify by |\ADLdrawingmode|\Meta{$m$} as follows. % % \begin{itemize} % \item $m=1$ % \DescribeMacro{\ADLdrawingmode}\\ -% As shown in Figure~\ref{fig:mode}(1), most beautiful in almost all cases -% as the left/upper lines, but has a small possibility to produce an ugly -% result as right/lower lines. This is default. +% As shown in Figure~\ref{fig:mode}(1), it gives most beautiful result by +% |\xleaders|\footnote{ +%  +% Until the fix of \cs{xleaders}, the second bottom\slash rightmost segments +% of right\slash lower lines were dropped.}. +%  +% This is default. % % \item $m=2$\\ % As shown in (2) of the figure, beautiful if dash-lines are not so sparse % as right/lower lines, but dash segments near the both ends may be a little -% bit too long as left/upper lines. +% bit too long as left/upper lines, because in this mode the second +% first\slash last segments are drawn by a special mechanism. % % \item $m=3$\\ % As shown in (3) of the figure, beautiful if dash-lines are not so sparse % as right/lower lines, but gaps near the both ends may be considerably too -% large as left/upper lines. +% large as left/upper lines, because in this mode the lines are drawn by +% |\cleaders|. % \end{itemize} % -% It is recommended to use default mode 1 unless you have an ugly result -% in the final version of your manuscript, because the correctness of mode 1 -% is very sensitive to the length of dash-lines. +% It is strongly recommended to use default mode 1 unless you want to have +% some special effect. % % % % \subsection{Performance Tuning} % \label{sec:usage-performance} % -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Description of (in)activation is added.} % % Since drawing dash-lines is a hard job, you have to be patient with the @@ -697,7 +731,7 @@ % % \changes{v1.5-1}{2000/07/12} % {Section 2.7 is added.} -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Description of characters and commands of \textsf{array} package is % added.} % \SpecialOptIndex{array}{package} @@ -810,7 +844,7 @@ % % \DescribeEnv{longtable} % \DescribeEnv{Longtable} -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Description of \textsf{longtable} is added.} % \SpecialOptIndex{longtable}{package} % Usage of \textsf{longtable} with \textsf{arydshln} is quite simple. Just @@ -895,7 +929,7 @@ % that to draw at the right edge cannot be followed by `|@{|\meta{text}|}|'. % % \item\leavevmode -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Description about `\protect\EXCLAMATION' of array package is added.} % % If you use \textsf{array} package, the restriction of `|@|' shown above is @@ -906,15 +940,13 @@ % end, i.e. a dash-line always begins and ends with a dash segment, the % amount of a gap will slightly vary depending on the dash-line length. % -% \item -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Reference to the section for drawing mode is added.} -% -% As described in \S\ref{sec:usage-finer}, dash-lines drawn in the default -% mode 1 may lack a dash segment near its right\slash bottom end. +% \changes{v1.72-2}{1999/06/25} +% {Remove the caution about the dash segment dropping.} % % \item -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Description on minimum length is added.} % % If a dash-line is too short, you will have an ugly result without overfull @@ -924,7 +956,7 @@ % $1.5\times|\dashlinedash|+ |\dashlinegap|$. % % \item -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Reference to the performance tuning section is added.} % % As described in \S\ref{sec:usage-performance}, @@ -950,20 +982,22 @@ % % \IndexPrologue{\newpage\section*{Index} % Italicized number refers to the page where the specification of -% corresponding entry is described.} +% corresponding entry are described.} % \StopEventually{ % \section*{Acknowledgments} % -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Thank to more people.} % \changes{v1.5-3}{2003/07/11} % {Thank to Yaxin Liu.} -% \changes{v1.6-1}{2003/08/25} +% \changes{v1.6}{2003/08/25} % {Thank to people for \textsf{longtable}.} % \changes{v1.7}{2004/5/21} % {Thank to Klaus Dalinghaus and refer orignal \textsf{colortbl}.} -% \changes{v1.71-1}{2004/8/31} +% \changes{v1.71}{2004/8/31} % {Thank to Morten H\o gholm.} +% \changes{v1.72-1}{2016/03/19} +% {Thank to Ma\"ieul Rouquette.} % % 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 @@ -977,12 +1011,15 @@ % Liu who reported the incompatibility bug of \textsf{array} and % \cs{ADLinactivate}; Craig Leech who reported the incompatibility % problem with \textsf{longtable}, which was also reported by Uwe Jehmlich, -% Torge Thielemann and -% Florian Weig, and have waited for two years and a half (!) for the -% solution; and Klaus Dalinghaus who reported yet another 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. +% Torge Thielemann and Florian Weig, and had waited for two years and a +% half (!)\ for the solution; Klaus Dalinghaus who reported yet another +% 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 +% 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. % % The base implementation of \texttt{array} and \texttt{tabular} % environments, part of which the author gives new definitions referring @@ -1005,9 +1042,9 @@ % \subsection{Problems and Solutions} % \label{sec:imp-ps1} % -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {The title of section 4.1 is changed.} -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {\cs{hfil} is replaced with \cs{hss} taking the possibility of % negative wide columns into account.} % \changes{v1.7}{2004/5/21} @@ -1131,7 +1168,7 @@ % row. % % \item -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Description of \textit{discard} is added.} % In |longtable| environment, ${\it discard}(h_i)$ for a negative vertical % space inserted by |\\[|\meta{$h_i$}|]| or |\h(dash)line| meaning $r_i$ @@ -1182,18 +1219,18 @@ % With these definitions, we can classify all $e^i_j$ into ordered sets % $S_1,S_2,\ldots S_n$ as follows. % -% \def\PH{\phantom{^\forall e^i_j\in S_k,\forall e^{i'}_{j'}\in S_{k'}(}} +% \def\PH{\phantom{^\forall e^i_j\in S_k,\forall e^{i'}_{j'}\in S_{k'}:{}}} % \begin{eqnarray*} % k\neq k'&\togets& % S_k\cap S_{k'}=\emptyset\\ % e^i_j\sim e^{i'}_{j'}&\togets& -% ^\exists k(e^i_j,e^{i'}_{j'}\in S_k\LAND +% ^\exists k:e^i_j,e^{i'}_{j'}\in S_k\LAND % S_k=\{\ldots,e^i_j,e^{i'}_{j'},\ldots\}\\ % kp^{i'}_{j'})\LOR\\ -% && \PH (c^i_j=c^{i'}_{j'}\LAND p^i_j=p^{i'}_{j'}\LAND i1}&=& @@ -1266,8 +1303,12 @@ % % % -% \subsection{Another Problem and Imperfect Solutions} +% \subsection{Another Old Problem} % \label{sec:imp-ps2} +%  +% \changes{v1.72-2}{1999/06/25} +% {Change the title of \S4.2 and rephrase sentences according to the +% fix of \cs{xleader}'s problem.} % % In the default mode 1, we draw a dash line of dash size $d$ and gap size % $g$ as follows. Let $W$ be the length of the line plus 10\,|sp|\footnote{ @@ -1309,13 +1350,13 @@ % G_{n-1}(g+\epsilon)D_n(d)G_n(g+\epsilon')D_{n+1}(d/2) % \end{eqnarray*} % -% The problem is that $\epsilon'$ could be negative and \TeX{} mistakingly -% ignores this possibility. That is, since \TeX{} does not put |\hbox| -% beyond the right edge of |\xleaders|, the rightmost |\hbox| is omitted if -% $\epsilon'$ is negative as described in \S\ref{sec:usage-finer}. +% The problem is that $\epsilon'$ could be negative and old \TeX{} mistakingly +% ignored this possibility. That is, since the \TeX{} older than 3.141592 +% did not put |\hbox| beyond the right edge of |\xleaders|, the rightmost +% |\hbox| was omitted if $\epsilon'$ is negative. % % Since it is (almost) impossible to know the length of a horizontal line, -% we cannot cope with this problem by adding or subtracting its length. +% we could not cope with this problem by adding or subtracting its length. % Thus we introduced {\em drawing mode} to have imperfect solutions. In the % mode 2, we draw a line by the following sequence. % @@ -1398,7 +1439,7 @@ % % \item % \begin{macro}{\ifadl@zwvrule} -% \changes{v1.4-3-2}{1999/06/25} +% \changes{v1.4-2-2}{1999/06/25} % {Introduced to indicate vertical lines have null width.} % |\ifadl@zwvrule| controls the {\em real} width of vertical lines. If it % is true, lines are drawn as if their width is zero following \LaTeX's @@ -1421,7 +1462,7 @@ % % \item % \begin{macro}{\ifadl@usingarypkg} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced to know if \textsf{array} is loaded.} % |\ifadl@usingarypkg| is true iff \textsf{array} has been loaded prior to % \textsf{arydshln}. This switch shows us which definitions, by \LaTeX{} or @@ -1431,7 +1472,7 @@ % % \item % \begin{macro}{\ifadl@inactive} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to indicate dash-line functions are inactive.} % |\ifadl@inactive| inactivates dash-line functions if it is true. Its % default value is false. @@ -1466,10 +1507,10 @@ % \end{macro}\end{macro} % % \begin{macro}{\ADLnullwidehline} -% \changes{v1.4-3-2}{1999/06/25} +% \changes{v1.4-2-2}{1999/06/25} % {Introduced to make vertical lines null wide.} % \begin{macro}{\ADLsomewidehline} -% \changes{v1.4-3-2}{1999/06/25} +% \changes{v1.4-2-2}{1999/06/25} % {Introduced to make vertical lines \cs{arraydashline} wide.} % The switch |\ifadl@zwvrule| is turned on/off by user interface macros % |\ADLnullwidehline| and |\ADLsomewidehline|. Its initial value is false. @@ -1515,14 +1556,15 @@ % % \begin{macro}{\adl@heightsave} % \begin{macro}{\adl@depthsave} -% Since we have to update these register |\global|-ly to pass their value +% Since we have to update these registers |\global|-ly to pass their values % across |&| and we may have a column containing |array|\slash|tabular|, % they are saved into |\adl@heightsave|\slash|\adl@depthsave| at the % beginning of the environment and are restored at its end. % \end{macro}\end{macro} % +% \item % \begin{macro}{\adl@finaldepth} -% \changes{v1.4-3-6}{1999/06/25} +% \changes{v1.4-2-6}{1999/06/25} % {Introduced to measure the depth of the last row.} % The other |\dimen| register |\adl@finaldepth| is set to the depth of the % last row, or zero if the last vertical item is a horizontal line. This @@ -1549,7 +1591,7 @@ % \item % \begin{macro}{\adl@columns} % \begin{macro}{\adl@ncol} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced for new column counting in preamble construction.} % |\adl@columns| has the number of columns specified in the preamble of the % environment. Because of a complicated reason related to the compatibility @@ -1633,7 +1675,7 @@ % \end{macrocode} % % \begin{macro}{\adl@everyvbox} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced for a tricky modification of \cs{@array}.} % The last register declaration is for a |\toks| register named % |\adl@everyvbox|. In order to minimize the copy-and-modify of the codes @@ -1648,33 +1690,33 @@ % \end{macrocode} % % \begin{macro}{\adl@org@arrayclassz} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{@arrayclassz}.} % \begin{macro}{\adl@org@tabclassz} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{@tabclassz}.} % \begin{macro}{\adl@org@classz} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{@classz}.} % \begin{macro}{\adl@org@@startpbox} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{@@startpbox}.} % \begin{macro}{\adl@org@@endpbox} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{@@endpbox}.} % \begin{macro}{\adl@org@endpbox} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{@endpbox}.} % \begin{macro}{\adl@org@cline} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to restore \cs{cline}.} -% \changes{v1.4-3-6}{1999/06/25} +% \changes{v1.4-2-6}{1999/06/25} % {Introduced to refer original version in modified \cs{cline}.} -% The other declarative stuffs are the sequence of |\let| to capture the -% original definitions of macros that we will modify afterword. The main -% purpose of them is to nullify the modification when dash-line functions -% are inactive, while |\adl@org@cline| is also referred in its modified -% version. +% The other declarative stuff consists of the sequence of |\let| to capture +% the original definitions of macros that we will modify afterword. The +% 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} % % \begin{macrocode} @@ -1695,10 +1737,10 @@ % \label{sec:imp-init} % % \begin{macro}{\adl@array} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced to save original definition of \cs{@array}.} % \begin{macro}{\@array} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Drastically modified to avoid copy-and-modify.} % \begin{macro}{\adl@noalign} % \changes{v1.7-2}{2004/5/21} @@ -1715,10 +1757,11 @@ % \textsf{array} does globally exploiting the fact that the lifetime of % |\@preamble| ends before another |array|\slash|tabular| appears in a % column. The latter implementation will work well unless the building -% process in |\@mkpream| produces something referred after |\@preamble| is -% thrown into \TeX's {\em stomach}. In our implementation, unfortunately, -% the number of columns has to be counted in \break|\@mkpream| and will be -% referred by |\hdashline| and the vertical line drawing procedure. +% process in |\@mkpream| produces something referred to after |\@preamble| +% is thrown into \TeX's {\em stomach}. In our implementation, +% unfortunately, the number of columns has to be counted in +% \break|\@mkpream| and will be referred to by |\hdashline| and the vertical +% line drawing procedure. % % Thus we have to change the column counting mechanism depending on whether % or not \textsf{array} is in use. The simplest way could be to copy the codes @@ -1732,7 +1775,7 @@ % Therefore, we use a trick with |\everyvbox| in which |\adl@arrayinit| is % temporarily included to initialize registers and locally set % |\adl@columns| to the number of columns |\global|-ly counted by -% |\adl@ncol|. This trick work well so far because; +% |\adl@ncol|. This trick works well so far because; % % \begin{itemize} % \item @@ -1765,7 +1808,7 @@ % \end{macro}\end{macro}\end{macro} % % \begin{macro}{\@@array} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced because \textsf{array} uses it.} % % \SpecialIndex{\@tabarray} @@ -1789,7 +1832,7 @@ % \end{macrocode} % % \begin{macro}{\adl@arrayinit} -% \changes{v1.4-3-9}{1999/06/25} +% \changes{v1.4-2-9}{1999/06/25} % {The bug of saving \cs{adl@colsR} is fixed.} % \changes{v1.5-1}{2000/07/12} % {Use new macro \cs{adl@arraysave} to save registers/structures.} @@ -1838,7 +1881,7 @@ % % \begin{macro}{\adl@connect} % \begin{macro}{\adl@discard} -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Add initializetion of \cs{adl@discard}.} % \SpecialIndex{\@elt} % \SpecialOptIndex{longtable}{environment} @@ -1858,7 +1901,7 @@ % |longtable| environment. % \end{macro}\end{macro} % -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified for new column counting in preamble construction.} % % Then, we set to |\adl@columns| to the value of |\adl@ncol| {\em locally}. @@ -1867,7 +1910,7 @@ % \textsf{array}, on the other hand, this assignment has no effect but safe % because it is included in a group of |\vbox| etc. % -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Modified to call \cs{adl@inactivate}.} % \changes{v1.5-3}{2003/07/11} % {Move \cs{adl@inactivate} from \cs{adl@arrayinit} to \cs{@array}.} @@ -1903,7 +1946,7 @@ % \end{macrocode} % % \begin{macro}{\adl@inactivate} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to inactivate \cs{@arrayclassz} etc.} % \changes{v1.5-3}{2003/07/11} % {Change \cs{adl@inactivate} caller to \cs{@array}.} @@ -1946,12 +1989,11 @@ % % 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 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 +% 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 @@ -1983,8 +2025,8 @@ % |\adl@vlineR| % \end{itemize} % Note that we have to inactivate both |\adl@@vlineL| and |\adl@vlineL|, -% because the latter is referred when \textsf{array} is in use while the -% former is referred otherwise. Their |R| relatives are also inactivated by +% because the latter is referred to when \textsf{array} is in use while the +% former is done otherwise. Their |R| relatives are also inactivated by % the same reason. % \end{macro} % @@ -2106,7 +2148,7 @@ %%^L % \end{macrocode} % -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Add a summary of activation/inactivation.} % The summary of the activation and inactivation is shown in % Table~\ref{tab:act}. @@ -2196,9 +2238,9 @@ % \meta{vline}&::=& % [\cs{hskip}\cs{doublerulesep}]\meta{vline-LR}\\ % \meta{vline-LR}&::=& -% \cs{adl@vlineL}\Meta{$\G_d$}\Meta{$\G_g$}Meta{c} +% \cs{adl@vlineL}\Meta{$\G_d$}\Meta{$\G_g$}\Meta{c} % \hbox{{\tt\char`\{}\meta{d}/\meta{g}{\tt\char`\}}}\ |\\ -% && \cs{adl@vlineR}\Meta{$\G_d$}\Meta{$\G_g$}Meta{c} +% && \cs{adl@vlineR}\Meta{$\G_d$}\Meta{$\G_g$}\Meta{c} % \hbox{{\tt\char`\{}\meta{d}/\meta{g}{\tt\char`\}}}\\ % \meta{d}&::=& % 0\ |&\hbox to.3\textwidth{\ldots\ for `\texttt{|}'\hfil}\cr @@ -2238,15 +2280,15 @@ % \S\ref{sec:prob}, which is very hard to solve. Note that the measurement % of the column of `|p|' of \LaTeX{} original is done by (modified) % |\@@startpbox| and |\@@endpbox| and thus the preamble for `|p|' is not -% modified. In case with \textsf{array}, however, the preambles for `|p|' -% and its relatives `|m|' and `|b|' are modified to set |\adl@box| to the -% box for them. +% modified. In the case with \textsf{array}, however, the preambles for +% `|p|' and its relatives `|m|' and `|b|' are modified to set |\adl@box| to +% the box for them. % % \begin{macro}{\adl@mkpream} % \begin{macro}{\@mkpream} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified for new column counting and control sequence redefinition.} -% \changes{v1.71-1}{2004/08/31} +% \changes{v1.71}{2004/08/31} % {Modified to nullify \cs{adl@startmbox} and \cs{adl@endmbox} for % \textsf{array's} \texttt{m}-columns.} % \SpecialIndex{\adl@colhtdp} @@ -2283,11 +2325,11 @@ % \SpecialIndex{\ifadl@leftrule} % The modified |\@mkpream| also initializes |\adl@ncol| and % |\ifadl@leftrule|, and set |\adl@columns| to the value of |\adl@ncol| -% locally after the preamble is made. This has an effect in case without -% \textsf{array} because the body of |array|\slash|tabular| is in the same -% grouping context of |\@mkpream|. With \textsf{array}, on the other hand, -% this assignment has no effect but safe because it is included in a group -% of |\@mkpream|'s own. +% locally after the preamble is made. This has an effect in the case +% without \textsf{array} because the body of |array|\slash|tabular| is in +% the same grouping context of |\@mkpream|. With \textsf{array}, on the +% other hand, this assignment has no effect but safe because it is included +% in a group of |\@mkpream|'s own. % \end{macro}\end{macro} % % \begin{macrocode} @@ -2304,19 +2346,19 @@ % \end{macrocode} % % \begin{macro}{\@addamp} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified for new column counting in preamble construction.} % \SpecialIndex{\adl@currentcolumn} % \SpecialIndex{\adl@ncol} % % The macro |\@addamp| is also modified to add the code for incrementing the % counter |\adl@currentcolumn| to |\@preamble| with |&|. The counter -% |\adl@ncol| is also incremented by |\@addamp| so that we can refer its +% |\adl@ncol| is also incremented by |\@addamp| so that we can refer to its % value as \meta{c} of |\adl@vlineL|\slash|R|\@. This increment is done % |\global|-ly in order that we locally set |\adl@columns| to the counting % result outside of the group for |\@mkpream| of \textsf{array}. Therefore, % whether or not \textsf{array} is in use, |\adl@columns| will have a -% correct value and will be correctly referred by |\hdashline| to know how +% correct value and will be correctly referred to by |\hdashline| to know how % many columns are specified in the preamble. Note that this |\global| % assignment is safe because the life time of |\adl@ncol| is same as that of % |\@preamble|. @@ -2338,7 +2380,7 @@ % \subsubsection*{With \textsf{array}} % % \begin{macro}{\@testpach} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {The version for \textsf{array} is introduced.} % \SpecialIndex{\@arrayrule} % \SpecialIndex{\adl@arrayrule} @@ -2387,9 +2429,9 @@ % \end{macrocode} % % \begin{macro}{\@classz} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced because \textsf{array} uses it.} -% \changes{v1.71-1}{2004/08/31} +% \changes{v1.71}{2004/08/31} % {Modified to call \cs{adl@startmbox} and \cs{adl@endmbox} for % \textsf{array}'s \texttt{m}-columns.} % \SpecialIndex{\adl@putlrc} @@ -2401,9 +2443,9 @@ % named |\@classz|, which also generates the preamble for `|p|', `|m|' and % `|b|'. Thus we modify it to measure the height and depth of the % class-0 column by the macro |\adl@putlrc|, and to set |\adl@box| to the -% box for `|p|' and its relatives. Note that |m|-type preambles -% (|@chnum|${}=3$) have to be generated by |\adl@startmbox| and -% |\adl@endmbox| because a |\vcenter| construct cannot be assigned by +% box for `|p|' and its relatives. Note that a |m|-type preamble +% (|@chnum|${}=3$) has to be generated to have |\adl@startmbox| and +% |\adl@endmbox| in it because a |\vcenter| construct cannot be assigned % to |\adl@box| by |\setbox| directly. % \end{macro} % @@ -2424,16 +2466,16 @@ % \end{macrocode} % % \begin{macro}{\adl@class@start} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced for class number identification.} % \begin{macro}{\adl@class@iiiorvii} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced for class number identification.} % -% Another stuffs for compatibility are to refer the class number of the +% Another stuff for compatibility is to refer to the class number for the % beginning of preamble which is different between \LaTeX{} and -% \textsf{array}, and that of `|p|' or `|@|' to get the argument of `|;|' as -% explained later. In case with \textsf{array}, the former is class-4 +% \textsf{array}, and that for `|p|' or `|@|' to get the argument of `|;|' as +% explained later. In the case with \textsf{array}, the former is class-4 % and we use `|@|' (class-7) for the latter. % \end{macro}\end{macro} % @@ -2501,10 +2543,10 @@ % \end{macrocode} % % \begin{macro}{\adl@class@start} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced for class number identification.} % \begin{macro}{\adl@class@iiiorvii} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced for class number identification.} % In \LaTeX{}, the beginning of preamble is class-6 and we use `|p|' % (class-3) to get the argument of `|;|'. @@ -2538,21 +2580,21 @@ % \end{macrocode} % % \begin{macro}{\adl@arrayrule} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified to replace \cs{adl@columns} with \cs{adl@ncol}.} % \begin{macro}{\adl@arraydashrule} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified to replace \cs{adl@columns} with \cs{adl@ncol}.} % \begin{macro}{\adl@argarraydashrule} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified to replace \cs{adl@columns} with \cs{adl@ncol}.} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified to pretend \texttt{p} or \texttt{@} depending on if % \textsf{array} is in use.} % \begin{macro}{\adl@xarraydashrule} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified to refer \cs{adl@class@start} rather than \LaTeX's 6.} -% \changes{v1.4-3-2}{1999/06/25} +% \changes{v1.4-2-2}{1999/06/25} % {Modified to add invisible rule of \cs{arrayrulewidth} wide if % \cs{ADLsome}\penalty\exhyphenpenalty\texttt{wide}.} % \changes{v1.7-3}{2004/5/21} @@ -2614,11 +2656,11 @@ % |\adl@argarraydashrule| set |\@chclass| to |\adl@class@iiiorvii| to % pretend it is for `|p|' if \textsf{array} is not in use, or `|@|' % otherwise. Then it temporally changes the definition of |\@classv|, which -% is incidentally for the argument of `|p|' and `|@|' in case without/with +% is incidentally for the argument of `|p|' and `|@|' in the case without/with % \textsf{array} respectively, to |\adl@classvfordash| to process the % argument of `|;|' rather than that of `|p|' or `|@|'\@. Then % |\adl@classvfordash| is invoked by |\@mkpream| and it adds the argument to -% |\@preamble|. Finally, it restores the definition of |\@classv| and set +% |\@preamble|. Finally, it restores the definition of |\@classv| and sets % |\@chclass| to 1 to indicate that the last item is a vertical line % specification. % \end{macro}\end{macro} @@ -2731,7 +2773,7 @@ % added to the head of |\adl@colsR| for $C^R_i$ because it is processed % right-to-left manner. The argument \meta{d} and \meta{g} are extracted by % the macro |\adl@ivline| which converts given dimensional values of them to -% integers. It also set \meta{d} and \meta{g} to 0 (i.e. solid-line) if one +% integers. It also sets \meta{d} and \meta{g} to 0 (i.e. solid-line) if one % of given values are not positive, in order to make it sure that one dash % segment has positive length. Then it invokes |\adl@setcolor| to define % |\adl@dashcolor| and |\adl@gapcolor| with the color specification of @@ -2767,22 +2809,22 @@ % \end{macrocode} % % \begin{macro}{\adl@colhtdp} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Initialized by calling \cs{adl@preaminit}.} % \begin{macro}{\adl@vlineL} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Initialized by calling \cs{adl@preaminit}.} % \begin{macro}{\adl@vlineR} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Initialized by calling \cs{adl@preaminit}.} % \SpecialIndex{\adl@preaminit} % % After |\adl@@colhtdp|, |\adl@@vlineL| and |\adl@@vlineR| are defined, % we call |\adl@preaminit| to |\let| their single |@| counterparts be equal -% to them. Therefore, in case with \textsf{array}, |\adl@colhtdp| etc.\ are -% temporarily |\relax| when |\@preamble| is being generated in the group of -% |\@mkpream|, and regain their own definition outside the group where -% the completed |\@preamble| is referred. +% to them. Therefore, in the case with \textsf{array}, |\adl@colhtdp| etc.\ +% are temporarily |\relax| when |\@preamble| is being generated in the group +% of |\@mkpream|, and regain their own definitions outside the group where +% the completed |\@preamble| is referred to. % \end{macro}\end{macro}\end{macro} % % \begin{macrocode} @@ -2791,7 +2833,7 @@ % \end{macrocode} % % \begin{macro}{\adl@inactivevl} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to emulate `\texttt{:}' and \texttt{;} by % \protect\VERTBAR.} % \changes{v1.7-3}{2004/5/21} @@ -2800,7 +2842,7 @@ % % If |\ADLinactivate| is in effect, |\adl@vlineL|\slash|R| and % |\adl@@vlineL|\slash|R| are |\let|-equal -% to |\adl@inactivevl|. This macro simply put a |\vrule| by |\vline| with +% to |\adl@inactivevl|. This macro simply puts a |\vrule| by |\vline| with % |\color| (or |\relax|) in its first argument and % with\slash without negative |\hskip| of a half of |\arrayrulewidth| wide % depending on |\ifadl@zwvrule|, discarding other arguments. @@ -2816,13 +2858,13 @@ % \begin{macro}{\@@startpbox} % \begin{macro}{\@@endpbox} % \begin{macro}{\@endpbox} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced because \textsf{array} uses it.} % \begin{macro}{\adl@startmbox} -% \changes{v1.71-1}{2004/08/31} +% \changes{v1.71}{2004/08/31} % {Introduced to the bug fix of \textsf{array}'s \texttt{m}-columns.} % \begin{macro}{\adl@endmbox} -% \changes{v1.71-1}{2004/08/31} +% \changes{v1.71}{2004/08/31} % {Introduced to the bug fix of \textsf{array}'s \texttt{m}-columns.} % \SpecialIndex{\@finalstrut} % \SpecialIndex{\@startpbox} @@ -2871,15 +2913,15 @@ % \label{sec:imp-mc} % % \begin{macro}{\multicolumn} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified for several reason.} % \begin{macro}{\adl@preamble} % \begin{macro}{\adl@mcaddamp} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced for the complaint on multiple columns if with % \textsf{array}.} % \begin{macro}{\adl@activatepbox} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Introduced to do nothing if with \textsf{array}.} % % The macro |\multicolumn| is modified for the followings. @@ -2931,8 +2973,8 @@ % \end{itemize} % % Note that |\adl@columns| is modified by |\@mkpream|, but it is not -% referred |\adl@mcarrayrule| etc., and its value is restored before -% referred by |\hdashline|, etc. +% referred to by |\adl@mcarrayrule| etc., and its value is restored before +% referred to by |\hdashline|, etc. % \end{macro}\end{macro}\end{macro}\end{macro} % % \SpecialIndex{\adl@arrayrule} @@ -2975,7 +3017,7 @@ % \begin{macro}{\adl@mcarrayrule} % \begin{macro}{\adl@mcarraydashrule} % \begin{macro}{\adl@mcargarraydashrule} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {Modified to pretend \texttt{p} or \texttt{@} depending on if % \textsf{array} is in use.} % \SpecialIndex{\adl@arrayrule} @@ -2985,7 +3027,7 @@ % % The preamble parts for vertical lines are constructed by the macros % |\adl@mcarrayrule|, |\adl@mcarraydashrule| and |\adl@mcargarraydashrule| -% which are passed the first argument \meta{$n$} of |\multicolumn| to know +% to which the first argument \meta{$n$} of |\multicolumn| is passed to know % the number of columns to be |\span|-ned. They are similar to their % relatives for main preamble, |\adl@arrayrule|, etc., but the arguments % \meta{$c^L$} and \meta{$c^R$} passed to |\adl@xarraydashrule| are; @@ -3022,7 +3064,7 @@ % \label{sec:imp-eor} % % \begin{macro}{\@xarraycr} -% \changes{v1.4-3-1}{1999/06/25} +% \changes{v1.4-2-1}{1999/06/25} % {The version for \textsf{array} is introduced.} % \begin{macro}{\@xtabularcr} % \begin{macro}{\@xargarraycr} @@ -3068,9 +3110,9 @@ % \end{macro}\end{macro} % % \begin{macro}{\adl@@cr} -% \changes{v1.4-3-6}{1999/06/25} +% \changes{v1.4-2-6}{1999/06/25} % {Modified to set \cs{adl@finaldepth}.} -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Modified to insert \cs{adl@discard}.} % \SpecialIndex{\@arstrutbox} % \SpecialIndex{\adl@totalheight} @@ -3138,7 +3180,7 @@ % its own form. % % Then, |\adl@finaldepth| is set to |\adl@depth| if $x$ is zero, or to zero -% otherwise (negative), in order to make the depth |array|\slash|tabular| +% otherwise (negative), in order to make the depth of |array|\slash|tabular| % equal to that of the last row. Finally, |\adl@colsL|, |\adl@colsR|, % |\adl@currentcolumn|, |\adl@height| and |\adl@depth| are reinitialized to % process the next row. @@ -3174,12 +3216,12 @@ % \label{sec:imp-hline} % % \begin{macro}{\hline} -% \changes{v1.4-3-6}{1999/06/25} +% \changes{v1.4-2-6}{1999/06/25} % {Modified to set \cs{adl@finaldepth} to zero.} % \changes{v1.7-1}{2004/5/21} % {Modified to shift up if null-wide.} % \begin{macro}{\cline} -% \changes{v1.4-3-6}{1999/06/25} +% \changes{v1.4-2-6}{1999/06/25} % {Modified to set \cs{adl@finaldepth} to zero.} % \changes{v1.7-1}{2004/5/21} % {Modified to shift up if null-wide.} @@ -3221,17 +3263,17 @@ % \end{macrocode} % % \begin{macro}{\hdashline} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Modified to make \cs{adl@hdashline} usable for % \cs{first}\slash\texttt{lasthdashline}.} % \begin{macro}{\adl@hdashline} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Modified to be usable for % \cs{first}\slash\texttt{lasthdashline}.} % \changes{v1.7-1}{2004/5/21} % {Modified for null-wide horizontal lines.} % \begin{macro}{\adl@ihdashline} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Introduced as the substitute of old \cs{adl@hdashline}.} % \changes{v1.7-1}{2004/5/21} % {\cs{adl@hline} is moved to \cs{adl@hdashline} for null-wide lines.} @@ -3254,7 +3296,7 @@ % \end{macro}\end{macro}\end{macro} % % \begin{macro}{\adl@inactivehdl} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to emulate \cs{hdashline} by \cs{hline}.} % \changes{v1.7-1}{2004/5/21} % {Modified to shift up if null-wide.} @@ -3324,19 +3366,19 @@ % \end{macrocode} % % \begin{macro}{\cdashline} -% \changes{v1.4-3-7}{1999/06/25} +% \changes{v1.4-2-7}{1999/06/25} % {Modified to call renamed \cs{adl@cdline}.} % \begin{macro}{\adl@cdline} -% \changes{v1.4-3-7}{1999/06/25} +% \changes{v1.4-2-7}{1999/06/25} % {Renamed and modified to call renamed \cs{adl@cdlinea}\slash % \texttt{b}.} % \changes{v1.7-1}{2004/5/21} % {Modified to shift up if null-wide.} % \begin{macro}{\adl@cdlinea} -% \changes{v1.4-3-7}{1999/06/25} +% \changes{v1.4-2-7}{1999/06/25} % {Renamed.} % \begin{macro}{\adl@cdlineb} -% \changes{v1.4-3-7}{1999/06/25} +% \changes{v1.4-2-7}{1999/06/25} % {Renamed.} % \SpecialIndex{\@cline} % \SpecialIndex{\adl@cla} @@ -3355,7 +3397,7 @@ % \end{macro}\end{macro}\end{macro}\end{macro} % % \begin{macro}{\adl@inactivecdl} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to emulate \cs{cdashline} by \cs{cline}.} % \changes{v1.7-1}{2004/5/21} % {Modified to invoke \cs{cline} rather than \cs{adl@orgcline} for @@ -3387,7 +3429,7 @@ % \end{macrocode} % % \begin{macro}{\adl@hcline} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Modified to use \cs{adl@draw}.} % \changes{v1.54-3}{2003/08/25} % {Omit \cs{vskip} if the space is 0.} @@ -3400,7 +3442,7 @@ % The macro |\adl@hcline|\meta{w}|[|\meta{d}|/|\meta{g}|]| draws a % horizontal dash-line of dash size $d$ and gap size $g$ for |\hdashline| % and |\cdashline| in the |\span|-ned columns by |\adl@draw|. As we will -% discussed in \S\ref{sec:imp-draw}, the macro requires $d$ and $g$ are +% discuss in \S\ref{sec:imp-draw}, the macro requires $d$ and $g$ are % passed through |\@tempdima| and \hbox{|\@tempdimb|}, and control sequences % \meta{rule}, \meta{skip} and \meta{box} are passed through its arguments % to make it usable for both horizontal and vertical lines. Then the @@ -3418,10 +3460,10 @@ % \end{macrocode} % % \begin{macro}{\firsthdashline} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Introduced as the dashed version of \cs{firsthline}.} % \begin{macro}{\lasthdashline} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Introduced as the dashed version of \cs{lasthline}.} % \SpecialIndex{\firsthline} % \SpecialIndex{\lasthline} @@ -3436,18 +3478,18 @@ % \end{macro}\end{macro} % % \begin{macro}{\adl@defflhdl} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Introduced for the tricky definition of \cs{adl@first}\slash % \texttt{lasthdashline}.} % \begin{macro}{\adl@idefflhdl} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Introduced for the tricky definition of \cs{adl@first}\slash % \texttt{lasthdashline}.} % \begin{macro}{\adl@firsthdashline} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Introduced as the body of \cs{firsthdashline}.} % \begin{macro}{\adl@lasthdashline} -% \changes{v1.4-3-5}{1999/06/25} +% \changes{v1.4-2-5}{1999/06/25} % {Introduced as the body of \cs{lasthdashline}.} % The macros |\adl@first|\slash|lasthdashline|, however, are defined in a % tricky manner to replace |\hline| in |\first|\slash|lasthline| with; @@ -3518,7 +3560,7 @@ % \end{macrocode} % % \begin{macro}{\adl@endarray} -% \changes{v1.4-3-6}{1999/06/25} +% \changes{v1.4-2-6}{1999/06/25} % {Modified to set the depth of \texttt{array}\slash\texttt{tabular} % to \cs{adl@finaldepth}.} % \begin{macro}{\adl@rows} @@ -3778,11 +3820,11 @@ % \end{itemize} % % \begin{macro}{\adl@makevlrL} -% \changes{v1.4-3-8}{1999/06/25} +% \changes{v1.4-2-8}{1999/06/25} % {Modified to replace \cs{hfil} with \cs{hss} to prevent drawing % vertical lines widen columns.} % \begin{macro}{\adl@makevlrR} -% \changes{v1.4-3-8}{1999/06/25} +% \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 @@ -4017,9 +4059,9 @@ % \changes{v1.54-1}{2003/08/25} % {Introduced to draw vertical lines correctly if \cs{ADLsomewide}.} % \begin{macro}{\adl@@vl} -% \changes{v1.4-3-2}{1999/06/25} +% \changes{v1.4-2-2}{1999/06/25} % {Modified to make vertical line null wide only if \cs{ADLnullwide}.} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Modified to use \cs{adl@draw}.} % \changes{v1.54-1}{2003/08/25} % {Insert a negative skip to left/right of the line if \cs{ADLsomewide}.} @@ -4070,7 +4112,7 @@ % draw a dash line in the |\vbox| is analogous to that for holizontal 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 draw a vertical rule setting $\gamma_c$ by |\set@color| +% gaps is done by drawing a vertical rule setting $\gamma_c$ by |\set@color| % prior to dash line drawing if $\gamma_c$ is not |\relax|. To color % dashes or solid line, |\set@color| with $\delta_c$ is done if it is not % |\relax| before line drawing. @@ -4114,14 +4156,14 @@ % % \subsection{Drawing Dash-lines} % \label{sec:imp-draw} -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Section 4.12 is added.} % % \begin{macro}{\adl@vrule} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Introduced to draw a dash for horizontal lines in \cs{adl@draw}.} % \begin{macro}{\adl@hrule} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Introduced to draw a dash for vertical lines in \cs{adl@draw}.} % As explained later, horizontal and vertical lines are drawn by a common % macro |\adl@draw| to which the length of a dash segment, $d$, is passed @@ -4140,16 +4182,16 @@ % \end{macrocode} % % \begin{macro}{\adl@drawi} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Introduced as \cs{adl@draw} in mode 1.} % \begin{macro}{\adl@drawii} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Introduced as \cs{adl@draw} in mode 2.} % \begin{macro}{\adl@drawiii} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Introduced as \cs{adl@draw} in mode 3.} % \begin{macro}{\adl@draw} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Introduced as the mode and axis independent line drawing macro.} % \SpecialIndex{\xleaders} % \SpecialIndex{\cleaders} @@ -4222,7 +4264,7 @@ % \end{macrocode} % % \begin{macro}{\ADLdrawingmode} -% \changes{v1.4-3-4}{1999/06/25} +% \changes{v1.4-2-4}{1999/06/25} % {Introduced to specify drawing mode.} % The macro |\ADLdrawingmode|\Meta{m} defines the drawing mode by |\let|-ing % |\adl@draw| be equal to |\adl@drawi| if $m=1$, and so on. If \meta{m} is @@ -4244,20 +4286,20 @@ % % \subsection{Shorthand Activation} % \label{sec:imp-sh} -% \changes{v1.4-2}{1999/06/25} +% \changes{v1.4-1}{1999/06/25} % {Section 4.13 is added.} % % \begin{macro}{\adl@Array} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced as the body of \cs{Array}.} % \begin{macro}{\adl@Tabular} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced as the body of \cs{Tabular}.} % \begin{macro}{\adl@Tabularstar} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced as the body of \cs{Tabular*}.} % \begin{macro}{\adl@Longtable} -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Introduced as the body of \cs{Longtable}.} % \SpecialIndex{\array} % \SpecialIndex{\tabular} @@ -4284,7 +4326,7 @@ % % \begin{macro}{\@notdefinable} % \begin{macro}{\adl@notdefinable} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to check if \cs{Array} etc. are definable.} % \SpecialIndex{\@ifdefinable} % @@ -4311,28 +4353,28 @@ % \end{macrocode} % % \begin{macro}{\Array} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced as the always-active \cs{array}.} % \begin{macro}{\Tabular} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced as the always-active \cs{tabular}.} % \begin{macro}{\Tabular*} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced as the always-active \cs{tabular*}.} % \begin{macro}{\Longtable} -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Introduced as the always-active \cs{longtable}.} % \begin{macro}{\endArray} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to \cs{end} the environment \texttt{Array}.} % \begin{macro}{\endTabular} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to \cs{end} the environment \texttt{Tabular}.} % \begin{macro}{\endTabular*} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to \cs{end} the environment \texttt{Tabular*}.} % \begin{macro}{\endLongtable} -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {Introduced to \cs{end} the environment \texttt{Longtable}.} % \SpecialIndex{\PackageWarning} % \SpecialIndex{\@warning} @@ -4385,9 +4427,9 @@ % \end{macrocode} % % \begin{macro}{\ADLnoshorthanded} -% \changes{v1.4-3-3}{1999/06/25} +% \changes{v1.4-2-3}{1999/06/25} % {Introduced to nullify macros for shorthand activation.} -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {\cs{Longtable} and \cs{endLongtable} are added.} % If a user wishes to define an environment named |Array| or |Tabular(*)| % (or |Longtable| if \textsf{longtable} is in use) by him/herself or by @@ -4505,7 +4547,7 @@ % twice by |\CC@| to update |\global| registers/structures incorrectly. % % Thus we modify |\CC@|, if the package \textsf{colortab} is provided, to -% save |\global| stuffs by |\adl@arraysave| before the height measurement and +% save |\global| stuff by |\adl@arraysave| before the height measurement and % restore them by |\adl@arrayrestore| after that. % \end{macro}\end{macro} % @@ -4539,7 +4581,7 @@ % \subsection{Compatibility with \textsf{longtable}} % \label{sec:imp-longtable} % -% \changes{v1.6-1}{2003/8/25} +% \changes{v1.6}{2003/8/25} % {\S\ref{sec:imp-longtable} is added.} % % \SpecialOptIndex{longtable}{package} @@ -4598,7 +4640,7 @@ % \end{macrocode} % % Next, we skip everything if \textsf{longtable} is not in use, or -% we have undefined-error when we refer the definitions in it. Note that +% we have undefined-error when we refer to the definitions in it. Note that % since |\newif| cannot be in the |\ifx|\slash|\fi| construct, the % declarations above are excluded. % @@ -4699,11 +4741,19 @@ % \SpecialIndex{\@endpbox} % \SpecialIndex{\@@endpbox} % \SpecialIndex{\LT@startpbox} +% \SpecialIndex{\adl@endmbox} +% \SpecialIndex{\adl@@endmbox} +% \SpecialIndex{\adl@LTendmbox} % +% \changes{v1.72-1}{2016/03/19} +% {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.} +%  % The macro |\LT@make@row| is redefined for additional initialization which % must be done after the original |\LT@array| performs its own % initialization. First, |\LT@make@row| itself is reset to its original -% version |\adl@org@LT@make@row| to initialize stuffs only once, since +% 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 @@ -4711,7 +4761,10 @@ % 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|. Finally, the original version +% 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} % @@ -4724,6 +4777,8 @@ \let\@startpbox\adl@LTstartpbox \fi \let\@@endpbox\adl@LTendpbox \let\@endpbox\adl@LTendpbox + \let\adl@@endmbox\adl@endmbox + \let\adl@endmbox\adl@LTendmbox \adl@org@LT@make@row} %%^L @@ -4740,14 +4795,21 @@ % \def\!{\texttt{\char`\\\char`\\}} % \centerline{\begin{tabular}[t]{|l||l|l|}\hline % command&active&inactive\\\hline\hline -% {\tt p m b} (open)&&\\ +% {\tt p b} (open)&&\\ % \qquad with \textsf{array}& \cs{adl@act@classz}& % \cs{adl@org@classz}\\ % & \quad$\to$\cs{LT@startpbox}& % \quad$\to$\cs{LT@startpbox}\\ % \qquad without \textsf{array}&\cs{adl@LTstartpbox}& % \cs{LT@startpbox}\\\hline -% {\tt p m b} (close)& \cs{adl@LTendpbox}& +% {\tt m} (open)& \cs{adl@act@classz}& +% \cs{adl@org@classz}\\ +% & \quad$\to$\cs{adl@startmbox}& +% \quad$\to$\cs{LT@startpbox}\\ +% & \quad$\to$\cs{LT@startpbox}&\\\hline +% {\tt p b} (close)& \cs{adl@LTendpbox}& +% \cs{LT@endpbox}\\\hline +% {\tt m} (close)& \cs{adl@LTendmbox}& % \cs{LT@endpbox}\\\hline % \cs{hline}& $\to$\cs{adl@act@hline}& % $\to$\cs{@gobbletwo}\\\hline @@ -4901,7 +4963,7 @@ % addition by |\adl@LTlastrow|, then traverses |\adl@rowsL|\slash|R| adding % its non-last elements to |\@tempb| by the loop of |\adl@LTkill|, and % assigns |\@tempb| to |\adl@rowsL|\slash|R| globally by -% |\adl@LTkillend| when |\adl@LTkill| find the tail. The macro +% |\adl@LTkillend| when |\adl@LTkill| finds the tail. The macro % |\adl@LTkillend| also sets the $h_i$ of the last element to |\@tempcnta|, % which is subtracted from |\adl@totalheight| globally. Finally, the % original version |\adl@org@LT@kill| is called. @@ -5053,6 +5115,10 @@ % % \begin{macro}{\adl@LTstartpbox} % \begin{macro}{\adl@LTendpbox} +% \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{\@@endpbox} @@ -5060,22 +5126,30 @@ % \SpecialIndex{\adl@act@@startpbox} % \SpecialIndex{\adl@act@@endpbox} % -% Macros for opening/closing |p|-boxes are fairly simple. The macros -% |\adl@LTstartpbox{|\meta{w}|}| and |\adl@LTendpbox| are |\let|-assigned -% to |\@@startpbox| and |\@@endpbox| by |\LT@make@row|. The former -% opens a |p|-box of $w$ wide by our own -% |\adl@act@@startpbox| and performs a footnote related operation introduced -% by \textsf{longtable}. The latter closes the |p|-box by our own -% |\adl@act@@endpbox| and also performs the footnote stuffs. Note that if +% 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|. -% \end{macro}\end{macro} +% |\@startpbox|${}={}$|\LT@startpbox|, unnecessitating our own version of +% opening macros. +% +% 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. +% \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@LTendmbox{\adl@@endmbox \the\LT@p@ftn \global\LT@p@ftn{}} %%^L % \end{macrocode} @@ -5117,7 +5191,7 @@ % % \item % The box |\LT@firsthead| is put by |\copy| rather than |\box| because it is -% referred in the |\output| routine. +% referred to in the |\output| routine. % \end{itemize} % % This macro does not have inactive counterpart because the modification @@ -5196,7 +5270,7 @@ % put to the main vertical list if the |longtable| portion is the last one. % % \item -% Since the boxes |\LT@head|, |\LT@foot| and |\LT@lastfoot| are referred in +% Since the boxes |\LT@head|, |\LT@foot| and |\LT@lastfoot| are referred to in % |\adl@LTdraw|, they are put by |\copy| rather than |\box|. % \end{itemize} % \end{macro}\end{macro} @@ -5345,7 +5419,7 @@ % Then the rows are put into |\box0| by calling |\LT@bchunk| with % |\adl@drawvl| (line drawing) and |\LT@save@row| (column widths % adjustment), saving\slash restoring counters |\LT@rows| and |\c@LT@chunks| -% which |\LT@bchunk| globally updates. Since we refer potentially +% which |\LT@bchunk| globally updates. Since we refer to potentially % immature |\LT@save@row| here, some weird looking vertical lines could be % drawn but the result after convergence should be correct. Finally, the % contents of |\box255| followed by the vertical lines in |\box0| are put @@ -5550,7 +5624,7 @@ % |\CT@arc@| has been defined before the environment starts, vertical lines % are colored following the outside definition. Otherwise, since |\CT@arc@| % is |\let|-equal to |\relax|, it remains unchanged in the preamble -% construction phase and expanded when each row is build referring its +% construction phase and expanded when each row is build referring to its % definition that |\arrayrulecolor| modifies in the row building phase. % Since the macro |\CT@drsc@| defined by |\doublerulesepcolor| is examined % if it is |\relax| or not in the preamble construction phase, @@ -5575,7 +5649,7 @@ % First of all, we initialize the macro |\CT@arc@|, which will be % |\def|-ined as |\color| to specify the color of solid lines and dash % segments by |\arrayrulecolor|, with a body of |\relax| because it will be -% referred by the vertical line drawing process even if \textsf{colortbl} is +% referred to by the vertical line drawing process even if \textsf{colortbl} is % not in use. We also initialize the macro |\adl@dashgapcolor| for the % color of gaps of dash lines similarly. Note that these macros are not % |\let|-equal to |\relax| but have bodies of |\relax| so that they are @@ -5783,7 +5857,7 @@ % |\multispan|-ned row from the column $f$ to $t$ and |\global|-ly defines % it as |\@gtempa|. This is done by a code very similar to original % |\adl@cdline| (and thus \LaTeX-2.09's |\cline|) but the invocation of -% |\adl@hcline| is removed form |\adl@cdliena| and |\adl@cdlineb|, one of +% |\adl@hcline| is removed from |\adl@cdliena| and |\adl@cdlineb|, one of % which is |\@gtempa|. % \end{macro}\end{macro}\end{macro} % @@ -5808,8 +5882,8 @@ % |\relax|. If so, i.e.\ it has |\color|, % |\adl@paintdashgap| is invoked to % draw a horizontal rule of |\color| by |\leaders| as the background -% of the dash line, to insert |\nobreak| (for \textsf{longtable}) a negative -% space for canceling the width of the +% of the dash line, to insert |\nobreak| (for \textsf{longtable}) and a +% negative space for canceling the width of the % rule, and to |\span| the columns again. Then |\adl@hcline| draws the % colored dash line, over the background if the gaps are colored, by % inserting |\CT@arc@| before the invocation of |\adl@draw|. @@ -6074,7 +6148,7 @@ % % \IndexPrologue{\newpage\section*{Index} % Italicized number refers to the page where the specification and usage of -% corresponding entry is described, while underlined is for the +% corresponding entry are described, while underlined is for the % implementation of the entry. % % To find a control sequence, remove prefixes \cs{@}, \cs{adl@} and diff --git a/Master/texmf-dist/tex/latex/arydshln/arydshln.sty b/Master/texmf-dist/tex/latex/arydshln/arydshln.sty index 2ce54e77865..2a62b393215 100644 --- a/Master/texmf-dist/tex/latex/arydshln/arydshln.sty +++ b/Master/texmf-dist/tex/latex/arydshln/arydshln.sty @@ -21,9 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% Style file `arydshln' -%% Copyright (C) 1993,1998-2004 -%% Hiroshi Nakashima -%% (Kyoto Univ. / Toyohashi Univ. of Tech.) +%% Copyright (C) 1993,1998-2016 +%% Hiroshi Nakashima +%% (Kyoto Univ.) %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN %% archives in directory macros/latex/base/lppl.txt; either @@ -50,7 +50,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{arydshln}} \else\def\next[#1]{}\fi\next -[2004/08/31 v1.71 ] +[2016/03/19 v1.72 ] %% Register Declaration \newdimen\dashlinedash \dashlinedash4pt % @@ -787,6 +787,8 @@ \let\@startpbox\adl@LTstartpbox \fi \let\@@endpbox\adl@LTendpbox \let\@endpbox\adl@LTendpbox + \let\adl@@endmbox\adl@endmbox + \let\adl@endmbox\adl@LTendmbox \adl@org@LT@make@row} %%^L @@ -867,6 +869,7 @@ \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 -- cgit v1.2.3