summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-02-23 23:44:41 +0000
committerKarl Berry <karl@freefriends.org>2018-02-23 23:44:41 +0000
commit6fb61bdb22aa744ec4248f969733b91af6060d04 (patch)
treeeb3be6221368bef0dc4a3efcb195713bf97de897
parent4931d3b4cd46abc3dad933f576f24efe7ed58352 (diff)
mathml <mtext> and ht-fonts disabling, tex4ht r383
git-svn-id: svn://tug.org/texlive/trunk@46728 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht62
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathml.4ht33
2 files changed, 53 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
index 035448abdf8..c3a79346e8a 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
@@ -1,5 +1,5 @@
-% html-mml.4ht (2017-09-09-19:06), generated from tex4ht-mathml.tex
-% Copyright 2009-2017 TeX Users Group
+% html-mml.4ht (2018-02-23-15:42), generated from tex4ht-mathml.tex
+% Copyright 2009-2018 TeX Users Group
% Copyright 1999-2009 Eitan M. Gurari
%
% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2017-09-09-19:06}
+\immediate\write-1{version 2018-02-23-15:42}
\exit:ifnot{amsmath,%
array,%
@@ -235,50 +235,50 @@ tex4ht}
}}
\:CheckOption{fonts} \if:Option
\Configure{texttt}
- {\ifmathml \Configure{@mtext}{\mml:class="texttt"
+ {\ifmathml \providemtextclass{\mml:class="texttt"
mathvariant="monospace" }%
- \else \HCode{<span class="texttt">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="texttt">}\NoFonts\fi}
+ {\ifmathml\else \EndNoFonts\HCode{</span>}\fi}
\Configure{textit}
- {\ifmathml \Configure{@mtext}{\mml:class="textit"
+ {\ifmathml \providemtextclass{\mml:class="textit"
mathvariant="italic" }%
- \else \HCode{<span class="textit">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="textit">}\NoFonts\fi}
+ {\ifmathml\else \EndNoFonts\HCode{</span>}\fi}
\Configure{textrm}
- {\ifmathml \Configure{@mtext}{ \mml:class="textrm"
+ {\ifmathml \providemtextclass{ \mml:class="textrm"
mathvariant="normal" }%
- \else \HCode{<span class="textrm">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="textrm">}\NoFonts\fi}
+ {\ifmathml\else \EndNoFonts\HCode{</span>}\fi}
\Configure{textup}
- {\ifmathml \Configure{@mtext}{ \mml:class="textup"
+ {\ifmathml \providemtextclass{ \mml:class="textup"
mathvariant="normal" }%
- \else \HCode{<span class="textup">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="textup">}\NoFonts\fi}
+ {\ifmathml\else \EndNoFonts\HCode{</span>}\fi}
\Configure{textsl}
- {\ifmathml \Configure{@mtext}{ \mml:class="textst"
+ {\ifmathml \providemtextclass{ \mml:class="textst"
mathvariant="italic" }%
- \else \HCode{<span class="textsl">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="textsl">}\NoFonts\fi}
+ {\ifmathml\else \EndNoFonts\HCode{</span>}\fi}
\Configure{textsf}
- {\ifmathml \Configure{@mtext}{ \mml:class="textsf"
+ {\ifmathml \providemtextclass{ \mml:class="textsf"
mathvariant="sans-serif" }%
- \else \HCode{<span class="textsf">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="textsf">}\NoFonts\fi}
+ {\ifmathml\else \EndNoFonts\HCode{</span>}\fi}
\Configure{textbf}
- {\ifmathml \Configure{@mtext}{ \mml:class="textbf"
+ {\ifmathml \providemtextclass{ \mml:class="textbf"
mathvariant="bold" }%
- \else \HCode{<span class="textbf">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="textbf">}\NoFonts\fi}
+ {\ifmathml\else \EndNoFonts\HCode{</span>}\fi}
\Configure{textsc}
- {\ifmathml \Configure{@mtext}{ \mml:class="textsc"
+ {\ifmathml \providemtextclass{ \mml:class="textsc"
mathvariant="normal" }%
- \else \HCode{<span class="textsc">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="textsc">}\NoFonts\fi}
+ {\ifmathml\else \EndNoFonts\HCode{</span>}\fi}
\Configure{emph}
- {\ifmathml \Configure{@mtext}{ \mml:class="emph"
+ {\ifmathml \providemtextclass{ \mml:class="emph"
mathvariant="italic" }%
- \else \HCode{<span class="emph">}\fi}
- {\ifmathml\else \HCode{</span>}\fi}
+ \else \HCode{<span class="emph">}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts \HCode{</span>}\fi}
\fi
\Css{math .texttt { font-family: monospace; }}
\Css{math .textit { font-style: italic; }}
@@ -1230,5 +1230,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index 4a11c66c118..94c1852f949 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -1,5 +1,5 @@
-% mathml.4ht (2017-09-09-19:06), generated from tex4ht-mathml.tex
-% Copyright 2009-2017 TeX Users Group
+% mathml.4ht (2018-02-23-15:42), generated from tex4ht-mathml.tex
+% Copyright 2009-2018 TeX Users Group
% Copyright 1999-2009 Eitan M. Gurari
%
% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2017-09-09-19:06}
+\immediate\write-1{version 2018-02-23-15:42}
\exit:ifnot{Preamble,%
accents,%
@@ -614,41 +614,48 @@ vanilla}
{<\a:mathml mtd\Hnewline></\a:mathml mtd>}
{</\a:mathml mtr>}
}
+
\mathml:hborder
+
+\def\providemtextclass#1{%
+ \Configure{@mtext}{#1}%
+ \HCode{</mtext>}\ht:special{t4ht@,}\HCode{<mtext \a:@mtext>}\ht:special{t4ht@,&\#x00A0;}%
+}
+
\Configure{texttt}
- {\ifmathml \Configure{@mtext}{\mml:class="texttt"
+ {\ifmathml \providemtextclass{\mml:class="texttt"
mathvariant="monospace" }\fi}
{}%
\Configure{textit}
- {\ifmathml \Configure{@mtext}{\mml:class="textit"
+ {\ifmathml \providemtextclass{\mml:class="textit"
mathvariant="italic" }\fi}
{}%
\Configure{textrm}
- {\ifmathml \Configure{@mtext}{\mml:class="textrm"
+ {\ifmathml \providemtextclass{\mml:class="textrm"
mathvariant="normal" }\fi}
{}%
\Configure{textup}
- {\ifmathml \Configure{@mtext}{\mml:class="textup"
+ {\ifmathml \providemtextclass{\mml:class="textup"
mathvariant="normal" }\fi}
{}%
\Configure{textsl}
- {\ifmathml \Configure{@mtext}{\mml:class="textsl"
+ {\ifmathml \providemtextclass{\mml:class="textsl"
mathvariant="italic" }\fi}
{}%
\Configure{textsf}
- {\ifmathml \Configure{@mtext}{\mml:class="textsf"
+ {\ifmathml \providemtextclass{\mml:class="textsf"
mathvariant="sans-serif" }\fi}
{}%
\Configure{textbf}
- {\ifmathml \Configure{@mtext}{\mml:class="textbf"
+ {\ifmathml \providemtextclass{\mml:class="textbf"
mathvariant="bold" }\fi}
{}%
\Configure{textsc}
- {\ifmathml \Configure{@mtext}{\mml:class="textsc"
+ {\ifmathml \providemtextclass{\mml:class="textsc"
mathvariant="normal" }\fi}
{}%
\Configure{emph}
- {\ifmathml \Configure{@mtext}{\mml:class="emph"
+ {\ifmathml \providemtextclass{\mml:class="emph"
mathvariant="italic" }\fi}
{}%
@@ -4158,5 +4165,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
\endinput