From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 15 May 2007 10:28:33 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/mdwtools
X-Git-Tag: 1.8.0~16
X-Git-Url: https://git.distorted.org.uk/~mdw/mdwtools/commitdiff_plain/39bf771aebd339019d1f11c0c0f60d30aab4ddc4?hp=-c

Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/mdwtools

* 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/mdwtools:
  mdwref: New package for typesetting cross-references automagically.
  mdwtab: Fix colours and \\ behaviour with longtable.
  mdwtab: Fix stupid typo.

Conflicts:

	mdwtab.dtx: fix checksum
---

39bf771aebd339019d1f11c0c0f60d30aab4ddc4
diff --combined mdwtab.dtx
index ee11ce6,3e52084..6d5cfcf
--- a/mdwtab.dtx
+++ b/mdwtab.dtx
@@@ -44,7 -44,7 +44,7 @@@
  %<+color>                [2003/08/24 1.10 Fix for people who can't spell]
  % \end{meta-comment}
  %
- % \CheckSum{3391}
 -% \CheckSum{3386}
++% \CheckSum{3404}
  %% \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
@@@ -2714,7 -2714,7 +2714,7 @@@
  \coldef <#1{\tabuserposttype{#1}}
  \coldef ?#1#2{%
    \ifx>#1\expandafter\tabuserpretype%
-   \else\expandafter\tabusrposttype\fi%
+   \else\expandafter\tabuserposttype\fi%
    {#2}%
    \tab@append\tab@shortline{#2}%
  }
@@@ -2855,7 -2855,11 +2855,11 @@@
    \tab@initread%
    \def\tab@multicol{\@arstrut}%
    \tab@preamble{\tab@multicol}%
-   \def\tab@midtext{\ignorespaces\@sharp\@sharp\@maybe@unskip}%
+   \let\tab@lefttext\tab@lefttexthook%
+   \let\tab@righttext\tab@righttexthook%
+   \let\tab@leftruletext\tab@leftruletexthook%
+   \let\tab@rightruletext\tab@rightruletexthook%
+   \def\tab@midtext{\tab@setcr\ignorespaces\@sharp\@sharp\@maybe@unskip}%
    \tab@readpreamble{#1}%
    \gdef\@preamble{\the\tab@preamble}%
    \let\tab@bgroup\begingroup%
@@@ -5577,13 -5581,9 +5581,13 @@@
  % we need to remove them by hand at the extremities of the environment.
  %
  %    \begin{macrocode}
 -\def\subsplit{%
 +\def\subsplit{\@ifnextchar[\subsplit@i{\subsplit@i[c]}}
 +\def\subsplit@i[#1]{%
 +  \let\@tempa\vcenter%
 +  \if#1t\let\@tempa\vtop\fi%
 +  \if#1b\let\@tempa\vbox\fi%
    \let\\\seq@cr%
 -  \vcenter\bgroup%
 +  \@tempa\bgroup%
    \seq@dosplit{\hfil\qquad$##$\qquad\hfil}{\hfilneg\hskip-2em}%
  }
  %    \end{macrocode}