summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-11-17 21:46:02 +0000
committerKarl Berry <karl@freefriends.org>2022-11-17 21:46:02 +0000
commitb3af5caa17b9d6a549877df56ef516db67a70c44 (patch)
tree7c9aa1995856d6d27f4dcee4e5cc2350a260e572 /Master/texmf-dist
parente0b69509184f55823eb40ec8e0ab254077d7d2c8 (diff)
do not use \@caption from caption.sty, fails with \index inside, tex4ht r1240; disable footnotebackref, tex4ht r1241
git-svn-id: svn://tug.org/texlive/trunk@65044 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog9
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/Makefile2
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex4
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex46
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/caption-hooks.4ht6
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/footnotebackref-hooks.4ht15
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/footnotebackref.4ht23
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht5
8 files changed, 101 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 2a6f3ec1a41..28e098577fb 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,12 @@
+2022-11-17 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (
+ usepackage.4ht, footnotebackref-hooks.4ht, footnotebackref.4ht
+ ): disable the package Footnotebackref.
+
+ * tex4ht-4ht.tex (caption-hooks.4ht): don't use Caption's version of
+ \@caption, as it doesn't work with \index command included inside.
+
2022-11-16 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-mathml.tex (mathml.4ht): use displaystyle=true attribute in
diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile
index 79637cb8f58..f901ebbb4f9 100644
--- a/Master/texmf-dist/source/generic/tex4ht/Makefile
+++ b/Master/texmf-dist/source/generic/tex4ht/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1236 2022-11-15 12:28:12Z michal_h21 $
+# $Id: Makefile 1239 2022-11-16 22:27:35Z karl $
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
index bb78f1e5712..80aac32c781 100644
--- a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1235 2022-11-04 15:46:19Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1241 2022-11-17 18:48:36Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -62,6 +62,8 @@
\AddFile{9}{subfigure}
\AddFile{9}{caption}
\AddFile{9}{subcaption}
+\AddFile{9}{footnotebackref}
+\AddFile{9}{footnotebackref-hooks}
\AddFile{9}{floatrow}
\AddFile{9}{makeidx}
\AddFile{9}{splitidx}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index b78484d8a02..f846cebdac2 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 1237 2022-11-15 15:09:44Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1241 2022-11-17 18:48:36Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -12294,7 +12294,7 @@ Foo
\long\def\caption@If@Package@Loaded#1[#2]#3#4{}
\renewcommand*\caption@redefine{%
\let\caption\caption@caption%
- \let\@caption\caption@@caption%
+ % \let\@caption\caption@@caption%
}%
}
>>> \AddFile{9}{caption-hooks}
@@ -12377,6 +12377,48 @@ prevent this issue.
\endinput
>>> \AddFile{9}{subcaption}
+
+%%%%%%%%%%%%%
+\Section{footnotebackref.sty}
+%%%%%%%%%%%%%
+
+Dummy package for footnotebackref. We need to disable it completely.
+
+\<footnotebackref.4ht\><<<
+% footnotebackref.4ht (|version), generated from |jobname.tex
+% Copyright 2022 TeX Users Group
+|<TeX4ht license text|>
+\Hinput{footnotebackref}
+\endinput
+>>> \AddFile{9}{footnotebackref}
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{footnotebackref.sty}{footnotebackref-hooks.4ht}
+>>>
+
+We disable the package, but still support the package options, as
+other packages (such as tablefootnote.sty) rely on them.
+
+\<footnotebackref-hooks.4ht\><<<
+\:dontusepackage{footnotebackref}
+\RequirePackage{kvoptions}% v3.10
+\@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}
+
+\SetupKeyvalOptions{family=FootnoteBackref, prefix=FootnoteBackref@}
+
+% The symbol between the footnotenumber and the footnotetext
+% If empty no symbol will be printed
+\DeclareStringOption{symbol}
+
+% Option to hyperlink the footnotenumber
+\DeclareBoolOption[true]{numberlinked}
+\ProcessKeyvalOptions*
+\endinput
+>>> \AddFile{9}{footnotebackref-hooks}
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\Section{floatrow.sty}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/caption-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/caption-hooks.4ht
index d94a860964d..c33d2f1fd46 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/caption-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/caption-hooks.4ht
@@ -1,4 +1,4 @@
-% caption-hooks.4ht (2021-05-16-09:21), generated from tex4ht-4ht.tex
+% caption-hooks.4ht (2022-11-17-13:27), generated from tex4ht-4ht.tex
% Copyright 2020-2021 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,13 +16,13 @@
%
% 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-11-17-13:27}
\:AtEndOfPackage{%
\long\def\caption@If@Package@Loaded#1[#2]#3#4{}
\renewcommand*\caption@redefine{%
\let\caption\caption@caption%
- \let\@caption\caption@@caption%
+ % \let\@caption\caption@@caption%
}%
}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/footnotebackref-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/footnotebackref-hooks.4ht
new file mode 100644
index 00000000000..f57c31cc75c
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/footnotebackref-hooks.4ht
@@ -0,0 +1,15 @@
+\:dontusepackage{footnotebackref}
+\RequirePackage{kvoptions}% v3.10
+\@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}
+
+\SetupKeyvalOptions{family=FootnoteBackref, prefix=FootnoteBackref@}
+
+% The symbol between the footnotenumber and the footnotetext
+% If empty no symbol will be printed
+\DeclareStringOption{symbol}
+
+% Option to hyperlink the footnotenumber
+\DeclareBoolOption[true]{numberlinked}
+\ProcessKeyvalOptions*
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/footnotebackref.4ht b/Master/texmf-dist/tex/generic/tex4ht/footnotebackref.4ht
new file mode 100644
index 00000000000..3941b310a2e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/footnotebackref.4ht
@@ -0,0 +1,23 @@
+% footnotebackref.4ht (2022-11-17-13:27), generated from tex4ht-4ht.tex
+% Copyright 2022 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2022-11-17-13:27}
+
+\Hinput{footnotebackref}
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index 041412ed7e3..8f61c0ef9de 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
@@ -1,4 +1,4 @@
-% usepackage.4ht (2022-11-15-13:15), generated from tex4ht-4ht.tex
+% usepackage.4ht (2022-11-17-13:27), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2022 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-11-15-13:15}
+\immediate\write-1{version 2022-11-17-13:27}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}
@@ -72,6 +72,7 @@
\Configure{PackageHooks}{hyperref.sty}{hyperref-hooks.4ht}
\Configure{PackageHooks}{bookmark.sty}{bookmark-hooks.4ht}
\Configure{PackageHooks}{caption.sty}{caption-hooks.4ht}
+\Configure{PackageHooks}{footnotebackref.sty}{footnotebackref-hooks.4ht}
\AddToHook{package/doc/before}{\SUPOff}
\AddToHook{package/doc/after}{\SUPOn}
\AddToHook{package/hypdoc/before}{\SUPOff}