texlive[63520] Master/texmf-dist: fix deprecated hook calling, tex4ht

[commits+karl at tug.org]

Revision: 63520
          http://tug.org/svn/texlive?view=revision&revision=63520
Author:   karl
Date:     2022-06-09 00:04:03 +0200 (Thu, 09 Jun 2022)
Log Message:
-----------
fix deprecated hook calling, tex4ht r1142; restore \ifthen properly, tex4ht r1143

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=1142
    http://tug.org/svn/texlive?view=revision&revision=1143

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-06-08 21:22:11 UTC (rev 63519)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-06-08 22:04:03 UTC (rev 63520)
@@ -1,3 +1,11 @@
+2022-06-08  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (ifthen.4ht): restore \ifthen from
+	\NROrg at 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 at gmail.com>
 
 	* tex4ht-fonts-modern.tex (

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-06-08 21:22:11 UTC (rev 63519)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-06-08 22:04:03 UTC (rev 63520)
@@ -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 @@
 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 at ifthenelse%
 \let\ifthenelse\NROrg at ifthenelse%
-}{}
+\fi
 >>>
 
 \<fix ifthen\><<<
@@ -25008,10 +25012,10 @@
 >>>
 
 \<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|>
 }

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht	2022-06-08 21:22:11 UTC (rev 63519)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht	2022-06-08 22:04:03 UTC (rev 63520)
@@ -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 at ifthenelse%
 \let\ifthenelse\NROrg at ifthenelse%
-}{}
+\fi
 
    \long\def\:tempc{%
    \let\sv:begingroup\begingroup

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht	2022-06-08 21:22:11 UTC (rev 63519)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/minted-sty-hooks.4ht	2022-06-08 22:04:03 UTC (rev 63520)
@@ -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 at def@opt at switch}[2][false]{%
   \define at booleankey{minted at opt@g}{#2}%