summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-26 21:45:27 +0000
committerKarl Berry <karl@freefriends.org>2023-09-26 21:45:27 +0000
commit41861ec7f087018df3092df2616e2ecaec696510 (patch)
treedc8f35be0c954c3a4e070cddc0d5b776d11ee97c /Master/texmf-dist/source/generic
parent574f55abeb7ecec548e1acd1e7619d7559a7afa1 (diff)
use <text:p> instead of <text:h>, tex4ht r1373; check for mathvariant csname, tex4ht r1374
git-svn-id: svn://tug.org/texlive/trunk@68378 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog10
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex4
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex30
3 files changed, 27 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 9ee489d97ee..6c83cad10bd 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,13 @@
+2023-09-25 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-mathml.tex (mathml.4ht): check for the existence of the
+ mathvariant csname.
+
+ * tex4ht-ooffice.tex (ooffice.4ht): use <text:p> elements instead of
+ <text:h> for list environments. They were included in the TOC after
+ automatic TOC update in LibreOffice.
+ https://tug.org/pipermail/tex4ht/2023q3/003399.html
+
2023-09-22 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-html4.tex (html4.4ht): test for the existence of
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
index 9b6f23c04b9..0569dde4347 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathml.tex 1371 2023-09-20 12:19:50Z michal_h21 $$
+% $Id: tex4ht-mathml.tex 1374 2023-09-25 14:17:53Z michal_h21 $$
% compile 3 times: latex tex4ht-mathltx
% or xhlatex tex4ht-mathltx "html,3,sections+"
%
@@ -1866,7 +1866,7 @@ It will add the mathvariant tag to the \verb'<math>' element.
\<mathversion config\><<<
\append:defI\mathversion{%
% \a:DviMathML is executed at the beginning of math \a:@math is hook for attributes. we need to append out tags to it
- \Configure{DviMathML}{\append:def\a:@math{\expandafter\csname :mathversion-\math@version\endcsname}}{}%
+ \Configure{DviMathML}{\append:def\a:@math{\ifcsname :mathversion-\math@version\endcsname\expandafter\csname :mathversion-\math@version\endcsname\fi}}{}%
}
>>>
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
index c1d1372d491..6fa41d66336 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 1290 2023-01-24 11:53:35Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1373 2023-09-25 11:08:51Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -2018,11 +2018,11 @@ change the configuration slightly. We modify directly the
\HCode{</text:list-item>}%
}%
\HCode{<text:list-item>%
- <text:h text:style-name="dt|<cond rtl class|>"\Hnewline >%
+ <text:p text:style-name="dt|<cond rtl class|>"\Hnewline >%
}%
}
{\EndP
- \HCode{</text:h>}%
+ \HCode{</text:p>}%
\HCode{<!--dd\Hnewline class="description"-->}%
\par
}
@@ -2292,9 +2292,9 @@ change the configuration slightly. We modify directly the
\RecallHtmlPar
\HCode{</text:list-item></text:list>}\ShowPar}
{\end:itm \global\def\end:itm{\EndP\HCode{</text:list-item>}}%
- \HCode{<text:list-item><text:h
+ \HCode{<text:list-item><text:p
text:style-name="dt|<cond rtl class|>"\Hnewline >}\bgroup \bf}
- {\egroup\HCode{</text:h>}\par\ShowPar}
+ {\egroup\HCode{</text:p>}\par\ShowPar}
>>>
@@ -2608,7 +2608,7 @@ change the configuration slightly. We modify directly the
\PopMacro\end:Itm \global\let\end:Itm\end:Itm
\HCode{</text:list>}\RecallHtmlPar \ShowPar}
{\end:itm \end:Itm \gdef\end:Itm{\HCode{</text:list-item>}}%
- \gdef\end:itm{\HCode{</text:h>}}\HCode{<text:list-item><text:h
+ \gdef\end:itm{\HCode{</text:p>}}\HCode{<text:list-item><text:p
text:style-name="dt|<cond rtl class|>"\Hnewline >}\bgroup \bf}
{\egroup \end:itm \gdef\end:itm{\HCode{</text:p>}}%
\HCode{<text:p\Hnewline
@@ -2774,7 +2774,7 @@ change the configuration slightly. We modify directly the
\PopMacro\end:Itm \global\let\end:Itm\end:Itm
\HCode{</text:list>}\RecallHtmlPar \ShowPar}
{\end:itm \end:Itm \gdef\end:Itm{\HCode{</text:list-item>}}%
- \gdef\end:itm{\HCode{</text:h>}}\HCode{<text:list-item><text:h
+ \gdef\end:itm{\HCode{</text:p>}}\HCode{<text:list-item><text:p
text:style-name="dt|<cond rtl class|>"\Hnewline >}\bgroup \bf}
{\egroup \end:itm \gdef\end:itm{\HCode{</text:p>}}%
\HCode{<text:p\Hnewline
@@ -3156,10 +3156,10 @@ See html4 comment regarding \verb+\Configure{jbanchor}{\Link}{\EndLink}+
\EndP\HCode{</text:p></text:list-item></text:list>}\ShowPar}
{\ifvmode \IgnorePar\fi \EndP
\end:itm \global\def\end:itm{\EndP\HCode{</text:p></text:list-item>}}%
- \HCode{<text:list-item><text:h
+ \HCode{<text:list-item><text:p
text:style-name="printthebibliography-dt"\Hnewline>}\bgroup \bf}
{\ifvmode \IgnorePar\fi \EndP
- \egroup\HCode{</text:h><text:p
+ \egroup\HCode{</text:p><text:p
text:style-name="printthebibliography-dd"\Hnewline>}\par\ShowPar}
>>>
@@ -3175,15 +3175,15 @@ See html4 comment regarding \verb+\Configure{jbanchor}{\Link}{\EndLink}+
\HCode{<text:list
text:style-name="printshorthands"
text:name="printshorthands"\Hnewline
- ><text:list-item><text:h
+ ><text:list-item><text:p
text:style-name="printshorthands-dt"\Hnewline>}%
}
{\ifvmode \IgnorePar\fi \EndP
\HCode{</text:list-item></text:list>}}
{\ifvmode \IgnorePar\fi \EndP
- \HCode{</text:list-item><text:list-item><text:h
+ \HCode{</text:list-item><text:list-item><text:p
text:style-name="printshorthands-dt"\Hnewline>}}
- {\HCode{</text:h><text:p text:style-name="printshorthands-dd">}%
+ {\HCode{</text:p><text:p text:style-name="printshorthands-dd">}%
\Next:EndP{\HCode{</text:p>}}%
}
\Configure{@shorthands}
@@ -8071,7 +8071,7 @@ It seems that it is a best method how to come with solutions that work in the OD
\special{t4ht@.}%
}
{\end:itm \end:Itm \gdef\end:Itm{\HCode{</text:list-item>}}%
- \gdef\end:itm{\HCode{</text:h>}\special{t4ht@.}}\HCode{<text:list-item><text:h
+ \gdef\end:itm{\HCode{</text:p>}\special{t4ht@.}}\HCode{<text:list-item><text:p
text:style-name="algorithmic-dt|<cond rtl class|>"\Hnewline >}\bgroup \bf
\special{t4ht@. }%
}
@@ -10770,9 +10770,9 @@ semicolons from catcode changes when loaded, e.g., in french.
\RecallHtmlPar
\HCode{</text:list-item></text:list>}\ShowPar}
{\end:itm \global\def\end:itm{\EndP\HCode{</text:list-item>}}%
- \HCode{<text:list-item><text:h
+ \HCode{<text:list-item><text:p
text:style-name="dt|<cond rtl class|>"\Hnewline >}\bgroup \bf}
- {\egroup\HCode{</text:h>}\par\ShowPar}%
+ {\egroup\HCode{</text:p>}\par\ShowPar}%
}
>>>