wip: filehook -> ltfilehook

diff --git a/src/lltjext.sty b/src/lltjext.sty
index 9e1421b..d19db9a 100644 (file)
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -738,7 +738,6 @@
      \lineskip\z@skip\baselineskip\z@skip\@preamble}
   \def\endarray{\crcr\egroup\egroup\@end@alignbox\@arrayright}
 }
-
 \@ifpackageloaded{array}{%
   \let\tabular=\ltj@lltjext@orig@tabular
   \let\array=\ltj@lltjext@orig@array
@@ -746,8 +745,7 @@
 }{%
   \let\ltj@lltjext@orig@tabular\relax
   \let\ltj@lltjext@orig@array\relax
-  \RequirePackage{filehook,etoolbox}
-  \AtEndOfPackageFile{array}{\ltj@lltjext@patch@array}
+  \ltj@ExecuteAfterPackage{array}{\ltj@lltjext@patch@array}
 }
 
 %%%%%%%%%%%%%%%% LuaTeX-ja original

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index ca774fe..b2af322 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -27,21 +27,33 @@
 \usepackage{lltjcore}
 
 %%% patching commands
-\RequirePackage{filehook}
-
+\newif\ifltj@ltfilehook@avail
+\@ifl@t@r\fmtversion{2020-10-01}{%
+  \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi
+  \else\ltj@ltfilehookavailtrue\fi
+}{}
+\ifltj@ltfilehook@avail
+  \def\ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+  \def\ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+\else
+  \RequirePackage{filehook}
+  \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile
+  \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile
+\fi
 \def\ltj@pkgpatch@im#1{%
  \@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%]
-\def\ltj@pkgpatch@im@#1[#2]{%
-  \AtEndOfPackageFile*{#1}{%
-    \@ifpackageloaded{#2}{}{%
-         \@namedef{ver@#2.\@pkgextension}{0000/00/00}%dummy
-         \if\catcode`@=11\let\ltj@temp\relax\else
-           \edef\ltj@temp{\noexpand\catcode`@=\the\catcode`@\relax}\makeatletter
-         \fi
-         \@@input{#2.\@pkgextension}\ltj@temp
-       }%
+\def\ltj@pkgpatch@im@@#1{%
+  \@ifpackageloaded{#1}{}{%
+    \if\catcode`@=11\let\ltj@temp\relax\else
+      \edef\ltj@temp{\noexpand\catcode`@=\the\catcode`@\relax}\makeatletter
+    \fi
+    \@@input{#1.\@pkgextension}\ltj@temp
   }%
 }
+\def\ltj@pkgpatch@im@#1[#2]{%
+  \@ifpackageloaded{#1}{\ltj@pkgpatch@im@@{#2}}%
+  {\ltj@ExecuteAfterPackage{#1}{\ltj@pkgpatch@im@@{#2}}}%
+}
 
 \def\ltj@pkgpatch#1{%
   \@ifnextchar[{\ltj@pkgpatch@@{#1}}{\ltj@pkgpatch@@{#1}[lltjp-#1]}}%]

diff --git a/src/patches/lltjp-geometry.sty b/src/patches/lltjp-geometry.sty
index 9b8f1fc..bba78fb 100644 (file)
--- a/src/patches/lltjp-geometry.sty
+++ b/src/patches/lltjp-geometry.sty
@@ -29,14 +29,31 @@
 }
 \fi
 
-\RequirePackage{filehook}
+%============================================
+\unless\ifdefined\ltj@ExecuteAfterPackage
+\newif\ifltj@ltfilehook@avail
+\@ifl@t@r\fmtversion{2020-10-01}{%
+  \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi
+  \else\ltj@ltfilehookavailtrue\fi
+}{}
+\ifltj@ltfilehook@avail
+  \def\ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+  \def\ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+\else
+  \RequirePackage{filehook}
+  \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile
+  \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile
+\fi
+\fi
+%============================================
+
 \RequirePackage{etoolbox}
 \newif\ifGm@ltj@layoutswitch
 \let\orig@PackageWarningNoLine=\PackageWarningNoLine
 % define ifGm@swap@papersize if it is undefined
 \expandafter\newif\csname ifGm@swap@papersize\endcsname
 
-\AtBeginOfPackageFile{geometry}{%
+\ltj@ExecuteBeforePackage{geometry}{%
   \edef\Gm@ltj@topskip{\the\topskip}
   \edef\Gm@ltj@headsep{\the\headsep}
   \edef\Gm@ltj@footskip{\the\footskip}
@@ -54,8 +71,7 @@
   \fi
 \fi
 }
-
-\AtEndOfPackageFile{geometry}{%
+\ltj@ExecuteAfterPackage{geometry}{%
 \let\PackageWarningNoLine=\orig@PackageWarningNoLine
 \if@ltj@@geometry@tate
   \let\PackageWarningNoLine=\orig@PackageWarningNoLine