From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Sat, 23 Oct 2021 23:41:47 +0000 (+0900)
Subject: support LaTeX 2021-11-15: package hooks
X-Git-Tag: 20211024.0~2
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=7ea7a82ee5961519b9f9277dd46ed759b7cfcc0f;p=luatex-ja%2Fluatexja.git

support LaTeX 2021-11-15: package hooks
---

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index 7e4ec50..4e89ece 100644
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -12,7 +12,7 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2021-05-17 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2021-10-24 LaTeX support of LuaTeX-ja]
 
 \endlinechar=13
 
@@ -60,15 +60,29 @@
 
 %%% patching commands
 \ifltj@ltfilehook@avail
-  \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
-  \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+  %% \ltj@ExecuteBeforePackage <package><code>  and \ltj@ExecuteAfterPackage <package><code>
+  %% no-starred version: do nothing if the <package> is loaded
+  %% starred version: do <code> right away if the <package> is loaded
   \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage}
-  \def\@@ltj@ExecuteAfterPackage@star#1#2{%
-    \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}%
-  }
   \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage}
-  \def\@@ltj@ExecuteBeforePackage@star#1#2{%
-    \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
+  \@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15
+    \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}}
+    \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}}
+    \long\def\@@ltj@ExecuteAfterPackage#1#2{%
+      \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}%
+    }
+    \long\def\@@ltj@ExecuteBeforePackage#1#2{%
+      \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}%
+    }
+  }{
+    \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+    \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+    \long\def\@@ltj@ExecuteAfterPackage@star#1#2{%
+      \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}%
+    }
+    \long\def\@@ltj@ExecuteBeforePackage@star#1#2{%
+      \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
+    }
   }
 \else
   \RequirePackage{filehook}
diff --git a/src/patches/lltjp-geometry.sty b/src/patches/lltjp-geometry.sty
index 0be092e..67b0f5d 100644
--- a/src/patches/lltjp-geometry.sty
+++ b/src/patches/lltjp-geometry.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-geometry}[2020-12-29 Patch to geometry for LuaTeX-ja with vertical writing mode]
+\ProvidesPackage{lltjp-geometry}[2021-10-24 Patch to geometry for LuaTeX-ja with vertical writing mode]
 \RequirePackage{expl3}
 \ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi
 \newif\if@ltj@@geometry@tate
@@ -40,15 +40,29 @@
     }%
 }{}
 \ifltj@ltfilehook@avail
-  \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
-  \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+  %% \ltj@ExecuteBeforePackage <package><code>  and \ltj@ExecuteAfterPackage <package><code>
+  %% no-starred version: do nothing if the <package> is loaded
+  %% starred version: do <code> right away if the <package> is loaded
   \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage}
-  \def\@@ltj@ExecuteAfterPackage@star#1#2{%
-    \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}%
-  }
   \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage}
-  \def\@@ltj@ExecuteBeforePackage@star#1#2{%
-    \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
+  \@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15
+    \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}}
+    \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}}
+    \long\def\@@ltj@ExecuteAfterPackage#1#2{%
+      \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}%
+    }
+    \long\def\@@ltj@ExecuteBeforePackage#1#2{%
+      \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}%
+    }
+  }{
+    \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+    \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+    \long\def\@@ltj@ExecuteAfterPackage@star#1#2{%
+      \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}%
+    }
+    \long\def\@@ltj@ExecuteBeforePackage@star#1#2{%
+      \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
+    }
   }
 \else
   \RequirePackage{filehook}