summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog5
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex18
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht13
3 files changed, 26 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index a24838473db..2788f1da95d 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,8 @@
+2021-12-08 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (hyperref-hooks.4ht): reintroduced loading of Nameref due
+ to various issues that it's removal caused.
+
2021-12-02 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): search for \par<word boundary> in
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index ebd9ed01d91..2482de95264 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 1024 2021-12-02 16:32:57Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1025 2021-12-08 13:40:02Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -3973,6 +3973,10 @@ a wrong code. The saved version of that command must be used instead.
\blx@lbxinput@iv{#2}{#2}{language '#2'}}}
>>>
+Updata 2021/12/08: There is still error. I had to reintroduce Nameref to
+hyperref-hooks.4ht, because it's removal broke lot of documents that don't
+use BibLaTeX. BibLaTeX + Hyperref remain broken.
+
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.
@@ -4997,15 +5001,13 @@ We can load nameref from the early hook file
% Copyright 2021 TeX Users Group
|<TeX4ht license text|>
% we don't have any code here for now
+|<load nameref in hyperref hooks|>
>>> \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.
+This code introduces various issues with BibLaTeX. I've tried
+to remove it, which fixed BibLaTeX issues, but broke Nameref.
+So I reintroduce it, and will try to resolve BibLaTeX issues
+in a different way.
\<load nameref in hyperref hooks\><<<
\:AtEndOfPackage{%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
index 964d5b8614d..1874200f438 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-11-05-15:12), generated from tex4ht-4ht.tex
+% hyperref-hooks.4ht (2021-12-08-13:19), generated from tex4ht-4ht.tex
% Copyright 2021 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,7 +16,16 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-11-05-15:12}
+\immediate\write-1{version 2021-12-08-13:19}
% we don't have any code here for now
+\:AtEndOfPackage{%
+\@ifpackageloaded{nameref}{}
+{%
+ \let\sv:label\label
+ \RequirePackage{nameref}%
+ \let\label\sv:label
+ %\input nameref.4ht
+}}
+