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

[mdwtools] / mdwtab.dtx

diff --git a/mdwtab.dtx b/mdwtab.dtx
index ee11ce6..6d5cfcf 100644 (file)
--- a/mdwtab.dtx
+++ b/mdwtab.dtx
@@ -44,7 +44,7 @@
 %<+color>                [2003/08/24 1.10 Fix for people who can't spell]
 % \end{meta-comment}
 %
-% \CheckSum{3391}
+% \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 @@
 \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 @@
   \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%