summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-06-08 22:04:03 +0000
committerKarl Berry <karl@freefriends.org>2022-06-08 22:04:03 +0000
commite3c9aa5a0eb63c07085837be2d3860662d0524b0 (patch)
tree820b25531246185e4fc7ea0c71db7acefdf1ff56
parenteaf311d60531e74cdaa03ae4c062f66bb5afb81a (diff)
fix deprecated hook calling, tex4ht r1142; restore \ifthen properly, tex4ht r1143
git-svn-id: svn://tug.org/texlive/trunk@63520 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog8
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex16
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht8
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht8
4 files changed, 26 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index b104481a422..da37383239e 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/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/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index c516dffdb4e..5830229c203 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 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|>
}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht b/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
index 5d33df559e3..1ebedee9230 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
@@ -1,4 +1,4 @@
-% ifthen.4ht (2022-01-02-14:32), generated from tex4ht-4ht.tex
+% ifthen.4ht (2022-06-08-14:13), generated from tex4ht-4ht.tex
% Copyright 1997-2009 Eitan M. Gurari
% Copyright 2009-2022 TeX Users Group
%
@@ -17,12 +17,12 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-01-02-14:32}
+\immediate\write-1{version 2022-06-08-14:13}
- \@ifpackageloaded{nameref}{%
+ \ifdefined\NROrg@ifthenelse%
\let\ifthenelse\NROrg@ifthenelse%
-}{}
+\fi
\long\def\:tempc{%
\let\sv:begingroup\begingroup
diff --git a/Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht
index 031e862b936..7347dacce36 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht
@@ -1,5 +1,5 @@
-% minted-sty-hook.4ht, generated from tex4ht-4ht.tex
-% Copyright 2020 TeX Users Group
+% minted-sty-hooks.4ht, generated from tex4ht-4ht.tex
+% Copyright 2022 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,9 +16,9 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2020-12-13-11:14}
+\immediate\write-1{version 2022-06-08-15:03}
-\AddToHook{package/after/minted}{%
+\AddToHook{package/minted/after}{%
\@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}
\newcommand{\:minted@def@opt@switch}[2][false]{%
\define@booleankey{minted@opt@g}{#2}%