From b3af5caa17b9d6a549877df56ef516db67a70c44 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Nov 2022 21:46:02 +0000 Subject: 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 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 9 +++++ Master/texmf-dist/source/generic/tex4ht/Makefile | 2 +- .../source/generic/tex4ht/mktex4ht-cnf.tex | 4 +- .../source/generic/tex4ht/tex4ht-4ht.tex | 46 +++++++++++++++++++++- 4 files changed, 57 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/source/generic') 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 + + * 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 * 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 (|version), generated from |jobname.tex +% Copyright 2022 TeX Users Group +| +\Hinput{footnotebackref} +\endinput +>>> \AddFile{9}{footnotebackref} + +\<<< +\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. + +\<<< +\: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} %%%%%%%%%%%%%%%%%%%%%%%%%%%% -- cgit v1.2.3