diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-30 22:17:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-30 22:17:41 +0000 |
commit | 876f3927fd2d54a94d8cd2ddc6655b80217c9640 (patch) | |
tree | c0667fc44d3fc40181815aed031ed159edfaa853 /Master | |
parent | 9ed8565bf59c27d974c0bc11e7e1f90f90fb6c73 (diff) |
avoid spurious <p> in boxed, tex4ht r1456; nested links in footnotes, tex4ht r1457
git-svn-id: svn://tug.org/texlive/trunk@69640 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
5 files changed, 21 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index a268359b249..427adcd3d44 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,12 @@ +2024-01-30 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-html4.tex (html4.4ht): fixed nested links in footnotes. + https://tex.stackexchange.com/a/708335/2891 + + * tex4ht-mathml.tex (mathml.4ht): prevent spurious opening <p> tags + in \boxed commands. + https://tex.stackexchange.com/a/708306/2891 + 2024-01-29 Michal Hoftich <michal.h21@gmail.com> * tex4ht-ooffice.tex (ooffice-mml.4ht), diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index 82cd70f74a4..38ac28f4d89 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html4.tex 1453 2024-01-24 22:08:34Z karl $ +% $Id: tex4ht-html4.tex 1457 2024-01-30 20:48:28Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -5119,8 +5119,8 @@ The `index=i' provides the initial setting. \<default offline footnote text\><<< \Configure{footnotetext} {|<open footnote page|>% - |<fn mark sup|>\Link{}{|<footnote id|>}% - \NoFonts\AnchorLabel + |<fn mark sup|>\AnchorLabel\Link{}{|<footnote id|>}% + \NoFonts% } {\EndNoFonts \EndLink|<fn mark end sup|>} {|<close footnote page|>} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index b5cc838ebd3..acdc463ecb6 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 1455 2024-01-29 13:45:00Z michal_h21 $$ +% $Id: tex4ht-mathml.tex 1456 2024-01-30 16:31:58Z michal_h21 $$ % compile 3 times: latex tex4ht-mathltx % or xhlatex tex4ht-mathltx "html,3,sections+" % @@ -5012,7 +5012,7 @@ tail>>> \<configure mathml amsmath\><<< \Configure{boxed} {\ifmathml \Tg<\a:mathml menclose \a:mathml notation="box">\Tg<\a:mathml mrow>% - \else \HCode{<span class="boxed">}\IgnorePar\fi} + \else \HCode{<span class="boxed">}\fi\IgnorePar} {\ifmathml \Tg</\a:mathml mrow>\Tg</\a:mathml menclose>% \else \HCode{</span>}\fi} \Css{.boxed{border: 1px solid black; padding-left:2px; diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 65a42478a57..2312388353e 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht @@ -1,4 +1,4 @@ -% html4.4ht (2024-01-24-14:08), generated from tex4ht-html4.tex +% html4.4ht (2024-01-30-13:46), generated from tex4ht-html4.tex % Copyright 2009-2024 TeX Users Group % Copyright 1997-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-30-13:46} \exit:ifnot{8859-6,% CJK,% @@ -2905,9 +2905,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% {}% % \csname a:footnote-mark\endcsname -\Link{}{fn\FNnum x\minipageNum +\AnchorLabel\Link{}{fn\FNnum x\minipageNum }% - \NoFonts\AnchorLabel + \NoFonts% } {\EndNoFonts \EndLink\csname b:footnote-mark\endcsname } diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index 9c7f164fd08..2752ab62072 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-29-13:27), generated from tex4ht-mathml.tex +% mathml.4ht (2024-01-30-13:46), 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-29-13:27} +\immediate\write-1{version 2024-01-30-13:46} \exit:ifnot{Preamble,% accents,% @@ -2134,7 +2134,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {\HCode{</\a:mathml mtd>}} \Configure{boxed} {\ifmathml \Tg<\a:mathml menclose \a:mathml notation="box">\Tg<\a:mathml mrow>% - \else \HCode{<span class="boxed">}\IgnorePar\fi} + \else \HCode{<span class="boxed">}\fi\IgnorePar} {\ifmathml \Tg</\a:mathml mrow>\Tg</\a:mathml menclose>% \else \HCode{</span>}\fi} \Css{.boxed{border: 1px solid black; padding-left:2px; |