From c4226217ccfe6b2107a95026b293b6e4a2db4e63 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Nov 2021 22:37:52 +0000 Subject: do not load nameref in hooks, tex4ht r1009 git-svn-id: svn://tug.org/texlive/trunk@60968 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 11 +++++++++ .../source/generic/tex4ht/tex4ht-4ht.tex | 28 +++++++++++++++++----- .../tex/generic/tex4ht/biblatex-hooks.4ht | 6 ++--- .../tex/generic/tex4ht/hyperref-hooks.4ht | 14 +++-------- 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 93917213431..6d3301318d1 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,9 +1,20 @@ +2021-11-05 Michal Hoftich + + * tex4ht-4ht.tex (hyperref-hooks.4ht, biblatex-hooks.4ht): + removed loading of the Nameref package from package hooks. It caused various + issues and I don't even remember what was the point. + https://puszcza.gnu.org.ua/bugs/?534 + 2021-11-04 Michal Hoftich * tex4ht-html4.tex (html4.4ht): fix for paragraphs after AMS classes proof environment. https://tex.stackexchange.com/a/621370/2891 +2021-10-31 Karl Berry + + * tex4ht-4ht.tex (biblatex-hooks.4ht): copyright 2021. + 2021-10-28 Michal Hoftich * tex4ht-4ht.tex (biblatex-hooks.4ht): use LaTeX package hooks to load diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 72021dac4da..b929a455825 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 1007 2021-10-28 11:48:10Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1009 2021-11-05 17:09:29Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2021 TeX Users Group @@ -3941,7 +3941,7 @@ correctly. This just removes the error message. \<<< % biblatex-hooks.4ht (|version), generated from |jobname.tex -% Copyright 2020 TeX Users Group +% Copyright 2020-2021 TeX Users Group | \:AtEndOfPackage{% \def\blx@mknoautolang{% @@ -3950,7 +3950,7 @@ correctly. This just removes the error message. }% | } -| +%| >>> \AddFile{9}{biblatex-hooks} Some biblatex styles reported error missing English language. @@ -3973,6 +3973,11 @@ a wrong code. The saved version of that command must be used instead. \blx@lbxinput@iv{#2}{#2}{language '#2'}}} >>> +Update 2021/11/04: the following information is here for the historical reasons. +We don't load Nameref from BibLaTeX anymore. I've found that we need to +remove Nameref from hyperref-hooks.4ht and then everything works. + +Historical info: BibLaTeX and TeX4ht both redefine the \Verb|\ifthenelse| command. We take care of it in biblatex.4ht by defining the \Verb|\TE@hook| command. But some BibLaTeX styles still have issues (namely "anbt"). I've found that loading of "nameref" @@ -3984,7 +3989,7 @@ it seems to cause other issues if we used \Verb|\RequirePackage| directly. We can utilize the LaTeX hook system for that. \Link[https://tex.stackexchange.com/a/620503/2891]{}{}See this issue\EndLink. - +This code is not used anymore: \<<< \AddToHook{package/before/biblatex}{\RequirePackage{nameref}} >>> @@ -4991,6 +4996,18 @@ We can load nameref from the early hook file % hyperref-hooks.4ht (|version), generated from |jobname.tex % Copyright 2021 TeX Users Group | +% we don't have any code here for now +>>> \AddFile{9}{hyperref-hooks} + +This code used to be loaded from hyperref-hooks.4ht, but I +found that it causes serious clashes with BibLaTeX. It is +legacy code that I don't understand what is supposed to do. + +Maybe we will find that it's omission cause other issues, +but I tried three recent bug reports regarding Hyperref +and BibLaTeX and they all work better when we remove it. + +\<<< \:AtEndOfPackage{% \@ifpackageloaded{nameref}{} {% @@ -4999,8 +5016,7 @@ We can load nameref from the early hook file \let\label\sv:label %\input nameref.4ht }} - ->>> \AddFile{9}{hyperref-hooks} +>>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex-hooks.4ht index e56d7aa4e47..e314ab3a79a 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/biblatex-hooks.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/biblatex-hooks.4ht @@ -1,4 +1,4 @@ -% biblatex-hooks.4ht (2021-10-31-08:43), generated from tex4ht-4ht.tex +% biblatex-hooks.4ht (2021-11-05-15:12), generated from tex4ht-4ht.tex % Copyright 2020-2021 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 2021-10-31-08:43} +\immediate\write-1{version 2021-11-05-15:12} \:AtEndOfPackage{% \def\blx@mknoautolang{% @@ -36,6 +36,6 @@ \blx@lbxinput@iv{#2}{#2}{language '#2'}}} } -\AddToHook{package/before/biblatex}{\RequirePackage{nameref}} +%\AddToHook{package/before/biblatex}{\RequirePackage{nameref}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht index ade87008a8a..964d5b8614d 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 (2021-05-06-14:39), generated from tex4ht-4ht.tex +% hyperref-hooks.4ht (2021-11-05-15:12), generated from tex4ht-4ht.tex % Copyright 2021 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,15 +16,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-05-06-14:39} - -\:AtEndOfPackage{% -\@ifpackageloaded{nameref}{} -{% - \let\sv:label\label - \RequirePackage{nameref}% - \let\label\sv:label - %\input nameref.4ht -}} +\immediate\write-1{version 2021-11-05-15:12} +% we don't have any code here for now -- cgit v1.2.3