2 files changed, 18 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
index 5d55d2e628e..6483f843cc3 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
@@ -1,4 +1,4 @@
-% latex.4ht (2020-06-02-14:05), generated from tex4ht-4ht.tex
+% latex.4ht (2020-07-28-14:30), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
 % Copyright 2009-2020 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2020-06-02-14:05}
+\immediate\write-1{version 2020-07-28-14:30}
 
 \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi
 
@@ -35,10 +35,15 @@
 \let\end\o:end
 \let\o:end\:UnDef
 \let\o:enddocumenthook\@enddocumenthook
-\def\@enddocumenthook{\HtmlEnv
+\def\:enddocumenthook{\HtmlEnv
    \Configure{newpage}{}%
    \o:enddocumenthook
    \at:docend  \csname export:hook\endcsname  }
+\ifdefined\AddToHook%
+ \AddToHook{enddocument} {\HtmlEnv\Configure{newpage}{}\at:docend  \csname export:hook\endcsname}
+\else%
+  \let\@enddocumenthook\:enddocumenthook
+\fi
 
 \expandafter\ifx \csname pageno\endcsname\relax
                  \let\pageno\c@page   \fi
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
index ccd784dd0d4..f86d80b4902 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 (2020-07-27-14:07), generated from tex4ht-sty.tex
+% tex4ht.sty (2020-07-28-14:30), generated from tex4ht-sty.tex
 % Copyright 2009-2020 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 2020-07-27-14:07}
+\immediate\write-1{version 2020-07-28-14:30}
 
 
 \ifx  \Preamble\UnDef  \else
@@ -171,13 +171,18 @@
      \global\let\ht:empty\empty \gdef\empty{}%
 \fi\fi
 %
-   \expandafter\let\csname enddocument\endcsname\empty
-   \end{document}%
+   %\expandafter\let\csname enddocument\endcsname\empty
+   %\end{document}%
    \let\:begindocumenthook\@begindocumenthook
 \def\@begindocumenthook{\csname a:AtBeginDocument\endcsname
 \:begindocumenthook \csname b:AtBeginDocument\endcsname }%
 %
-   \let\document\o:document
+   %\let\document\o:document
+   \ifdefined\AddToHook%
+      \def\document{\endgroup\o:document}%
+   \else%
+      \let\document\o:document%
+   \fi%
    \let\:latex@error\@latex@error
    \def\@latex@error##1{\:latex@error{##1 in `\config:file'}}%
    \csname recall:sub\endcsname