From 3affd633834494c279f96078e95831935ea51ca7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 May 2008 00:31:48 +0000 Subject: tex4ht-1.0.2008_05_07_2048 git-svn-id: svn://tug.org/texlive/trunk@8000 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/latex.4ht | 116 ++++++++++++++++--------- 1 file changed, 77 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/latex.4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht index ebd55ab85f6..4f8243b46b2 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht @@ -1,15 +1,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% latex.4ht 2007-01-03-21:02 % -% Copyright (C) 1997--2007 Eitan M. Gurari % +% latex.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,10 +24,12 @@ % 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} \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi +\newif\ifomit: + \def\:startdoc{% \pageno=1 \let\no@document\document @@ -277,7 +279,12 @@ \def\@settodim#1#2#3{\PictureOff \:settodim#1{#2}{#3}\PictureOn} - +\edef\:temp{% + \every@math@size={\noexpand\ifx \noexpand\EndPicture\noexpand\:UnDef + \noexpand\else \the\every@math@size \noexpand\fi}% +} +\:temp + \let\document:select:group\document@select@group \def\document@select@group#1#2#3#4{% @@ -526,8 +533,10 @@ b:#1/endcsname(/bgroup /catcode`/-=13 /def/:temp####1\end{#1}(/egroup /def-(/string-/relax)% - ####1/:EndVerbatim/end(#1))% - /:temp) + ####1/:EndVerbatim% + /expandafter/def/csname end#1/endcsname()% + /end(#1))% + /:temp)% /edef/:temp(/noexpand/DefScript: /expandafter/noexpand/csname #1/endcsname (/expandafter/noexpand/csname a:#1/endcsname)% @@ -593,15 +602,17 @@ \let\o:end:\end \def\end#1{\choose:begin {%\IgnoreIndent - \ifvmode \def\:temp{\def\:temp{% + \ifvmode \ifx \EndPicture\:UnDef + \def\:temp{\def\:temp{% \def\:temp{\IgnorePar \ifx \:tempa\hline \expandafter\\\else\fi }% \futurelet\:tempa\:temp }% % - \expandafter\expandafter\expandafter\:temp} -\expandafter\:temp + \expandafter\expandafter\expandafter\:temp}% + \expandafter\:temp +\fi \fi \csname end#1\endcsname \@checkend{#1}% @@ -872,7 +883,7 @@ $\vcenter \edef\reserved@a{% \endgroup \setbox#1\hbox{% - \noexpand\PictureOff + \a:lrbox \begingroup \aftergroup}% \def\noexpand\@currenvir{\@currenvir}% \def\noexpand\@currenvline{\on@line}}% @@ -880,6 +891,7 @@ $\vcenter \@endpefalse \color@setgroup \ignorespaces} +\NewConfigure{lrbox}{1} \long\def\:tempc[#1][#2]#3{\o:@imakebox:[#1][#2]{{#3}}} \HLet\@imakebox\:tempc \let\:sbox\sbox @@ -1051,12 +1063,13 @@ $\vcenter \NewConfigure{extracolsep}[1]{\def\a:extracolsep##1{#1}} \Configure{extracolsep}{} \:CheckOption{no-array}\if:Option \else - \def\:temp{\let\@array:a\a:array \let\@array:b\b:array + \def\HColWidth{\csname @testpach \HCol\endcsname} +\def\:temp{\let\@array:a\a:array \let\@array:b\b:array \let\@array:c\c:array \let\@array:d\d:array \let\@array:e\e:array \let\@array:f\f:array \o:array:} \HLet\array\:temp \ifx \:@tabular:\:UnDef \let\:@tabular:\empty \fi -\NewConfigure{multicolumn}{2} +\NewConfigure{multicolumn}{4} \:ifpackageloaded{array}{\:Optiontrue}{} \fi @@ -1097,8 +1110,24 @@ $\vcenter \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}} % @@ -1150,8 +1179,7 @@ $\vcenter \fi \fi \fi \fi \fi \fi \fi} \HLet\@testpach\:temp -\def\add:ar#1{% - \Advance:\ar:cnt by 1 +\def\add:ar#1{\HAdvance\ar:cnt by 1 \def\ch:class{#1}% \c:VBorder \edef\HAlign{\HAlign 0 \ar:cnt\space #1 }} @@ -1159,19 +1187,23 @@ $\vcenter \expandafter\string\ch:class :T:D\endcsname\relax \else \csname \expandafter\string\ch:class :T:D\endcsname\fi} -\def\HColWidth{\csname @testpach \HCol\endcsname} -\long\def\:temp#1#2#3{\multispan{#1}\begingroup - \let\HAlign\empty \@mkpream{#2}% +% +\long\def\:temp#1#2#3{\multispan{#1}\a:multicolumn \begingroup + \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 % - \def\@sharp{\a:multicolumn#3\b:multicolumn}\set@typeset@protect + \def\@sharp{\c:multicolumn#3\d:multicolumn}\set@typeset@protect \let\@startpbox\@@startpbox\let\@endpbox\@@endpbox - \@arstrut \@preamble\hbox{}\endgroup\ignorespaces} + \@arstrut \@preamble\hbox{}\endgroup \b:multicolumn \ignorespaces} \HLet\multicolumn\:temp -\NewConfigure{multicolumn}{2} +\NewConfigure{multicolumn}{4} @@ -1326,15 +1358,19 @@ $\vcenter \gHAssign\capt:cnt0 \Configure{float}{}{}{} \long\def\:tempc#1[#2]#3{\par \cur:lbl{}% - \gHAdvance\TitleCount by 1 \begingroup \protect:wrtoc -\edef\:temp{\the\:tokwrite{\string\doTocEntry - \string\toc\expandafter\ifx\csname ext@#1\endcsname\relax + \begingroup + \gHAdvance\TitleCount by 1 + \protect:wrtoc + \edef\:temp{#2}% + \edef\:temp{\the\:tokwrite{\string\doTocEntry + \string\toc\expandafter\ifx\csname ext@#1\endcsname\relax #1\else\csname ext@#1\endcsname\fi {\csname - the#1\endcsname}{\string\csname\space a:TocLink\string\endcsname - {\FileNumber}{\cur:th - \:currentlabel}{}{\ignorespaces #2}}% - {#1}\relax}}\:temp \endgroup + the#1\endcsname}{\string\csname\space a:TocLink\string\endcsname + {\FileNumber}{\cur:th + \:currentlabel}{}{\ifx\:temp\empty\else \ignorespaces #2\fi}}% + {#1}\relax}}\:temp +\endgroup \begingroup \@parboxrestore \normalsize \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par @@ -1464,7 +1500,7 @@ $\vcenter \NewConfigure{wrindex}[1]{\concat:config\a:wrindex{#1}} \let\a:wrindex\empty -\ifx \@indexfile\:UndDef \else +\expandafter\ifx \csname @indexfile\endcsname\relax \else \let\o:wrindex:\@wrindex \def\@wrindex{\a:wrindex \o:wrindex:} \Configure{wrindex} @@ -1931,9 +1967,7 @@ $\vcenter \leavevmode \ignorespaces \fi } \def\ListParSkip{\def\:ListParSkip} -\ifHtml - \ListParSkip{\HtmlPar} -\fi +\ListParSkip{\HtmlPar} \pend:def\endtrivlist{\if@noparlist \else\ifx \EndPicture\:UnDef \ifhmode \unskip\else \vskip-\lastskip\fi \empty:D:T:D \global\let\empty:D:T:D\empty @@ -2053,7 +2087,10 @@ $\vcenter \ifdim \tmp:dim>0.98\smallskipamount \a:newline\fi \fi\vspace{#1}\newline} \else - \append:defI\@gnewline{\ifhmode \a:newline\fi} + \let\:tempc\@gnewline + \pend:defI\:tempc{\ht:special{t4ht@[}} + \append:defI\:tempc{\ht:special{t4ht@]}\ifhmode \a:newline\fi} + \HLet\@gnewline\:tempc \def\:temp[#1]{{\ifhmode\unskip \tmp:dim=#1\relax \ifdim \tmp:dim>0\smallskipamount \a:newline\fi @@ -2105,8 +2142,9 @@ $\vcenter \def\:temp#1{\tmp:dim#1\xdef\HBorderspace{\the\tmp:dim}\cr\a:vspc} \HLet\@xargarraycr\:temp \NewConfigure{//[]}[1]{\c:def\a:vspc{#1}} -\def\:temp#1-#2\@nil{\o:noalign:{\HAssign\:tempb=#1 - \set:clines{#2}}\ignoreEndTr} +\HAssign\cline:cnt=0 +\def\:temp#1-#2\@nil{\omit \global\omit:true \cr + \o:noalign:{\HAssign\:tempb=#1 \set:clines{#2}}\ignoreEndTr} \HLet\@cline\:temp \def\set:clines#1{\expandafter\gHAssign\csname :\:tempb\endcsname=1 \ifnum \:tempb<#1 \Advance:\:tempb by 1 \expandafter\set:clines -- cgit v1.2.3