summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/tex4ht
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-29 21:49:03 +0000
committerKarl Berry <karl@freefriends.org>2024-01-29 21:49:03 +0000
commit8bdc4280dc08f0dee75de4bba0789b0ec08b443f (patch)
tree247a43e7ab2f4843ad809474117533cdd4ffb5ac /Master/texmf-dist/tex/generic/tex4ht
parent9d7ae2927cf3d71ccecbbf4fe6833086d7823890 (diff)
odt support for mhchem, tex4ht r1455
git-svn-id: svn://tug.org/texlive/trunk@69631 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/tex4ht')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathml.4ht8
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht34
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht17
3 files changed, 35 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index e7e8f69c2de..9c7f164fd08 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -1,4 +1,4 @@
-% mathml.4ht (2024-01-24-14:08), generated from tex4ht-mathml.tex
+% mathml.4ht (2024-01-29-13:27), generated from tex4ht-mathml.tex
% Copyright 2009-2024 TeX Users Group
% Copyright 1999-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-01-24-14:08}
+\immediate\write-1{version 2024-01-29-13:27}
\exit:ifnot{Preamble,%
accents,%
@@ -4432,9 +4432,9 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
% \Configure{mhchemarrowequilibriumRight}{\a:mhchemoperator\HCode{&\#x2942;}\b:mhchemoperator } % todo: improve
% \Configure{mhchemarrowequilibriumLeft}{\a:mhchemoperator\HCode{&\#x2943;}\b:mhchemoperator} % todo: improve
\Configure{mhchembondhalf}{\HCode{<span class="mhchem-bond-half-middle">&\#xfe4d;</span>}}
-\Configure{mhchembondoneandhalf}{\HCode{<span class="mhchem-rlap">&minus;</span><span class="mhchem-bond-half-top">&\#xfe4d;</span>}}
+\Configure{mhchembondoneandhalf}{\HCode{<span class="mhchem-rlap">&\#x2212;</span><span class="mhchem-bond-half-top">&\#xfe4d;</span>}}
\Configure{mhchembondtwoandhalf}{\HCode{<span class="mhchem-rlap">=</span><span class="mhchem-bond-half-top">&\#xfe4d;</span>}}
-\Configure{mhchembondtwoandhalff}{\HCode{<span class="mhchem-rlap mhchem-bond-top">&minus;</span><span class="mhchem-rlap mhchem-bond-bottom">&minus;</span><span class="mhchem-bond-half-middle">&\#xfe4d;</span>}}
+\Configure{mhchembondtwoandhalff}{\HCode{<span class="mhchem-rlap mhchem-bond-top">&\#x2212;</span><span class="mhchem-rlap mhchem-bond-bottom">&\#x2212;</span><span class="mhchem-bond-half-middle">&\#xfe4d;</span>}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht b/Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht
index ab7ac52d203..e9f8a55dce0 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht
@@ -1,4 +1,4 @@
-% mhchem.4ht (2024-01-24-13:56), generated from tex4ht-4ht.tex
+% mhchem.4ht (2024-01-29-13:27), generated from tex4ht-4ht.tex
% Copyright 2024 TeX Users Group
% Copyright 2015-2021 Martin Hensel
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-01-24-13:56}
+\immediate\write-1{version 2024-01-29-13:27}
\ExplSyntaxOn
% basic mhchem containers
@@ -107,35 +107,35 @@
\cs_set_protected:Npn \__mhchem_output_withFont:n #1 %. output #1 as math or text
{
\bool_if:NTF \l__mhchem_output_isMathMode_bool
- { \mathrm {#1} }
- { \text {#1} }
+ { \begingroup\mathrm {#1}\endgroup }
+ { \begingroup\text {#1}\endgroup }
}
\NewConfigure{mhchemoperator}{2}
% ideally, the following commands should be redefined using \HLet, to support picture math.
% the current definition should work in MathML, I am not sure about normall HTML, as
-\cs_set_protected:Npn \__mhchem_output_skipAfterAmount: { \HCode { ~ } } % space for copy & paste
+\cs_set_protected:Npn \__mhchem_output_skipAfterAmount: {\HCode { ~ } } % space for copy & paste
\cs_set_protected:Npn \__mhchem_output_skipBeforeStateOfAggregation: {}
-\cs_set_protected:Npn \__mhchem_output_minus: { \HCode { &minus; } }
+\cs_set_protected:Npn \__mhchem_output_minus: {\HCode{&\#x2212;}} % minus
\cs_set_protected:Npn \__mhchem_output_operatorPlus:
{ \a:mhchemoperator + \b:mhchemoperator }
\cs_set_protected:Npn \__mhchem_output_operatorMinus:
- { \a:mhchemoperator\HCode {&minus;} \b:mhchemoperator }
+ { \a:mhchemoperator\HCode {&\#x2212;} \b:mhchemoperator } % minus
\cs_set_protected:Npn \__mhchem_output_operatorEquals:
{ \a:mhchemoperator = \b:mhchemoperator }
\cs_set_protected:Npn \__mhchem_output_operatorPlusMinus:
- {\a:mhchemoperator \HCode {&plusmn; } \b:mhchemoperator }
-\cs_set_protected:Npn \__mhchem_output_electronDot: { \HCode { &bull; } }
-\cs_set_protected:Npn \__mhchem_output_additionCompound: { \HCode { &middot; } }
+ {\a:mhchemoperator \HCode {&\#xB1;} \b:mhchemoperator } % plusmn
+ \cs_set_protected:Npn \__mhchem_output_electronDot: { \HCode {&\#x2022;} } % bull
+ \cs_set_protected:Npn \__mhchem_output_additionCompound: { \HCode {&\#xB7;} } % middot
\cs_set_protected:Npn \__mhchem_output_excited: { \HCode { &\#x2731; } }
\cs_set_protected:Npn \__mhchem_output_commaDecimal: { , }
-\cs_set_protected:Npn \__mhchem_output_commaEnumeration: {,\HCode { &thinsp; } }
-\cs_set_protected:Npn \__mhchem_output_commaEnumerationSmall: {,\HCode{ &thinsp; } }
+\cs_set_protected:Npn \__mhchem_output_commaEnumeration: {,\HCode {&\#x2009;} } % thinsp
+\cs_set_protected:Npn \__mhchem_output_commaEnumerationSmall: {,\HCode{&\#x2009;} } % thinsp
-\cs_set_protected:Npn \__mhchem_output_bond_single: { \a:mhchemoperator{\HCode { &minus; }}\b:mhchemoperator}
-\cs_set_protected:Npn \__mhchem_output_bond_double: { \a:mhchemoperator{\HCode { &equals; }}\b:mhchemoperator}
-\cs_set_protected:Npn \__mhchem_output_bond_triple: { \a:mhchemoperator{\HCode { &equiv; }}\b:mhchemoperator}
+\cs_set_protected:Npn \__mhchem_output_bond_single: { \a:mhchemoperator{\HCode { &\#x2212; }}\b:mhchemoperator}
+\cs_set_protected:Npn \__mhchem_output_bond_double: { \a:mhchemoperator{\HCode { =}}\b:mhchemoperator}
+\cs_set_protected:Npn \__mhchem_output_bond_triple: { \a:mhchemoperator{\HCode { &\#x2261;}}\b:mhchemoperator}
% todo: add MathML support for these
\cs_set_protected:Npn \__mhchem_output_bond_half: % todo: improve
{\a:mhchembondhalf}
@@ -150,8 +150,8 @@
\NewConfigure{mhchembondoneandhalf}{1}
\NewConfigure{mhchembondtwoandhalf}{1}
\NewConfigure{mhchembondtwoandhalff}{1}
-\cs_set_protected:Npn \__mhchem_output_bond_dotdotdot: { \HCode { &middot;&middot;&middot; } }
-\cs_set_protected:Npn \__mhchem_output_bond_dotdotdotdot: { \HCode { &middot;&middot;&middot;&middot; } }
+\cs_set_protected:Npn \__mhchem_output_bond_dotdotdot: { \HCode { &\#xB7;&\#xB7;&\#xB7;} } % &middot;&middot;&middot;
+\cs_set_protected:Npn \__mhchem_output_bond_dotdotdotdot: { \HCode { &\#xB7;&\#xB7;&\#xB7;&\#xB7;} } % &middot;&middot;&middot;&middot;
\cs_set_protected:Npn \__mhchem_output_bond_rightArrow: { \HCode { &\#xffeb; } }
\cs_set_protected:Npn \__mhchem_output_bond_leftArrow: { \HCode { &\#xffe9; } }
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht
index aaf186c4db7..15c6abddba7 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht
@@ -1,4 +1,4 @@
-% ooffice-mml.4ht (2024-01-25-13:42), generated from tex4ht-ooffice.tex
+% ooffice-mml.4ht (2024-01-29-13:27), generated from tex4ht-ooffice.tex
% Copyright 2009-2024 TeX Users Group
% Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
%
@@ -17,12 +17,13 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-01-25-13:42}
+\immediate\write-1{version 2024-01-29-13:27}
\exit:ifnot{Preamble,%
amsmath,%
array,%
latex,%
+mhchem,%
rlbabel,%
tex4ht}
@@ -112,7 +113,7 @@ tex4ht}
<!-- \jobname-m\math:obj
\space
by TeX4ht from \jobname.tex line \the\inputlineno\space
- 2024-01-25-13:42\Hnewline
+ 2024-01-29-13:27\Hnewline
(http://www.cse.ohio-state.edu/\string ~gurari/TeX4ht/)
-->\Hnewline
}%
@@ -1144,6 +1145,16 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureHinput{mhchem}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ % redefine this command to add the text: prefix for the text commands
+\renewcommand\:mhmathmlorhtml[2]{\ifmathml\a:mathml #1\else text:#2\fi}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput