4 files changed, 25 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 6fd8ded5b11..146207b308c 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,8 @@
+2024-05-07  Linas Stonys  <lstonys@vtex.lt>
+
+	* tex4ht-4ht.tex (latex.4ht, amsmath.4ht): fixed restoring of \begin
+	and \end in the \measure@ command.
+
 2024-05-06  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-sty.tex (tex4ht.sty): don't disable \DocumentMetadata.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 172cc6fa40d..aa73c275dff 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1514 2024-05-06 14:50:21Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1515 2024-05-07 15:21:27Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2024 TeX Users Group    
@@ -7276,6 +7276,7 @@ and the command \`'\end{xxx}' referes to the meaning of \`'\endxxx'.
 \<latex ltmiscen\><<<
       \pend:defI\begin{\let\chk:pic|=\EndPicture }
       \let\o:begin:|=\begin
+      \expandafter\let \csname o:begin :\expandafter\endcsname\csname begin \endcsname
       \let\choose:begin\@firstoftwo
 \DeclareRobustCommand\begin[1]{\csname @begin:#1\endcsname 
   \choose:begin
@@ -7352,7 +7353,7 @@ are initiated within  \''\begin{...}'. For instance, in eqnarray there
 %%%%%%%%%%%%%
 
 \<latex ltmiscen\><<<
-\let\o:end:|=\end
+\expandafter\let \csname o:end :\expandafter\endcsname\csname end \endcsname
 \DeclareRobustCommand\end[1]{\choose:begin
   {|<revised end|>}%
   {\o:end:{#1}}}
@@ -21218,8 +21219,10 @@ due to a \''\vtop' in the macro definition.
 \let\:tempc|=\measure@
 \pend:defI\:tempc{\bgroup
    \RecallTeXcr \HRestore\noalign \let\EndPicture\empty
-   \let\halign|=\TeXhalign \let\span|=\:span  \HRestore\begin 
-   \HRestore\end   \a:measure@ }
+   \let\halign|=\TeXhalign \let\span|=\:span  
+   \expandafter\HRestore\csname begin \endcsname
+   \expandafter\HRestore\csname end \endcsname
+ \a:measure@ }
 \append:defI\:tempc{\egroup}
 \HLet\measure@|=\:tempc
 \NewConfigure{measure@}{1}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht
index 4b72ebb2a39..4367f0d7c74 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht
@@ -1,6 +1,6 @@
-% amsmath.4ht (2023-08-13-13:20), generated from tex4ht-4ht.tex
+% amsmath.4ht (2024-05-07-13:28), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2023-08-13-13:20}
+\immediate\write-1{version 2024-05-07-13:28}
 
 \HRestore\cases
 \HRestore\matrix
@@ -535,8 +535,10 @@
 \let\:tempc\measure@
 \pend:defI\:tempc{\bgroup
    \RecallTeXcr \HRestore\noalign \let\EndPicture\empty
-   \let\halign\TeXhalign \let\span\:span  \HRestore\begin
-   \HRestore\end   \a:measure@ }
+   \let\halign\TeXhalign \let\span\:span
+   \expandafter\HRestore\csname begin \endcsname
+   \expandafter\HRestore\csname end \endcsname
+ \a:measure@ }
 \append:defI\:tempc{\egroup}
 \HLet\measure@\:tempc
 \NewConfigure{measure@}{1}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
index ab7e09cf2bc..910c0ef699e 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 (2024-02-26-13:19), generated from tex4ht-4ht.tex
+% latex.4ht (2024-05-07-13:28), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
 % Copyright 2009-2024 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2024-02-26-13:19}
+\immediate\write-1{version 2024-05-07-13:28}
 
 \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi
 
@@ -594,6 +594,7 @@
 
       \pend:defI\begin{\let\chk:pic\EndPicture }
       \let\o:begin:\begin
+      \expandafter\let \csname o:begin :\expandafter\endcsname\csname begin \endcsname
       \let\choose:begin\@firstoftwo
 \DeclareRobustCommand\begin[1]{\csname @begin:#1\endcsname
   \choose:begin
@@ -642,7 +643,7 @@
 \NewConfigure{@begin}[2]{%
    \expandafter\ifx\csname @begin:#1\endcsname\relax\fi
    \expandafter\concat:config\csname @begin:#1\endcsname{#2}}
-\let\o:end:\end
+\expandafter\let \csname o:end :\expandafter\endcsname\csname end \endcsname
 \DeclareRobustCommand\end[1]{\choose:begin
   {%\IgnoreIndent
   \ifvmode \ifx \EndPicture\:UnDef
@@ -2337,7 +2338,7 @@ $\vcenter
 \expandafter\:temp\usepackage!*?: 
 \def\:tempa{\@latex@e@error}
 \ifx \:temp\:tempa
-   % latex209.4ht (2024-02-26-13:19), generated from tex4ht-4ht.tex
+   % latex209.4ht (2024-05-07-13:28), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
 % Copyright 2009-2024 TeX Users Group
 %
@@ -2356,7 +2357,7 @@ $\vcenter
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2024-02-26-13:19}
+\immediate\write-1{version 2024-05-07-13:28}
 
 \let\:fnsymbol\@fnsymbol
 \def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}}