diff options
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 5 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht | 6 |
3 files changed, 26 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 9d23de7852e..c7de0728940 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,8 @@ +2021-08-14 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (biblatex.4ht): don't check for Hyperref when we define + \TE@hook macro. + 2021-08-12 Michal Hoftich <michal.h21@gmail.com> * tex4ht-ooffice.tex (ooffice.4ht): added support for SVG image inclusion. diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 2f3aa6f0e12..daac99a89e3 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 972 2021-08-12 20:24:34Z michal_h21 $ +% $Id: tex4ht-4ht.tex 973 2021-08-14 10:42:30Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2021 TeX Users Group @@ -1985,12 +1985,29 @@ old and there were no such errors previously. Anyway, this code should try to patch ifthenelse using TeX4ht built-in mechanism for ifthenelse. -\<config biblatex\><<< +We defined the hook macro depending on presence of Hyperref. +I don't remember why, but it seems to works with Hyperref now, +so the package condition seems unnecessary. It even produces +an error when Hyperref is used before BibLaTeX, so I think +we should remove it. + +This sections is kept here just for the future reference, the +next section is actually used: +\<\><<< \@ifpackageloaded{hyperref}{}{% \ifdefined\TE@hook\else% \def\TE@hook{}% \fi% } +>>> + +Define TE@hook so BibLaTeX don't try to patch ifthenelse. +We put the hook ourselves thanks to Configure{ifthenelse}. + +\<config biblatex\><<< +\ifdefined\TE@hook\else% +\def\TE@hook{}% +\fi% \AtBeginDocument{% \Configure{ifthenelse}{\TE@hook} diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht index 5d8a19ce0cf..2db5ba238ff 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht @@ -1,4 +1,4 @@ -% biblatex.4ht (2021-07-05-13:41), generated from tex4ht-4ht.tex +% biblatex.4ht (2021-08-14-14:10), generated from tex4ht-4ht.tex % Copyright 2007-2009 Eitan M. Gurari % Copyright 2009-2021 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-07-05-13:41} +\immediate\write-1{version 2021-08-14-14:10} \def\make:blx:ver#1.#2#3\relax{% %\ifdim#1pt< 3pt \xdef\blx:ver:no{2}\else\xdef\blx:ver:no{3}\fi% @@ -58,11 +58,9 @@ {\c@secnumdepth=\sv:sec:cnt\save:section}}% } \gHAssign\bibN=0 -\@ifpackageloaded{hyperref}{}{% \ifdefined\TE@hook\else% \def\TE@hook{}% \fi% -} \AtBeginDocument{% \Configure{ifthenelse}{\TE@hook} |