From 444edbba8fa570dd374545e521235c809b3b1727 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Jun 2021 21:22:10 +0000 Subject: space below image, tex4ht r949; more fragile protection, tex4ht r948 git-svn-id: svn://tug.org/texlive/trunk@59583 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/generic/tex4ht/tex4ht-html5.tex | 3 ++- .../source/generic/tex4ht/tex4ht-mathjax.tex | 5 ++++- Master/texmf-dist/tex/generic/tex4ht/html5.4ht | 20 +++++++++++++++++--- .../tex/generic/tex4ht/mathjax-latex-4ht.4ht | 11 +++++++++-- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex index ca0fab53a49..c11fffa0265 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html5.tex 905 2021-04-18 15:30:06Z karl $ +% $Id: tex4ht-html5.tex 949 2021-06-13 08:57:21Z michal_h21 $ % compile 3 times: latex tex4ht-moz % or xhlatex tex4ht-moz "html,3,sections+" % @@ -349,6 +349,7 @@ Configure HTML5 figures. Floats are converted as captions too. \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} >>> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex index 79b3ab8fe03..714ea31ab5a 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-mathjax.tex 904 2021-04-16 20:30:30Z karl $ +% $Id: tex4ht-mathjax.tex 948 2021-06-13 08:51:16Z michal_h21 $ % compile: latex tex4ht-mathjax % % Copyright 2018-2021 TeX Users Group @@ -187,4 +187,7 @@ Fixes for tables of contents. \fixmathjaxtoc\sum \fixmathjaxtoc\( \fixmathjaxtoc\) +\fixmathjaxtoc\begin +\fixmathjaxtoc\end +\fixmathjaxtoc\\ >>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/html5.4ht b/Master/texmf-dist/tex/generic/tex4ht/html5.4ht index ff6b4adf963..9aefb5336b0 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html5.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html5.4ht @@ -1,4 +1,4 @@ -% html5.4ht (2021-04-17-18:22), generated from tex4ht-html5.tex +% html5.4ht (2021-06-13-08:45), generated from tex4ht-html5.tex % Copyright 2016-2021 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,7 +16,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-04-17-18:22} +\immediate\write-1{version 2021-06-13-08:45} \exit:ifnot{amsart,% amsbook,% @@ -231,6 +231,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} @@ -269,6 +270,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} \ConfigureEnv{abstract} @@ -314,6 +316,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} \ConfigureEnv{abstract} @@ -375,6 +378,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} @@ -413,6 +417,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} @@ -421,6 +426,7 @@ tex4ht} \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsproc} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -451,6 +457,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} @@ -592,6 +599,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} \ConfigureEnv{abstract} {\ifvmode\IgnorePar\fi\EndP\HCode{
\Hnewline}} @@ -670,7 +678,6 @@ tex4ht} - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -703,6 +710,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} @@ -741,6 +749,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} @@ -779,6 +788,7 @@ tex4ht} \Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:center;}} \Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} +\Css{p + figcaption, img + figcaption{margin-top: 1em;}} @@ -1027,6 +1037,10 @@ tex4ht} + + + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht index b196a09ca9f..317724f2121 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht @@ -1,4 +1,4 @@ -% mathjax-latex-4ht.sty (2021-04-16-13:28), generated from tex4ht-mathjax.tex +% mathjax-latex-4ht.sty (2021-06-13-08:45), generated from tex4ht-mathjax.tex % Copyright 2018-2021 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,7 +16,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-04-16-13:28} +\immediate\write-1{version 2021-06-13-08:45} \RequirePackage{etoolbox,expl3,environ} @@ -117,6 +117,9 @@ \fixmathjaxtoc\sum \fixmathjaxtoc\( \fixmathjaxtoc\) +\fixmathjaxtoc\begin +\fixmathjaxtoc\end +\fixmathjaxtoc\\ } \endinput @@ -566,6 +569,10 @@ + + + + -- cgit v1.2.3