summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-07-24 20:54:23 +0000
committerKarl Berry <karl@freefriends.org>2022-07-24 20:54:23 +0000
commitb8fa4c4dd1ed03ae23b43190cc86a57c59421d01 (patch)
treec9eba3e98ac44e7b1f2344120c0186bd6524eda4
parent384d55e6ac12b2961215299be36b537221941043 (diff)
do not refine \ref in babel, tex4ht r1178
git-svn-id: svn://tug.org/texlive/trunk@63971 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog5
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex8
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex4
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/babel.4ht19
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht6
5 files changed, 19 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 26522fab4b0..7dc4ce3b8fd 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,8 @@
+2022-07-24 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (babel.4ht): don't redefine \ref in Babel.
+ https://tex.stackexchange.com/a/651875/2891
+
2022-07-16 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (latex.4ht): make \ref and \Ref commands robust.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index c4f747005af..355df13c57e 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 1177 2022-07-16 09:21:43Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1178 2022-07-24 17:04:30Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -23654,7 +23654,11 @@ This modification is needed since Stefan
\edef\:temp{\noexpand\@b:bitem{#1}}\@safe@activesfalse\:temp}
>>>
-\<bbl@redefinerobust\><<<
+
+I don't know what this code was meant to do in the past, but it fails
+with the current LaTeX. It is better to not use it.
+See \Link[https://tex.stackexchange.com/q/651631/2891]{}{} this issue\EndLink.
+\<not use bbl@redefinerobust\><<<
\def\:tempc#1{%
\edef\bbl@tempa{\expandafter\@gobble\string#1}%
\expandafter\ifx\csname \bbl@tempa\space\endcsname\relax
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
index 1d32d1d22c3..3d4e80dc4d3 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 1168 2022-07-04 14:00:59Z michal_h21 $$
+% $Id: tex4ht-mathml.tex 1175 2022-07-10 14:22:09Z karl $$
% compile 3 times: latex tex4ht-mathltx
% or xhlatex tex4ht-mathltx "html,3,sections+"
%
@@ -526,7 +526,7 @@ xmlns="http://www.w3.org/1999/xhtml"
\<html-mml\><<<
% html-mml.4ht (|version), generated from |jobname.tex
-% Copyright 2009-2021 TeX Users Group
+% Copyright 2009-2022 TeX Users Group
% Copyright |CopyYear.1999. Eitan M. Gurari
|<TeX4ht copywrite|>
>>>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/babel.4ht b/Master/texmf-dist/tex/generic/tex4ht/babel.4ht
index af2230f9c1a..ef73156102f 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/babel.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/babel.4ht
@@ -1,6 +1,6 @@
-% babel.4ht (2021-05-16-09:21), generated from tex4ht-4ht.tex
+% babel.4ht (2022-07-24-13:45), generated from tex4ht-4ht.tex
% Copyright 1999-2009 Eitan M. Gurari
-% Copyright 2009-2021 TeX Users Group
+% Copyright 2009-2022 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 2021-05-16-09:21}
+\immediate\write-1{version 2022-07-24-13:45}
\def\:tempc#1{%
@@ -29,19 +29,6 @@
\@safe@activestrue\org@@c:tex[#1]{#2}\@safe@activesfalse}
\let\@citex\@c:tex
-\def\:tempc#1{%
- \edef\bbl@tempa{\expandafter\@gobble\string#1}%
- \expandafter\ifx\csname \bbl@tempa\space\endcsname\relax
- \expandafter\let\csname org@\bbl@tempa\endcsname#1
- \expandafter\edef\csname\bbl@tempa\endcsname{\noexpand\protect
- \expandafter\noexpand\csname\bbl@tempa\space\endcsname}%
- \else
- \expandafter\let\csname org@\bbl@tempa\expandafter\endcsname
- \csname\bbl@tempa\space\endcsname
- \fi
- \expandafter\def\csname\bbl@tempa\space\endcsname}
-\:tempc\:ref#1{\@safe@activestrue\org@:ref{#1}\@safe@activesfalse}
-\let\ref\:ref
\def\@newl@bel#1#2{{\:SUBOff\:SUPOff \@safe@activestrue
\xdef\:temp{\noexpand\n:wlbl{#1}{#2}}}\:temp }
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
index cb77c13bfe5..6ae01bbb218 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
@@ -1,5 +1,5 @@
-% html-mml.4ht (2022-07-05-14:37), generated from tex4ht-mathml.tex
-% Copyright 2009-2021 TeX Users Group
+% html-mml.4ht (2022-07-16-13:23), generated from tex4ht-mathml.tex
+% Copyright 2009-2022 TeX Users Group
% Copyright 1999-2009 Eitan M. Gurari
%
% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-07-05-14:37}
+\immediate\write-1{version 2022-07-16-13:23}
\exit:ifnot{amsmath,%
array,%