texlive[69177] Master/texmf-dist: avoid spurious <mo> in ooffice,
commits+karl at tug.org
commits+karl at tug.org
Wed Dec 20 22:47:48 CET 2023
Revision: 69177
https://tug.org/svn/texlive?view=revision&revision=69177
Author: karl
Date: 2023-12-20 22:47:48 +0100 (Wed, 20 Dec 2023)
Log Message:
-----------
avoid spurious <mo> in ooffice, tex4ht r1426
Revision Links:
--------------
https://tug.org/svn/texlive?view=revision&revision=1426
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2023-12-20 20:53:55 UTC (rev 69176)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2023-12-20 21:47:48 UTC (rev 69177)
@@ -1,3 +1,9 @@
+2023-12-20 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-ooffice.tex (ooffice-mml.4ht): use code from html-mml.4ht
+ to prevent spurious <mo> element in equation. It could prevent
+ displaying of equations.
+
2023-12-17 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-4ht.tex (enumitem.4ht): prevent errors with redefined
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex 2023-12-20 20:53:55 UTC (rev 69176)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex 2023-12-20 21:47:48 UTC (rev 69177)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 1405 2023-11-03 10:47:49Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1426 2023-12-20 10:13:58Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -7741,6 +7741,7 @@
>>>
+
\<tab-based display equation\><<<
\Configure{equation}
{\IgnorePar\ifvmode\else \HCode{<!--tex4ht:inline-->}\fi
@@ -7876,6 +7877,7 @@
\<configure ooffice-mml amsmath\><<<
+|<alt mathopen for eq|>
\:CheckOption{tab-eq}\if:Option
|<tab-based ams display equation|>
\else
@@ -7886,10 +7888,26 @@
>>>
+Current AMSMath uses empty mathopen at the beginning of an equation,
+which results in missing markup for subsequent numbers and characters.
+We check for empty parameter, and don't execute configurations when it is empty.
+This is a copy from tex4ht-mathml.tex, because here it is used only in the
+htlm-mml.4ht output.
+\<alt mathopen for eq\><<<
+\def\eq:mathopen#1{\ifx\relax#1\relax\else\a:mathopen\fi\o:mathopen:{#1}}
+>>>
+\<mathopen in equation\><<<
+\let\mathopen\eq:mathopen%
+>>>
+
+
+
+
+
\<tabular-based ams display equation\><<<
\Configure{equation}
{\ifvmode \IgnorePar\fi\EndP
@@ -7896,6 +7914,7 @@
|<equation start table|>%
|<amsmath equation july 2000|>%
|<disp math within equation|>%
+ |<mathopen in equation|>%
}
{\ifvmode \IgnorePar\fi\EndP |<equation table cells separator|>}
{\ifvmode \IgnorePar\fi\EndP |<equation end table|>%
@@ -7912,6 +7931,7 @@
\EndP \HCode{<text:p text:style-name="equ-p-tab"><text:tab/>}%
\Tabtrue
|<amsmath equation july 2000|>%
+ |<mathopen in equation|>%
\IgnorePar}
{\Tabfalse \ifvmode \IgnorePar\fi\EndP \HCode{<text:tab/>}}
{\HCode{</text:p>}|<try inline par|>%
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht 2023-12-20 20:53:55 UTC (rev 69176)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht 2023-12-20 21:47:48 UTC (rev 69177)
@@ -1,4 +1,4 @@
-% ooffice-mml.4ht (2023-01-19-13:31), generated from tex4ht-ooffice.tex
+% ooffice-mml.4ht (2023-12-20-13:05), generated from tex4ht-ooffice.tex
% Copyright 2009-2023 TeX Users Group
% Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2023-01-19-13:31}
+\immediate\write-1{version 2023-12-20-13:05}
\exit:ifnot{Preamble,%
amsmath,%
@@ -112,7 +112,7 @@
<!-- \jobname-m\math:obj
\space
by TeX4ht from \jobname.tex line \the\inputlineno\space
- 2023-01-19-13:31\Hnewline
+ 2023-12-20-13:05\Hnewline
(http://www.cse.ohio-state.edu/\string ~gurari/TeX4ht/)
-->\Hnewline
}%
@@ -488,11 +488,12 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsmath}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \:CheckOption{tab-eq}\if:Option
+ \def\eq:mathopen#1{\ifx\relax#1\relax\else\a:mathopen\fi\o:mathopen:{#1}}
+
+\:CheckOption{tab-eq}\if:Option
\Configure{equation}
{\IgnorePar\ifvmode\else \HCode{<!--tex4ht:inline-->}\fi
\EndP \HCode{<text:p text:style-name="equ-p-tab"><text:tab/>}%
@@ -508,6 +509,8 @@
\HCode{</\a:mathml mtd><\a:mathml mtd>}\fi }
{}%
%
+ \let\mathopen\eq:mathopen%
+%
\IgnorePar}
{\Tabfalse \ifvmode \IgnorePar\fi\EndP \HCode{<text:tab/>}}
{\HCode{</text:p>}\ShowPar\par{\HCondtrue\noindent}%
@@ -542,6 +545,8 @@
\CenteredFrametrue \DviMath \CenteredFramefalse }
{\EndDviMath\EndP}{}%
%
+ \let\mathopen\eq:mathopen%
+%
}
{\ifvmode \IgnorePar\fi\EndP \HCode{</text:p></table:table-cell>\Hnewline
<table:table-cell table:style-name="equ-num-cell">%
@@ -639,6 +644,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{array}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -768,6 +774,11 @@
+
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{rlbabel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -837,6 +848,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2023-12-20 20:53:55 UTC (rev 69176)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2023-12-20 21:47:48 UTC (rev 69177)
@@ -1,4 +1,4 @@
-% ooffice.4ht (2023-11-09-13:34), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2023-12-20-13:05), generated from tex4ht-ooffice.tex
% Copyright 2009-2023 TeX Users Group
% Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2023-11-09-13:34}
+\immediate\write-1{version 2023-12-20-13:05}
\exit:ifnot{Preamble,%
algorithmicx,%
@@ -8254,6 +8254,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{babel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8291,6 +8292,7 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{plain}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8476,6 +8478,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{biblatex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12956,6 +12959,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{fancyvrb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12986,8 +12990,6 @@
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{color}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13183,7 +13185,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{verse}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13310,6 +13311,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{frenchb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13330,6 +13332,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{apacite}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18367,8 +18370,6 @@
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{slides}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18654,6 +18655,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{pstricks}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18677,7 +18679,6 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{pst-all}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19076,6 +19077,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{linguex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19105,7 +19107,6 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{cgloss4e}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19440,7 +19441,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{ulem}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19976,6 +19976,8 @@
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{footmisc}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20018,6 +20020,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{mdwlist}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20227,7 +20230,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{framed}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20275,5 +20277,8 @@
+
+
+
\endinput
More information about the tex-live-commits
mailing list.