From 3b0d4121fbdaa8b4dc48c1aeab08bd63d71d0307 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Dec 2006 01:23:33 +0000 Subject: tex4ht-1.0.2006_12_04_1651 git-svn-id: svn://tug.org/texlive/trunk@2598 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht | 157 ++++++++++++++++++---- 1 file changed, 131 insertions(+), 26 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 bacfcfb2717..be9209a2da8 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 2005-10-22-00:14 % -% Copyright (C) 1999--2005 Eitan M. Gurari % +% html-mml.4ht 2006-11-15-14:28 % +% Copyright (C) 1999--2006 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 2005-10-22-00:14} +\immediate\write-1{version 2006-11-15-14:28} \exit:ifnot{amsmath,% array,% @@ -38,15 +38,21 @@ tex4ht} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{tex4ht} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \def\mathml:DOCTYPE{PUBLIC + \:CheckOption{frames} \if:Option + \Configure{frames-altDOCTYPE}{\Configure{DOCTYPE}{\HCode + {\Hnewline +}} } -\def\:temp{xhtml} + \else + \def\:temp{xhtml} \ifx \:DTD\:temp \Configure{DOCTYPE}{\HCode {\Hnewline }} +\fi + \fi \Configure{halignTD} {}{} {<}{\ifmathml \HCode{ \a:mathml columnalign="left"}\else - \HCode{ align="left" style="white-space:nowrap;"}\fi} + \HCode{ style="text-align:left; white-space:nowrap;"}\fi} {-}{\ifmathml \HCode{ \a:mathml columnalign="center"}\else - \HCode{ align="center" style="white-space:nowrap;"}\fi} + \HCode{ style="text-align:center; white-space:nowrap;"}\fi} {>}{\ifmathml \HCode{ \a:mathml columnalign="right"}\else - \HCode{ align="right" style="white-space:nowrap;"}\fi} + \HCode{ style="text-align:right; white-space:nowrap;"}\fi} {^}{\ifmathml \HCode{ \a:mathml rowalign="top"}\else - \HCode{ valign="top" style="white-space:nowrap;"}\fi} + \HCode{ style="vertical-align:top; white-space:nowrap;"}\fi} {=}{\ifmathml \HCode{ \a:mathml rowalign="baseline"}\else - \HCode{ valign="baseline" style="white-space:nowrap;"}\fi} + \HCode{ style="vertical-align:baseline; white-space:nowrap;"}\fi} {|}{\ifmathml \HCode{ \a:mathml rowalign="center"}\else - \HCode{ valign="middle" style="white-space:nowrap;"}\fi} + \HCode{ style="vertical-align:middle; white-space:nowrap;"}\fi} {_}{\ifmathml \HCode{ \a:mathml rowalign="bottom"}\else - \HCode{ valign="bottom" style="white-space:nowrap;"}\fi} + \HCode{ style="vertical-align:bottom; white-space:nowrap;"}\fi} {p}{\ifmathml \HCode{ \a:mathml columnalign="left"}\else - \HCode{ align="left"}\fi} + \HCode{ style="text-align:left;"}\fi} {} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -183,39 +191,48 @@ tex4ht} \R:HA\r:HA\D:HA\d:HA \:CheckOption{fonts} \if:Option \Configure{texttt} - {\ifmathml \Configure{@mtext}{\mml:class="texttt" mathvariant="monospace" }% + {\ifmathml \Configure{@mtext}{\mml:class="texttt" + mathvariant="monospace" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \Configure{textit} - {\ifmathml \Configure{@mtext}{\mml:class="textit" mathvariant="italic" }% + {\ifmathml \Configure{@mtext}{\mml:class="textit" + mathvariant="italic" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \Configure{textrm} - {\ifmathml \Configure{@mtext}{ \mml:class="textrm" mathvariant="normal" }% + {\ifmathml \Configure{@mtext}{ \mml:class="textrm" + mathvariant="normal" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \Configure{textup} - {\ifmathml \Configure{@mtext}{ \mml:class="textup" mathvariant="normal" }% + {\ifmathml \Configure{@mtext}{ \mml:class="textup" + mathvariant="normal" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \Configure{textsl} - {\ifmathml \Configure{@mtext}{ \mml:class="textst" mathvariant="italic" }% + {\ifmathml \Configure{@mtext}{ \mml:class="textst" + mathvariant="italic" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \Configure{textsf} - {\ifmathml \Configure{@mtext}{ \mml:class="textsf" mathvariant="sans-serif" }% + {\ifmathml \Configure{@mtext}{ \mml:class="textsf" + mathvariant="sans-serif" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \Configure{textbf} - {\ifmathml \Configure{@mtext}{ \mml:class="textbf" mathvariant="bold" }% + {\ifmathml \Configure{@mtext}{ \mml:class="textbf" + mathvariant="bold" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \Configure{textsc} - {\ifmathml \Configure{@mtext}{ \mml:class="textsc" mathvariant="normal" }% + {\ifmathml \Configure{@mtext}{ \mml:class="textsc" + mathvariant="normal" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \Configure{emph} - {\ifmathml \Configure{@mtext}{ \mml:class="emph" mathvariant="italic" }% + {\ifmathml \Configure{@mtext}{ \mml:class="emph" + mathvariant="italic" }% \else \HCode{}\fi} {\ifmathml\else \HCode{}\fi} \fi @@ -392,6 +409,22 @@ accent="true">&\#x0332;}% {\ifvmode \IgnorePar\fi\EndP \HCode{}} {\ifvmode \IgnorePar\fi\EndP \HCode{}% \IgnoreIndent\par} +\Configure{equation*} + {\ifvmode \IgnorePar\fi \EndP + \HCode{
}% + \Configure{$$}{}{}{}% +\Configure{gather} + {\Configure{$$} + {\Configure{@math}{\mml:class="equation"}\IgnorePar\EndP\DviMath} + {\EndDviMath\EndP}% + {}% + \IgnorePar + }{}{}{}{}{} +% + \IgnorePar + } + {\ifvmode \IgnorePar\fi\EndP \HCode{
}% + \IgnoreIndent\par} \else \Configure{equation} @@ -423,6 +456,32 @@ accent="true">&\#x0332;}% {\ifvmode \IgnorePar\fi\EndP \HCode{}% \IgnoreIndent\par} +\Configure{equation*} + {\ifvmode \IgnorePar\fi \EndP + \HCode{
}% + \Configure{gather} + {\HCode{<\a:mathml mtable\Hnewline + \mml:class="equation"><\a:mathml mtr><\a:mathml mtd>}\IgnorePar + \Configure{$$} + {\Configure{@math}{\a:mathml display="block" +% + \mml:class="equation"}\IgnorePar\EndP\DviMath} + {\EndDviMath\EndP} + {\DisplayMathtrue}% +} + {\HCode{}} + {} + {} + {\ifnum\HCol=2 \IgnorePar + \HCode{<\a:mathml mtd>}\fi } + {} +% +% + \IgnorePar + } + {\ifvmode \IgnorePar\fi\EndP + \HCode{
}% + \IgnoreIndent\par} \fi \else @@ -459,6 +518,36 @@ accent="true">&\#x0332;}% } {\ifvmode \IgnorePar\fi\EndP \HCode{}% \ShowPar\IgnoreIndent\par} +\Configure{equation*} + {\ifvmode \IgnorePar\fi\EndP + \HCode{
}% + \Configure{gather} + {\HCode{<\a:mathml mtable\Hnewline + \mml:class="equation"><\a:mathml mtr><\a:mathml mtd>}\IgnorePar + \Configure{$$} + {\Configure{@math}{\a:mathml display="block" +% + \mml:class="equation"}\IgnorePar\EndP\DviMath} + {\EndDviMath\EndP} + {\DisplayMathtrue}% +} + {\HCode{}} + {} + {} + {\ifnum\HCol=2 \IgnorePar + \HCode{<\a:mathml mtd>}\fi } + {} +% + \Configure{$$} + {\Configure{@math}{\a:mathml display="block" +% + \mml:class="equation"}\IgnorePar\EndP\DviMath} + {\EndDviMath\EndP} + {\DisplayMathtrue}% +% + } + {\ifvmode \IgnorePar\fi\EndP \HCode{
}% + \ShowPar\IgnoreIndent\par} \fi \Configure{@begin} @@ -487,6 +576,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -530,6 +620,10 @@ accent="true">&\#x0332;}% + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{array} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -612,9 +706,6 @@ accent="true">&\#x0332;}% - - - @@ -666,7 +757,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{frenchb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -877,6 +967,21 @@ accent="true">&\#x0332;}% + + + + + + + + + + + + + + + -- cgit v1.2.3