summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/tex4ht/array.4ht
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/tex4ht/array.4ht')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/array.4ht56
1 files changed, 40 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/array.4ht b/Master/texmf-dist/tex/generic/tex4ht/array.4ht
index 3a620293444..94187e8c5ee 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/array.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/array.4ht
@@ -1,15 +1,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% array.4ht 2007-01-03-21:02 %
-% Copyright (C) 1997--2007 Eitan M. Gurari %
+% array.4ht 2008-02-28-20:51 %
+% Copyright (C) 1997--2008 Eitan M. Gurari %
% %
% This work may be distributed and/or modified under the %
% conditions of the LaTeX Project Public License, either %
-% version 1.3 of this license or (at your option) any %
+% version 1.3c of this license or (at your option) any %
% later version. The latest version of this license is %
% in %
% http://www.latex-project.org/lppl.txt %
-% and version 1.3 or later is part of all distributions %
-% of LaTeX version 2003/12/01 or later. %
+% and version 1.3c or later is part of all distributions %
+% of LaTeX version 2005/12/01 or later. %
% %
% This work has the LPPL maintenance status "maintained".%
% %
@@ -24,7 +24,7 @@
% gurari@cse.ohio-state.edu %
% http://www.cse.ohio-state.edu/~gurari %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2007-01-03-21:02}
+\immediate\write-1{version 2008-02-28-20:51}
\def\@tabular{\leavevmode
\hbox \bgroup \:@tabular:
@@ -32,8 +32,9 @@
\let\d@llarend\endgroup
\@tabarray}
\pend:def\@tabular{\let\@array:a\a:tabular \let\@array:b\b:tabular
- \let\@array:c\c:tabular \let\@array:d\d:tabular
- \let\@array:e\e:tabular \let\@array:f\f:tabular }
+\let\@array:c\c:tabular \let\@array:d\d:tabular
+\let\@array:e\e:tabular \let\@array:f\f:tabular
+}
\def\:temp[#1]#2{%
\def\Clr{#2}\a:VBorder
\HAssign\ar:cnt0
@@ -80,8 +81,24 @@
\Configure{MkHalign}
{\@array:a}%
{\@array:b\ProperTrTrue}%
- {\a:putHBorder\InitHBorder \ifProperTr{\@array:c}}%
- {\ifProperTr{\@array:d}\a:putHBorder\InitHBorder}%
+ {\a:putHBorder\InitHBorder
+ \gHAdvance\cline:cnt by 1
+\expandafter\ifx \csname cw:cline-\cline:cnt\endcsname \relax \else
+ \Tag{Cline-\cline:cnt}{}%
+\fi
+\expandafter\ifx \csname cw:Cline-\cline:cnt\endcsname \relax \else
+ \ht:special{t4ht@[}%
+\fi
+%
+ \ifProperTr{\@array:c}}%
+ {\ifProperTr{\@array:d}%
+ \ifomit: \Tag{cline-\cline:cnt}{}\fi
+\expandafter\ifx \csname cw:Cline-\cline:cnt\endcsname \relax \else
+ \ht:special{t4ht@]}%
+\fi
+\global \omit:false
+%
+ \a:putHBorder\InitHBorder}%
{\ifProperTr{\@array:e}\RecallMkHalignConfig\recall:ar}%
{\ifProperTr{\@array:f}}
%
@@ -134,7 +151,10 @@
\ifnum \@lastchclass=8 \tw@ \else
\ifnum \@lastchclass=9 \thr@@
\else \z@
- \ifnum \@lastchclass = 10 \else
+ \ifnum \@lastchclass = 10
+ \global \expandafter\let \csname @testpach \ar:cnt\endcsname\@nextchar
+%
+ \else
\edef\@nextchar{\expandafter\string\@nextchar}%
\@chnum
\if \@nextchar c\z@ \add:ar-\else
@@ -162,27 +182,31 @@
\expandafter\string\ch:class :T:D\endcsname\relax \else \csname
\expandafter\string\ch:class :T:D\endcsname\fi}
+%
\long\def\:temp#1#2#3{%
- \multispan{#1}\begingroup
-%%%%%%%% \let\sv:ALIGN\HAlign % \let\ar:cnt:\ar:cnt
+ \multispan{#1}\a:multicolumn \begingroup
\def\@addamp{\if@firstamp \@firstampfalse \else
\@preamerr 5\fi}%
- \let\HAlign\empty \@mkpream{#2}%
+ \def\Clr{#2}\a:VBorder
+\HAssign\ar:cnt0
+\let\HAlign\empty
+%
+\@mkpream{#2}%
\ifx \EndPicture\:UnDef
\def\:temp##1 ##2 ##3 {##3}%
\xdef\new:span{\new:span\HRow.\HCol\expandafter\:temp\HAlign;}%
\fi
\@addtopreamble\@empty
\global\let\ch:class\ch:class
-%%%%%%%% \global\let\HAlign\sv:ALIGN
\xdef\:temp{%
\def\noexpand\HAlign{\HAlign}%
\def\noexpand\ar:cnt{\ar:cnt}}\aftergroup\:temp
%
\endgroup
- \def\@sharp{\a:multicolumn#3\b:multicolumn}%
+ \def\@sharp{\c:multicolumn#3\d:multicolumn}%
\@arstrut \@preamble
\null
+ \b:multicolumn
\ignorespaces}
\HLet\multicolumn\:temp