load nameref via latex hooks, tex4ht r1007

git-svn-id: svn://tug.org/texlive/trunk@60883 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 25 insertions, 7 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index a78d8ac87cc..c12cbded3e6 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,7 +1,19 @@
+2021-10-28  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (biblatex-hooks.4ht): use LaTeX package hooks to load
+	Nameref.
+	https://tex.stackexchange.com/a/620503/2891
+
+2021-10-22  Karl Berry  <karl@freefriends.org>
+
+	* tex4ht-fonts-kpfonts.tex: use SmallCaps consistently,
+	to avoid SmallCaps vs. Smallcaps clash on case-insensitive
+	(file)systems.
+
 2021-10-22  Michal Hoftich  <michal.h21@gmail.com>
 
-	* tex4ht-4ht.tex (biblatex-hooks.4ht): load Nameref package with BibLaTeX.
-	https://tex.stackexchange.com/a/619816/2891
+	* tex4ht-4ht.tex (biblatex-hooks.4ht): load Nameref package with
+	BibLaTeX. https://tex.stackexchange.com/a/619816/2891
 
 2021-10-21  Karl Berry  <karl@freefriends.org>
 
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 0fb0109d494..72021dac4da 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 1005 2021-10-22 07:50:38Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1007 2021-10-28 11:48:10Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2021 TeX Users Group    
@@ -3979,8 +3979,14 @@ styles still have issues (namely "anbt"). I've found that loading of "nameref"
 package helps in this case. 
 \Link[https://tex.stackexchange.com/a/619816/2891]{}{}More info\EndLink.
 
+We also need to post-pone the Nameref loading outside of the hooks file, as
+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.
+
+
 \<early biblatex nameref\><<<
-\RequirePackage{nameref}
+\AddToHook{package/before/biblatex}{\RequirePackage{nameref}}
 >>>
 
 %%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex-hooks.4ht
index 0dc87f5e1ae..4fc83a687f1 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-22-14:44), generated from tex4ht-4ht.tex
+% biblatex-hooks.4ht (2021-10-28-12:59), generated from tex4ht-4ht.tex
 % Copyright 2020 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-22-14:44}
+\immediate\write-1{version 2021-10-28-12:59}
 
 \:AtEndOfPackage{%
   \def\blx@mknoautolang{%
@@ -36,6 +36,6 @@
      \blx@lbxinput@iv{#2}{#2}{language '#2'}}}
 
 }
-\RequirePackage{nameref}
+\AddToHook{package/before/biblatex}{\RequirePackage{nameref}}