From 231fc251fff6ff4c087e7678772c15875a8f91d6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Jul 2008 18:18:57 +0000 Subject: tex4ht-1.0.2008_07_05_0937 git-svn-id: svn://tug.org/texlive/trunk@9301 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht | 51 +++++++++++++++-------- 1 file changed, 34 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht index a1c6f81b87b..b0ad5ec0fd8 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% html-mml.4ht 2007-12-02-18:44 % -% Copyright (C) 1999--2007 Eitan M. Gurari % +% html-mml.4ht 2008-06-17-14:06 % +% Copyright (C) 1999--2008 Eitan M. Gurari % % % % This work may be distributed and/or modified under the % % conditions of the LaTeX Project Public License, either % @@ -24,7 +24,7 @@ % gurari@cse.ohio-state.edu % % http://www.cse.ohio-state.edu/~gurari % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2007-12-02-18:44} +\immediate\write-1{version 2008-06-17-14:06} \exit:ifnot{amsmath,% array,% @@ -149,11 +149,11 @@ tex4ht} \Configure{accents} {\ifmmode \expandafter\mathord\fi {\leavevmode -\if !#1!\ht:special{t4ht@+&{35}x#2;}% +\if !#1!\ht:special{t4ht@+\string&{35}x#2;}% \else \expandafter \ifx\csname U#2#1\endcsname\relax - \ht:special{t4ht@+&{35}x#2;}% + \ht:special{t4ht@+\string&{35}x#2;}% \else - \ht:special{t4ht@+&{35}x\csname U#2#1\endcsname;}% + \ht:special{t4ht@+\string&{35}x\csname U#2#1\endcsname;}% \fi \fi x% % \ht:special{t4ht@[}\if!#1!x\else#2\fi\ht:special{t4ht@]}}} @@ -206,8 +206,19 @@ tex4ht} } {} \Configure{halign} - {\EndP\halignTB{halign}} \t:HA - \R:HA\r:HA\D:HA\d:HA + {\EndP + \PushStack\Table:Stck\TableNo + \gHAdvance\Next:TableNo by 1 + \global\let\TableNo=\Next:TableNo + \halignTB{halign}} + {\HCode{}\PopStack\Table:Stck\TableNo} + {\HCode{<\:MT tr \Hnewline}\halignTR\HCode{ id="TBL-\TableNo-\HRow-">}} + {\HCode{}} + {\SaveEndP + \HCode{1 colspan="\HMultispan"\fi}% + \halignTD \HCode{\Hnewline id="TBL-\TableNo-\HRow-\HCol">}\ShowPar\par} + {\ifvmode \IgnorePar \fi \EndP\HCode{}\RecallEndP +} \:CheckOption{fonts} \if:Option \Configure{texttt} {\ifmathml \Configure{@mtext}{\mml:class="texttt" @@ -406,6 +417,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -604,6 +616,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -612,11 +625,11 @@ accent="true">&\#x0332;}% \Configure{accents} {\ifmmode \expandafter\mathord\fi {\leavevmode -\if !#1!\ht:special{t4ht@+&{35}x#2;}% +\if !#1!\ht:special{t4ht@+\string&{35}x#2;}% \else \expandafter \ifx\csname U#2#1\endcsname\relax - \ht:special{t4ht@+&{35}x#2;}% + \ht:special{t4ht@+\string&{35}x#2;}% \else - \ht:special{t4ht@+&{35}x\csname U#2#1\endcsname;}% + \ht:special{t4ht@+\string&{35}x\csname U#2#1\endcsname;}% \fi \fi x% % \ht:special{t4ht@[}\if!#1!x\else#2\fi\ht:special{t4ht@]}}} @@ -653,7 +666,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{array} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -704,6 +716,10 @@ accent="true">&\#x0332;}% + + + + @@ -772,11 +788,6 @@ accent="true">&\#x0332;}% - - - - - @@ -830,6 +841,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{frenchb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1082,6 +1094,11 @@ accent="true">&\#x0332;}% + + + + + -- cgit v1.2.3