summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-06 01:23:33 +0000
committerKarl Berry <karl@freefriends.org>2006-12-06 01:23:33 +0000
commit3b0d4121fbdaa8b4dc48c1aeab08bd63d71d0307 (patch)
treec0e71b65ec445e74e995d7853a367aa30e50f0dd /Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
parentee72c8e218febb4e5e2395951e36cd91b36aabcd (diff)
tex4ht-1.0.2006_12_04_1651
git-svn-id: svn://tug.org/texlive/trunk@2598 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/tex4ht/mathml.4ht')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathml.4ht397
1 files changed, 311 insertions, 86 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index 65a118e888e..7302554c6df 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mathml.4ht 2005-10-22-00:14 %
-% Copyright (C) 1999--2005 Eitan M. Gurari %
+% mathml.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,9 +24,11 @@
% 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{Preamble,%
+amsbsy,%
+amscd,%
amsfonts,%
amsmath,%
amsopn,%
@@ -35,6 +37,8 @@ amstex,%
amstex1,%
amstext,%
array,%
+bm,%
+dcolumn,%
etex4ht,%
fontmath,%
latex,%
@@ -46,15 +50,15 @@ vanilla}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{Preamble}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \ifx \a:mathml\:UnDef
+ \Configure{PROLOG}{VERSION,DOCTYPE,*XML-STYLESHEET}
+\:CheckOption{no-DOCTYPE} \if:Option
+ \Configure{PROLOG}{VERSION,*XML-STYLESHEET}
+\fi
+\ifx \a:mathml\:UnDef
\NewConfigure{mathml}{1}
\Configure{mathml}{}
\fi
\def\mml:class{\a:mathml class}
-\Configure{PROLOG}{VERSION,DOCTYPE,*XML-STYLESHEET}
-\:CheckOption{no-DOCTYPE} \if:Option
- \Configure{PROLOG}{VERSION,*XML-STYLESHEET}
-\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -84,9 +88,11 @@ vanilla}
\newif\ifmathml \mathmlfalse
\newif\ifmtext \mtextfalse
\LinkCommand\mtxt:link{\a:mathml mtext,%
+ xlink:type="simple"
xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href,
id, \mml:class="label",,}
\LinkCommand\msp:link{\a:mathml mstyle,%
+ xlink:type="simple"
xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href,
id, \mml:class="label",,}
\let\M:Link\Link
@@ -132,12 +138,12 @@ vanilla}
\def\:MT{\ifmathml \a:mathml m\fi}
\Configure{halignTB}{\HCode{<\:MT table }\halignTBL}{\HCode{>}}
\Configure{halignTBL}
- {t}{\ifmathml \HCode{ align="top" }\fi}
- {b}{\ifmathml \HCode{ align="baseline" }\fi}
- {c}{\ifmathml \HCode{ align="axis" }\fi}
+ {t}{\ifmathml \HCode{ style="text-align:top" }\fi}
+ {b}{\ifmathml \HCode{ style="text-align:baseline" }\fi}
+ {c}{\ifmathml \HCode{ style="text-align:axis" }\fi}
{}
\def\t:HA{\HCode{</\:MT table>}}
-\def\R:HA{\HCode{<\:MT tr \Hnewline valign="baseline">}}
+\def\R:HA{\HCode{<\:MT tr \Hnewline style="vertical-align:baseline">}}
\def\r:HA{\HCode{</\:MT tr>}}
\def\D:HA{\HCode{<\:MT td \ifnum \HMultispan>1 colspan="\HMultispan"\fi}%
\halignTD \HCode{\Hnewline>}}
@@ -244,7 +250,94 @@ vanilla}
{\Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>\trap:base}
{\Tg</\a:mathml mrow>\TG</\a:mathml munderover\Hnewline>}
%
+}
+\Configure{displaylimits}
+ {\ifDisplayMath \expandafter\disp:limits\fi}
+\def\disp:limits{\let\pl:SUB =\:UnDef
+ \let\pl:SUP =\:UnDef
+ \ifx \:temp\sp \def\pl:SUP{\Configure{SUP}}%
+\expandafter\append:def
+ \expandafter\pl:SUP\expandafter{\expandafter{\a:SUP}}%
+\expandafter\append:def
+ \expandafter\pl:SUP\expandafter{\expandafter{\b:SUP}}%
+%
+\Configure{SUP}
+ {\Send{BACK}{<\a:mathml mover
+ \mml:class="msup"><\a:mathml mrow\Hnewline>}%
+\Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>%
+\bgroup
+ \ifx \pl:SUBSUP\:UnDef \else
+ \let\SUBSUP:=\pl:SUBSUP
+\fi
+%
+ \Configure{SUP}
+ {\Send{BACK}{<\a:mathml msup><\a:mathml mrow\Hnewline>}%
+\Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>%
+\bgroup
+ \Configure{SUP}
+ {\Send{BACK}{<\a:mathml msup><\a:mathml mrow\Hnewline>}%
+\Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>%
+\bgroup \trap:base}
+ {\egroup \Tg</\a:mathml mrow>\TG</\a:mathml msup\Hnewline>%
+}%
+\trap:base}
+ {\egroup\Tg</\a:mathml mrow>\TG</\a:mathml mover\Hnewline>\aftergroup\pl:SUP %
+}%
+\trap:base}
+ {}%
+\else
+ \ifx \:temp\sb \def\pl:SUB{\Configure{SUB}}%
+\expandafter\append:def
+ \expandafter\pl:SUB\expandafter{\expandafter{\a:SUB}}%
+\expandafter\append:def
+ \expandafter\pl:SUB\expandafter{\expandafter{\b:SUB}}%
+%
+\Configure{SUB}
+ {\Send{BACK}{<\a:mathml munder
+ \mml:class="msub"><\a:mathml mrow\Hnewline>}%
+\Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>%
+\bgroup
+ \ifx \pl:SUBSUP\:UnDef \else
+ \let\SUBSUP:=\pl:SUBSUP
+\fi
+%
+ \Configure{SUB}
+ {\Send{BACK}{<\a:mathml msub><\a:mathml mrow\Hnewline>}%
+\Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>%
+\bgroup
+ \Configure{SUB}
+ {\Send{BACK}{<\a:mathml msub><\a:mathml mrow\Hnewline>}%
+\Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>%
+\bgroup \trap:base}
+ {\egroup \Tg</\a:mathml mrow>\TG</\a:mathml msub\Hnewline>%
+}%
+\trap:base}
+ {\egroup\Tg</\a:mathml mrow>\TG</\a:mathml
+ munder\Hnewline>\aftergroup\pl:SUB %
+}%
+\trap:base}
+ {}%
+\fi\fi
+ \let\pl:SUBSUP=\SUBSUP:
+%
+\Configure{SUBSUP}
+ {\ifx \pl:SUB \:UnDef\else \pl:SUB \fi
+ \ifx \pl:SUP \:UnDef\else \pl:SUP \fi
+ \ifx \pl:SUBSUP\:UnDef \else
+ \let\SUBSUP:=\pl:SUBSUP
+\fi
+%
+ \Send{BACK}
+ {<\a:mathml munderover \a:mathml accentunder="false"
+ \a:mathml accent="false"><\a:mathml mrow
+ \Hnewline>}%
+ \Tg</\a:mathml mrow>\Tg<\a:mathml
+ mrow\Hnewline>\trap:base
}
+ {\Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>\trap:base}
+ {\Tg</\a:mathml mrow>\TG</\a:mathml munderover\Hnewline>}
+%
+}
\ifx \a:putSUB\:UnDef \else
\pend:def\a:putSUB{\ifx \pl:SUBSUP\:UnDef\else
\let\SUBSUP:=\pl:SUBSUP
@@ -456,39 +549,39 @@ vanilla}
{</\a:mathml mtr>}
\Configure{texttt}
{\ifmathml \Configure{@mtext}{\mml:class="texttt"
- mathvariant="monospace" }\fi}
+ mathvariant="monospace" }\fi}
{}%
\Configure{textit}
{\ifmathml \Configure{@mtext}{\mml:class="textit"
- mathvariant="italic" }\fi}
+ mathvariant="italic" }\fi}
{}%
\Configure{textrm}
{\ifmathml \Configure{@mtext}{\mml:class="textrm"
- mathvariant="normal" }\fi}
+ mathvariant="normal" }\fi}
{}%
\Configure{textup}
{\ifmathml \Configure{@mtext}{\mml:class="textup"
- mathvariant="normal" }\fi}
+ mathvariant="normal" }\fi}
{}%
\Configure{textsl}
{\ifmathml \Configure{@mtext}{\mml:class="textsl"
- mathvariant="italic" }\fi}
+ mathvariant="italic" }\fi}
{}%
\Configure{textsf}
{\ifmathml \Configure{@mtext}{\mml:class="textsf"
- mathvariant="sans-serif" }\fi}
+ mathvariant="sans-serif" }\fi}
{}%
\Configure{textbf}
{\ifmathml \Configure{@mtext}{\mml:class="textbf"
- mathvariant="bold" }\fi}
+ mathvariant="bold" }\fi}
{}%
\Configure{textsc}
{\ifmathml \Configure{@mtext}{\mml:class="textsc"
- mathvariant="normal" }\fi}
+ mathvariant="normal" }\fi}
{}%
\Configure{emph}
{\ifmathml \Configure{@mtext}{\mml:class="emph"
- mathvariant="italic" }\fi}
+ mathvariant="italic" }\fi}
{}%
\let\A:fbox=\a:fbox
@@ -506,7 +599,7 @@ vanilla}
\def\mbox{\relax\ifmmode \Configure{mbox}{\AA:text{mbox}}{\BB:text}\else
\Configure{mbox}{\A:mbox}{\B:mbox}\fi\OLD:mbox}
\NewConfigure{@mtext}{1}
-\Configure{@mtext}{}
+\Configure{@mtext}{ }
\def\AA:text#1{\mtexttrue
\HCode{<\a:mathml mstyle\Hnewline \mml:class="#1"><\a:mathml
mtext \a:@mtext>}\ht:special{t4ht@,&\#x00A0;}%
@@ -518,7 +611,18 @@ vanilla}
mstyle\Hnewline \mml:class="math">}}%
{\HCode{</\a:mathml mstyle><\a:mathml
mtext \a:@mtext>}\ht:special{t4ht@,&\#x00A0;}%
-\PauseMathClass \mtexttrue}%
+\PauseMathClass
+ \mtexttrue}%
+ {}%
+\Configure{()}%
+ {\EndPauseMathClass \mtextfalse
+ \ht:special{t4ht@,}%
+\HCode{</\a:mathml mtext><\a:mathml
+ mstyle\Hnewline \mml:class="math">}$}%
+ {$\HCode{</\a:mathml mstyle><\a:mathml
+ mtext \a:@mtext>}\ht:special{t4ht@,&\#x00A0;}%
+\PauseMathClass
+ \mtexttrue}%
{}%
%
}
@@ -938,8 +1042,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{left}{}{}\Configure{right}{}{}}
\:CheckOption{new-accents} \if:Option \else
-
-\Configure{accents}
+ \Configure{accents}
{\ifmmode \expandafter\mathord\fi
{\leavevmode
\if !#1!\ht:special{t4ht@+&{35}x#2;}%
@@ -1039,8 +1142,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\def\csname \string#1:lr del\endcsname{#2}}
\Configure{mfenced}{\|}{\string&\#x2225;}
\Configure{mfenced}{.}{}
-\Configure{mfenced}{\langle}{\string&\#x3008;}
-\Configure{mfenced}{\rangle}{\string&\#x3009;}
+\Configure{mfenced}{\langle}{\string&\#x27E8;}
+\Configure{mfenced}{\rangle}{\string&\#x27E9;}
\Configure{mfenced}{\vert}{|}
\edef\:temp{\noexpand\Configure{mfenced}{\noexpand\{}{\string{}}\:temp
\edef\:temp{\noexpand\Configure{mfenced}{\noexpand\}}{\string}}}\:temp
@@ -1070,12 +1173,13 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{mfenced}{\rmoustache}{\string&\#x25DD;}
\Configure{mfenced}{\lmoustache}{\string&\#x25DC;}
\Configure{mfenced}{\Arrowvert}{\string&\#x2225;}
-\Configure{mfenced}{\arrowvert}{\string&\#x2223;}
+\Configure{mfenced}{\arrowvert}{\string&\#x007C;}
\let\A:oalign\a:oalign
\let\B:oalign\b:oalign
\Configure{oalign}
- {\ifmmode \Configure{$}{\Tg<\a:mathml mrow\Hnewline>}{\Tg</\a:mathml mrow>}{}%
+ {\ifmmode \Configure{$}{\Tg<\a:mathml mrow\Hnewline>}%
+ {\Tg</\a:mathml mrow>}{}%
\let\halign\TeXhalign
\Tg<\a:mathml mrow\Hnewline \mml:class="oalign">\else\A:oalign
\fi}
@@ -1197,6 +1301,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\mathchar"2203
\mathchar"2202
\mathchar"213F
+\mathchar"6201 % cdot
}
\Configure{MathClass}{3}{}{}{}{
\mathchar"3128
@@ -1261,16 +1366,15 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{MathDelimiters}{\mathchar"430A}{\mathchar"530B}
\Configure{MathClass}{6}{}{}{}{
\mathchar"613A % ldot
-\mathchar"6201 % cdot
\mathchar"603A % colon
-?; ,
+!?; ,
}
\Configure{overrightarrow}
{\Tg<\a:mathml mover class="overrightarrow">\Tg<\a:mathml mrow\Hnewline>\:gobble}
{\Tg</\a:mathml mrow>\mathop{\HCode{&\#x20D7;}}\Tg</\a:mathml mover>}
\Configure{overleftarrow}
- {\Tg<\a:mathml mover="overleftarrow">\Tg<\a:mathml mrow\Hnewline>\:gobble}
+ {\Tg<\a:mathml mover class="overleftarrow">\Tg<\a:mathml mrow\Hnewline>\:gobble}
{\Tg</\a:mathml mrow>\mathop{\HCode{&\#x20D6;}}\Tg</\a:mathml mover>}
\Configure{big}
{}{}
@@ -1336,7 +1440,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\else
\Log:Note{for sources failing to produce
clean mathml code, try the command line option `mathml-'}%
- \Configure{MathClass}{4}{*}{<\a:mathml mrow><\a:mathml mo\Hnewline
+ \Configure{MathClass}{4}{*}{<\a:mathml mrow
+ ><\a:mathml mo\Hnewline
\mml:class="MathClass-open">}
{</\a:mathml mo><\a:mathml mrow>}{}
\Configure{MathClass}{5}{*}{</\a:mathml mrow><\a:mathml mo\Hnewline
@@ -1357,18 +1462,21 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\def\bold:version{bold}
\Configure{mathbf}%
- {\bgroup \Tg<\a:mathml mstyle mathvariant="bold">}%
+ {\bgroup \Tg<\a:mathml mstyle
+ mathvariant="bold">}%
{\Tg</\a:mathml mstyle>\egroup }%
\Configure{mathit}%
- {\bgroup \Tg<\a:mathml mstyle
- mathvariant="\ifx \bold:version\math@version bold-\fi italic">}%
+ {\bgroup \Tg<\a:mathml mstyle mathvariant="\ifx
+ \bold:version\math@version bold-\fi italic">}%
{\Tg</\a:mathml mstyle>\egroup }%
\Configure{mathrm}%
- {\bgroup \Tg<\a:mathml mstyle mathvariant="normal">}%
+ {\bgroup \Tg<\a:mathml mstyle
+ mathvariant="\ifx
+ \bold:version\math@version bold\else normal\fi">}%
{\Tg</\a:mathml mstyle>\egroup }%
\Configure{mathsf}%
- {\bgroup \Tg<\a:mathml mstyle
- mathvariant="\ifx \bold:version\math@version bold-\fi sans-serif">}%
+ {\bgroup \Tg<\a:mathml mstyle mathvariant="\ifx
+ \bold:version\math@version bold-\fi sans-serif">}%
{\Tg</\a:mathml mstyle>\egroup }%
\Configure{mathtt}%
{\bgroup \Tg<\a:mathml mstyle mathvariant="monospace">}%
@@ -1431,6 +1539,17 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureHinput{amsbsy}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \Configure{pmb}
+ {\ifmmode \HCode{<!--binary math rel, tripple hight-->}\fi}
+ {\ifmmode \HCode{<!--/binary math rel, tripple hight-->}\fi}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsmath}
@@ -1460,6 +1579,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\HCode{</\a:mathml mtd><\a:mathml mtd>}\fi }
{}
}{}{}
+\Css{.equation-star td{text-align:center; vertical-align:middle; }}
+\Css{table.equation-star { width:100\%; } }
\Configure{above}
{\Send{GROUP}{0}{<\a:mathml mfrac
linethickness="\the\tmp:dim"><\a:mathml mrow>}%
@@ -1497,7 +1618,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{mfenced}{\rVert}{\string&\#x2016;}
\Configure{split}
{\HCode{<\a:mathml mtable \Hnewline
- \a:mathml columnalign="right left" \mml:class="split">}}
+ \a:mathml columnalign="right left"
+ \mml:class="split">}}
{\ifvmode\IgnorePar\fi \HCode{</\a:mathml mtable>}}
{\HCode{<\a:mathml mtr \mml:class="split-mtr">}}
{\HCode{</\a:mathml mtr>}}
@@ -1506,9 +1628,11 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{multline}
{\HCode{<\a:mathml mtable\Hnewline \mml:class="multline">}}
{\HCode{</\a:mathml mtable>}}
- {\HCode{<\a:mathml mtr><\a:mathml mtd\Hnewline \mml:class="multline">}}
+ {\HCode{<\a:mathml mtr>%
+ <\a:mathml mtd\Hnewline \mml:class="multline">}}
{\HCode{</\a:mathml mtd></\a:mathml mtr>}}
- {\HCode{</\a:mathml mtd><\a:mathml mtd>}} {}
+ {\HCode{</\a:mathml mtd><\a:mathml mtd>}}
+ {}
\Configure{multline*}
{\HCode{<\a:mathml mtable\Hnewline \mml:class="multline-star">}}
{\HCode{</\a:mathml mtable>}}
@@ -1578,6 +1702,11 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\:tempc{alignat*}{alignat-star}
\:tempc{xalignat*}{xalignat-star}
\:tempc{flalign*}{flalign-star}
+\Configure{gathered}
+ {\HCode{<\a:mathml mtable\Hnewline \mml:class="gathered">}}
+ {\HCode{</\a:mathml mtable>}}
+ {\HCode{<\a:mathml mtr>}} {\HCode{</\a:mathml mtr>}}
+ {\HCode{\Hnewline<\a:mathml mtd>}} {\HCode{</\a:mathml mtd>}}
\Configure{underrightarrow}
{\Tg<\a:mathml munder>\Tg<\a:mathml mrow\Hnewline>\:gobble}
{\Tg</\a:mathml mrow>\mathop{\rightarrow}\Tg</\a:mathml munder>}
@@ -1585,7 +1714,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
{\Tg<\a:mathml munder>\Tg<\a:mathml mrow\Hnewline>\:gobble}
{\Tg</\a:mathml mrow>\mathop{\leftarrow}\Tg</\a:mathml munder>}
\Configure{overleftrightarrow}
- {\Tg<\a:mathml mover="overleftrightarrow">\Tg<\a:mathml mrow\Hnewline>\:gobble}
+ {\Tg<\a:mathml mover class="overleftrightarrow">\Tg<\a:mathml mrow\Hnewline>\:gobble}
{\Tg</\a:mathml mrow>\mathop{\HCode{&\#x20E1;}}\Tg</\a:mathml mover>}
\Configure{underleftrightarrow}
{\Tg<\a:mathml munder>\Tg<\a:mathml mrow\Hnewline>\:gobble}
@@ -1620,16 +1749,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\def\sideset#1#2#3{{\Tg<\a:mathml mrow \mml:class="sideset"\Hnewline
>{\HCode{}}#1{\HCode{}#3}#2\Tg</\a:mathml mrow>}}
-
-\renewcommand{\hdotsfor}[1]{%
- \ifx[#1\@xp\shdots@for\else\hdots@for\@ne{#1}\fi}
-\def\shdots@for#1]{\hdots@for{#1}}
-\def\hdots@for#1#2{\multicolumn{#2}c%
- {\m@th\dotsspace@1.5mu\mkern-#1\dotsspace@
- \xleaders\hbox{$\m@th\mkern#1\dotsspace@.\mkern#1\dotsspace@$}%
- \hfill
- \mkern-#1\dotsspace@}%
- }
\ConfigureEnv{eqxample}{}{}{}{}
\ConfigureEnv{gather*}{}{}{}{}
\ConfigureEnv{gathered}{}{}{}{}
@@ -1655,8 +1774,9 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{intertext}
{\IgnorePar \ifinalign@
- \HCode{</\a:mathml mtd></\a:mathml mtr><\a:mathml
- mtr><\a:mathml mtd columnspan="\HCol"
+ \HCode{\ifnum \HRow>0 </\a:mathml mtd></\a:mathml mtr>\fi
+ <\a:mathml mtr><\a:mathml mtd
+ columnspan="\ifnum \HRow=0 15\else \HCol\fi"
\mml:class="intertext">}%
\else \ifingather@
\HCode{<\a:mathml mtr><\a:mathml mtd columnspan="\HCol"
@@ -1665,8 +1785,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\AA:text{intertext}%
}
{\BB:text \ifvmode \IgnorePar \fi \EndP\ifinalign@
- \HCode{</\a:mathml mtd></\a:mathml mtr><\a:mathml
- mtr><\a:mathml mtd>}%
+ \HCode{</\a:mathml mtd></\a:mathml mtr>%
+ \ifnum \HRow>0 <\a:mathml mtr><\a:mathml mtd>\fi}%
\else \ifingather@
\HCode{</\a:mathml mtd></\a:mathml mtr>}%
\fi\fi
@@ -1747,9 +1867,26 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
mrow></\a:mathml mfrac></\a:mathml mfenced>}
\fi
}
-\pend:def\n:iint:{\ifDisplayMath\mathop:prefix{mathsize="big"}\fi}
-\pend:def\n:iiint:{\ifDisplayMath\mathop:prefix{mathsize="big"}\fi}
-\pend:def\n:idotsint:{\ifDisplayMath\mathop:prefix{mathsize="big"}\fi}
+\def\:tempc{\ifDisplayMath\mathop:prefix{mathsize="big"}\fi\o:n:iint::}
+\HLet\n:iint:\:tempc
+\def\:tempc{\ifDisplayMath\mathop:prefix{mathsize="big"}\fi\o:n:iiint::}
+\HLet\n:iiint:\:tempc
+\def\:tempc{\ifDisplayMath\mathop:prefix{mathsize="big"}\fi\o:n:idotsint::}
+\HLet\n:idotsint:\:tempc
+\Configure{aligned}
+ {\HCode{<\a:mathml mtable\Hnewline \mml:class="aligned">}}
+ {\HCode{</\a:mathml mtable>}}
+ {\HCode{<\a:mathml mtr\Hnewline>}} {\HCode{</\a:mathml mtr>}}
+ {\HCode{<\a:mathml mtd
+ \a:mathml columnalign="\ifodd\HCol right\else left\fi" >}}
+ {\HCode{</\a:mathml mtd>}}
+\Configure{alignedat}
+ {\HCode{<\a:mathml mtable\Hnewline \mml:class="alignedat">}}
+ {\HCode{</\a:mathml mtable>}}
+ {\HCode{<\a:mathml mtr\Hnewline>}} {\HCode{</\a:mathml mtr>}}
+ {\HCode{<\a:mathml mtd
+ \a:mathml columnalign="\ifodd\HCol right\else left\fi" >}}
+ {\HCode{</\a:mathml mtd>}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1767,6 +1904,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amstext}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1777,7 +1915,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amstex1}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1808,10 +1945,10 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
{\HCode{<\a:mathml mtd>}} {\HCode{</\a:mathml mtd>}}
-\def\varinjlim{{\underrightarrow\lim}}
-\def\varprojlim{{\underleftarrow\lim}}
-\def\varlimsup{{\overline\lim}}
-\def\varliminf{{\underline\lim}}
+\def\:tempc{{\underrightarrow\lim}} \HLet\varinjlim\:tempc
+\def\:tempc{{\underleftarrow\lim}} \HLet\varprojlim\:tempc
+\def\:tempc{{\overline\lim}} \HLet\varlimsup\:tempc
+\def\:tempc{{\underline\lim}} \HLet\varliminf\:tempc
\def\:tempc#1#2#3{\hbox{{\mtexttrue
\HCode{<\a:mathml mrow\Hnewline
\mml:class="text"><\a:mathml mtext
@@ -1904,7 +2041,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
{\HCode{<\a:mathml mtd\Hnewline \mml:class="gathered">}}
{\HCode{</\a:mathml mtd>}}
\NewConfigure{@mtext}{1}
-\Configure{@mtext}{}
+\Configure{@mtext}{ }
\def\AA:text#1{\mtexttrue
\HCode{<\a:mathml mstyle\Hnewline \mml:class="#1"><\a:mathml
mtext \a:@mtext>}\ht:special{t4ht@,&\#x00A0;}%
@@ -1916,7 +2053,18 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
mstyle\Hnewline \mml:class="math">}}%
{\HCode{</\a:mathml mstyle><\a:mathml
mtext \a:@mtext>}\ht:special{t4ht@,&\#x00A0;}%
-\PauseMathClass \mtexttrue}%
+\PauseMathClass
+ \mtexttrue}%
+ {}%
+\Configure{()}%
+ {\EndPauseMathClass \mtextfalse
+ \ht:special{t4ht@,}%
+\HCode{</\a:mathml mtext><\a:mathml
+ mstyle\Hnewline \mml:class="math">}$}%
+ {$\HCode{</\a:mathml mstyle><\a:mathml
+ mtext \a:@mtext>}\ht:special{t4ht@,&\#x00A0;}%
+\PauseMathClass
+ \mtexttrue}%
{}%
%
}
@@ -1992,6 +2140,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{plain}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2119,6 +2268,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\mathchar"2203
\mathchar"2202
\mathchar"213F
+\mathchar"6201 % cdot
}
\Configure{MathClass}{3}{}{}{}{
\mathchar"3128
@@ -2183,16 +2333,15 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{MathDelimiters}{\mathchar"430A}{\mathchar"530B}
\Configure{MathClass}{6}{}{}{}{
\mathchar"613A % ldot
-\mathchar"6201 % cdot
\mathchar"603A % colon
-?; ,
+!?; ,
}
\Configure{overrightarrow}
{\Tg<\a:mathml mover class="overrightarrow">\Tg<\a:mathml mrow\Hnewline>\:gobble}
{\Tg</\a:mathml mrow>\mathop{\HCode{&\#x20D7;}}\Tg</\a:mathml mover>}
\Configure{overleftarrow}
- {\Tg<\a:mathml mover="overleftarrow">\Tg<\a:mathml mrow\Hnewline>\:gobble}
+ {\Tg<\a:mathml mover class="overleftarrow">\Tg<\a:mathml mrow\Hnewline>\:gobble}
{\Tg</\a:mathml mrow>\mathop{\HCode{&\#x20D6;}}\Tg</\a:mathml mover>}
\Configure{big}
{}{}
@@ -2258,7 +2407,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\else
\Log:Note{for sources failing to produce
clean mathml code, try the command line option `mathml-'}%
- \Configure{MathClass}{4}{*}{<\a:mathml mrow><\a:mathml mo\Hnewline
+ \Configure{MathClass}{4}{*}{<\a:mathml mrow
+ ><\a:mathml mo\Hnewline
\mml:class="MathClass-open">}
{</\a:mathml mo><\a:mathml mrow>}{}
\Configure{MathClass}{5}{*}{</\a:mathml mrow><\a:mathml mo\Hnewline
@@ -2622,8 +2772,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{left}{}{}\Configure{right}{}{}}
\:CheckOption{new-accents} \if:Option \else
-
-\Configure{accents}
+ \Configure{accents}
{\ifmmode \expandafter\mathord\fi
{\leavevmode
\if !#1!\ht:special{t4ht@+&{35}x#2;}%
@@ -2723,8 +2872,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\def\csname \string#1:lr del\endcsname{#2}}
\Configure{mfenced}{\|}{\string&\#x2225;}
\Configure{mfenced}{.}{}
-\Configure{mfenced}{\langle}{\string&\#x3008;}
-\Configure{mfenced}{\rangle}{\string&\#x3009;}
+\Configure{mfenced}{\langle}{\string&\#x27E8;}
+\Configure{mfenced}{\rangle}{\string&\#x27E9;}
\Configure{mfenced}{\vert}{|}
\edef\:temp{\noexpand\Configure{mfenced}{\noexpand\{}{\string{}}\:temp
\edef\:temp{\noexpand\Configure{mfenced}{\noexpand\}}{\string}}}\:temp
@@ -2754,12 +2903,13 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{mfenced}{\rmoustache}{\string&\#x25DD;}
\Configure{mfenced}{\lmoustache}{\string&\#x25DC;}
\Configure{mfenced}{\Arrowvert}{\string&\#x2225;}
-\Configure{mfenced}{\arrowvert}{\string&\#x2223;}
+\Configure{mfenced}{\arrowvert}{\string&\#x007C;}
\let\A:oalign\a:oalign
\let\B:oalign\b:oalign
\Configure{oalign}
- {\ifmmode \Configure{$}{\Tg<\a:mathml mrow\Hnewline>}{\Tg</\a:mathml mrow>}{}%
+ {\ifmmode \Configure{$}{\Tg<\a:mathml mrow\Hnewline>}%
+ {\Tg</\a:mathml mrow>}{}%
\let\halign\TeXhalign
\Tg<\a:mathml mrow\Hnewline \mml:class="oalign">\else\A:oalign
\fi}
@@ -2802,13 +2952,14 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsopn}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \def\varinjlim{{\underrightarrow\lim}}
-\def\varprojlim{{\underleftarrow\lim}}
-\def\varlimsup{{\overline\lim}}
-\def\varliminf{{\underline\lim}}
+ \def\:tempc{{\underrightarrow\lim}} \HLet\varinjlim\:tempc
+\def\:tempc{{\underleftarrow\lim}} \HLet\varprojlim\:tempc
+\def\:tempc{{\overline\lim}} \HLet\varlimsup\:tempc
+\def\:tempc{{\underline\lim}} \HLet\varliminf\:tempc
\def\:tempc#1#2#3{\hbox{{\mtexttrue
\HCode{<\a:mathml mrow\Hnewline
\mml:class="text"><\a:mathml mtext
@@ -2857,6 +3008,9 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{array}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2907,12 +3061,40 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureHinput{amscd}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureEnv{CD}{}{}{}{}
+\Configure{CD}
+ {\HCode{<\a:mathml mtable class="CD"\Hnewline>}}
+ {\HCode{</\a:mathml mtable>}}
+ {\HCode{<\a:mathml mtr>}}
+ {\HCode{</\a:mathml mtr>}}
+ {\HCode{<\a:mathml mtd\Hnewline>}}
+ {\HCode{</\a:mathml mtd>}}
+\Configure{ @>}
+ {\Configure{mathrel*}{*}
+ {<mrow \mml:class="rightarrow" >}
+ {</mrow>}
+ {}}
+\Configure{ @<}
+ {\Configure{mathrel*}{*}
+ {<mrow \mml:class="leftarrow" >}
+ {</mrow>}
+ {}}
+\Configure{ @V}
+ {\HCode{<mphantom>}
+ \hbox{$\m@th\vcenter{\hbox{$\scriptstyle#2$}}$}%%
+ \HCode{</mphantom>}}
+ {\HCode{<mphantom>}
+ \hbox{$\m@th\vcenter{\hbox{$\m@th\vcenter{\hbox
+ {$\scriptstyle#1$}}$}}$}%
+ \HCode{</mphantom>}}
-
-
-
-
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2957,6 +3139,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amssymb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3147,6 +3331,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{rlbabel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3184,6 +3369,27 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureHinput{dcolumn}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \Configure{dcolumn}
+ {\NoFonts\Configure{$}{}{}{}}
+ {\EndNoFonts}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+
+
+
+
+
+
+
@@ -3265,6 +3471,25 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureHinput{bm}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \Configure{bm}
+ {\ifmmode \ifmtext \else
+ \Tg<\a:mathml mstyle
+ mathvariant="bold">%
+ \expandafter\expandafter\expandafter\:gobble
+ \fi\fi}
+ {\ifmmode \ifmtext \else \Tg</\a:mathml mstyle>\fi\fi}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+