tex4ht sync (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58182 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 19 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/caption.4ht b/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
index e564ca63995..69ac1955bde 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
@@ -1,4 +1,4 @@
-% caption.4ht (2021-02-14-13:56), generated from tex4ht-4ht.tex
+% caption.4ht (2021-03-06-13:30), generated from tex4ht-4ht.tex
 % Copyright 2007-2009 Eitan M. Gurari
 % Copyright 2009-2021 TeX Users Group
 %
@@ -54,6 +54,11 @@
   \caption@make@below%
 }
 
+ \renewcommand*\caption@@@addcontentsline[4]{%
+   \addcontentsline{#1}{#2}{\protect\numberline{#3}{\detokenize{#4}}}%
+ }
+
+
 \Hinput{caption}
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index b6a3242faca..8baaf77b405 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 (2021-03-04-15:22), generated from tex4ht-html4.tex
+% html4.4ht (2021-03-06-13:31), generated from tex4ht-html4.tex
 % Copyright 2009-2020 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 2021-03-04-15:22}
+\immediate\write-1{version 2021-03-06-13:31}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -11403,6 +11403,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 \Configure{ImageMagick}{convert}
 \Configure{Ghostscript}{rungs}
 
+\ifx\gr:density\empty
+\gdef\gr:density{300}
+\fi
 
 \NewConfigure{EpsConvert}{1}
 \NewConfigure{PdfConvert}{2}
@@ -11416,8 +11419,8 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 % it is better to use the following command. pdf2svg must be installed separately.
 \Configure{EpsConvert}{"epstopdf "\Gin@base.eps"  && pdf2svg "\Gin@base.pdf" "\Gin@base.svg""}
 \else
-\Configure{PdfConvert}{png}{"\a:Ghostscript\space -q -dNOPAUSE -dBATCH -dusecropbox -sDEVICE=pngalpha -r300 \ifx\Gin@page\@empty\else -dFirstPage="\Gin@page"  -dLastPage="\Gin@page"\fi\space -sOutputFile="\Gin@base-\Gin@page.\a:PdfConvert" "\Gin@base.pdf" "}
-\Configure{EpsConvert}{"\a:Ghostscript\space -dSAFER    -dBATCH    -dNOPAUSE    -dEPSCrop    -r120  -sDEVICE=pngalpha -sOutputFile="\Gin@base.png" "\Gin@base.eps" "}
+\Configure{PdfConvert}{png}{"\a:Ghostscript\space -q -dNOPAUSE -dBATCH -dusecropbox -sDEVICE=pngalpha -r\gr:density\space \ifx\Gin@page\@empty\else -dFirstPage="\Gin@page"  -dLastPage="\Gin@page"\fi\space -sOutputFile="\Gin@base-\Gin@page.\a:PdfConvert" "\Gin@base.pdf" "}
+\Configure{EpsConvert}{"\a:Ghostscript\space -dSAFER    -dBATCH    -dNOPAUSE    -dEPSCrop    -r\gr:density\space -sDEVICE=pngalpha -sOutputFile="\Gin@base.png" "\Gin@base.eps" "}
 \fi
 \Configure{graphics*}
    {pdf}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
index a3eeedf9556..57fde306ee6 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
@@ -1,7 +1,7 @@
 \ifnum\the\catcode`\%=14\else\expandafter\edef\csname
   \string:RestoreCatcodes\endcsname{\catcode`\%\the
   \catcode`\%}\catcode`\%14\fi
-% tex4ht.sty (2021-01-02-13:53), generated from tex4ht-sty.tex
+% tex4ht.sty (2021-03-06-13:30), generated from tex4ht-sty.tex
 % Copyright 2009-2021 TeX Users Group
 % Copyright 1996-2009 Eitan M. Gurari
 %
@@ -20,7 +20,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-01-02-13:53}
+\immediate\write-1{version 2021-03-06-13:30}
 
 
 \ifx  \Preamble\UnDef  \else
@@ -848,6 +848,10 @@
 \ifx \:temp\:tempa
    \let\ht:everypar\everypar
 \else
+   % LaTeX kernel will patch \everypar in future releases,
+   % so this test will always fail. We should define \ht:everypar
+   % anyway, paragraph handling would fail otherwise
+   \let\ht:everypar\everypar
    \:warning{nonprimitive \string\everypar}
 \fi
 \edef\NoHtmlEnv{%