summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-11 21:52:00 +0000
committerKarl Berry <karl@freefriends.org>2023-09-11 21:52:00 +0000
commit31fb4eaa80541c1712ab15e876410783c897ece7 (patch)
tree9c9c1c6c75a146d96b54f03c1af1def99c64299a
parent70cb3f19a001e900d261150e22380f6740752881 (diff)
undefined \@chapter with nameref, tex4ht r1368
git-svn-id: svn://tug.org/texlive/trunk@68245 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog10
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex9
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex8
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht11
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mkht.4ht10
5 files changed, 36 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 32140d2938b..8c8eee18c72 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,13 @@
+2023-09-11 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (hyperref-hooks.4ht): undefine the \@chapter
+ command to prevent wrong cutting of pages with numeric options.
+ https://puszcza.gnu.org.ua/bugs/?608
+
+2023-09-10 Karl Berry <karl@freefriends.org>
+
+ * tex4ht-mkht.tex (mkht-scripts): copyright 2023.
+
2023-09-07 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-mathml.tex (mathml.4ht): fixed handling of inline math
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 6ac26a7046a..c76a160f677 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 1362 2023-08-27 15:01:41Z karl $
+% $Id: tex4ht-4ht.tex 1368 2023-09-11 09:02:15Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -5655,6 +5655,13 @@ TeX4ht hooks.
\let\label\sv:label
%\input nameref.4ht
}
+% Nameref defines the \@chapter command unconditionally,
+% but this breaks the page cutting functionality
+% of TeX4ht, so we need to undefine it.
+% See this post for more details https://tex.stackexchange.com/q/695624/2891
+\ifdefined\chapter\else
+ \global\let\@chapter\@relax
+\fi
>>>
Hyperref defines following captions at the end of the package.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex
index 206adb13ef9..09ff18602f6 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex
@@ -1,9 +1,9 @@
-% $Id: tex4ht-mkht.tex 1361 2023-08-20 15:23:27Z karl $
+% $Id: tex4ht-mkht.tex 1367 2023-09-10 15:49:40Z karl $
% (1) latex tex4ht-mkht
% (2) perl -c mk4ht.perl (checking correctness)
% (3) latex mkht-scripts.4ht
%
-% Copyright 2009-2021 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -923,7 +923,7 @@ against that file.
\<mkht\><<<-
% mkht.4ht (?version), generated from ?jobname.tex
-% Copyright 2009-2020 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
% Copyright ?CopyYear.1997. Eitan M. Gurari
?<TeX4ht copyright?>
\immediate\write-1{version ?version}
@@ -1181,7 +1181,7 @@ shebang line, the defaul shell (which can be anything) is used.
\<mkht-scripts\><<<-
% mkht-scripts.4ht (?version), generated from ?jobname.tex
-% Copyright 2009-2020 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
% Copyright ?CopyYear.2000. Eitan M. Gurari
?<TeX4ht copyright?>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
index f0de8936168..b3c7d96eb51 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
@@ -1,4 +1,4 @@
-% hyperref-hooks.4ht (2022-06-20-14:19), generated from tex4ht-4ht.tex
+% hyperref-hooks.4ht (2023-09-11-14:37), generated from tex4ht-4ht.tex
% Copyright 2022 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 2022-06-20-14:19}
+\immediate\write-1{version 2023-09-11-14:37}
\:AtEndOfPackage{%
\@ifpackageloaded{nameref}{}
@@ -27,6 +27,13 @@
\let\label\sv:label
%\input nameref.4ht
}
+% Nameref defines the \@chapter command unconditionally,
+% but this breaks the page cutting functionality
+% of TeX4ht, so we need to undefine it.
+% See this post for more details https://tex.stackexchange.com/q/695624/2891
+\ifdefined\chapter\else
+ \global\let\@chapter\@relax
+\fi
\providecommand*\AMSautorefname{\equationautorefname}
\providecommand*\Hfootnoteautorefname{\footnoteautorefname}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht
index 65b0635e54c..858a8e872a8 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht
@@ -1,5 +1,5 @@
-% mkht.4ht (2023-08-27-00:00), generated from tex4ht-mkht.tex
-% Copyright 2009-2020 TeX Users Group
+% mkht.4ht (2023-09-10-08:49), generated from tex4ht-mkht.tex
+% Copyright 2009-2023 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
% This work may be distributed and/or modified under the
@@ -18,9 +18,9 @@
% If you modify this program, changing the
% version identification would be appreciated.
%
-\immediate\write-1{version \ifx \JOBNAME\UnDefined 2023-08-27-00:00\else |version\fi}
+\immediate\write-1{version \ifx \JOBNAME\UnDefined 2023-09-10-08:49\else |version\fi}
-\immediate\write-1{version 2023-08-27-00:00}
+\immediate\write-1{version 2023-09-10-08:49}
\def\exit{\documentclass{article}\begin{document}\end{document}\endinput}
\bgroup
@@ -378,7 +378,7 @@ to insert the at-echo off only for Windows.
\<windows line\><<<
|<echo off|>
-|Rem |ScriptFileName|AddExtn (2023-08-27-00:00), generated from tex4ht-mkht.tex
+|Rem |ScriptFileName|AddExtn (2023-09-10-08:49), generated from tex4ht-mkht.tex
|Rem Copyright 2009-2020 TeX Users Group
|Rem Copyright 2003-2009 Eitan M. Gurari
|Rem