summaryrefslogtreecommitdiff
path: root/support/TeX4ht/source
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-06-09 03:01:00 +0000
committerNorbert Preining <norbert@preining.info>2022-06-09 03:01:00 +0000
commit16559ce13a74c7a182875559b379cac00b07efda (patch)
tree6ee63e6aadfabf9a7334e6667fa32646fd812667 /support/TeX4ht/source
parentb3aac3ae7b628835121d1f485fd49998308170e7 (diff)
CTAN sync 202206090300
Diffstat (limited to 'support/TeX4ht/source')
-rw-r--r--support/TeX4ht/source/ChangeLog8
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex16
2 files changed, 18 insertions, 6 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index b104481a42..da37383239 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,11 @@
+2022-06-08 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (ifthen.4ht): restore \ifthen from
+ \NROrg@ifthenelse only when it is defined.
+
+ * tex4ht-4ht.tex (minted-sty-hooks.4ht): fixed deprecated way of
+ calling to package hooks.
+
2022-06-01 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-fonts-modern.tex (
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index c516dffdb4..5830229c20 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1138 2022-05-23 12:21:20Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1144 2022-06-08 22:03:06Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -13591,10 +13591,14 @@ The need to initialize \''\@svsechd' arises in
Nameref redefines ifthenelse command, but it clashes with BibLaTeX,
so we revert back to the original version.
+The 2022 version of Nameref doesn't redefine it anymore, so we will
+restore the original ifthen only if we are on a system with not updated
+Nameref.
+
\<fix nameref ifthen\><<<
-\@ifpackageloaded{nameref}{%
+\ifdefined\NROrg@ifthenelse%
\let\ifthenelse\NROrg@ifthenelse%
-}{}
+\fi
>>>
\<fix ifthen\><<<
@@ -25008,10 +25012,10 @@ As it can be declared in the preamble, we must patch the usepackage code.
>>>
\<minted-sty-hooks.4ht\><<<
-% minted-sty-hook.4ht, generated from |jobname.tex
-% Copyright 2020 TeX Users Group
+% minted-sty-hooks.4ht, generated from |jobname.tex
+% Copyright 2022 TeX Users Group
|<TeX4ht license text|>
-\AddToHook{package/after/minted}{%
+\AddToHook{package/minted/after}{%
\@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}
|<minted breaklines|>
}