filehook -> ltfilehook

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index b2af322..b47eb57 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -12,7 +12,7 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2020-05-17 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2020-08-03 LaTeX support of LuaTeX-ja]
 
 % cleanup at end of the document
 %\let\ltj@@orig@end=\@@end
@@ -30,11 +30,19 @@
 \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
+  \else\ltj@ltfilehook@availtrue\fi
 }{}
 \ifltj@ltfilehook@avail
-  \def\ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
-  \def\ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+  \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+  \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+  \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}}%
+  }
 \else
   \RequirePackage{filehook}
   \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile
@@ -50,10 +58,7 @@
     \@@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@im@#1[#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/ltjarticle.cls b/src/ltjarticle.cls
index 5cc447f..ed8118b 100644 (file)
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -850,8 +850,8 @@
 \else
   \@mparswitchfalse
 \fi
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjarticle.cls'.

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index 21390be..464dc07 100644 (file)
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -954,8 +954,8 @@
 \else
   \@mparswitchfalse
 \fi
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjbook.cls'.

diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index dd156b3..a868bcb 100644 (file)
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -133,6 +133,7 @@
 %    新設の|ptexmin|オプション指定時にのみ行うようにした。
 %    句読点を「、」「。」に統一。}
 % \changes{v1.8e-ltj-19}{2020/07/27}{|everyshi|パッケージへのパッチを別パッケージへ分離。}
+% \changes{v1.8e-ltj-20}{2020/08/03}{\LaTeX~2020-10-01への対応．}
 % \fi
 %
 % \iffalse
@@ -4706,8 +4707,12 @@
 % \section{各種パッケージへの対応}
 % もともと縦組での利用を想定されていないいくつかのパッケージについて、
 % 補正するためのコードを記述しておきます。
-% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます）
-% の機能を用いています。
+%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます）
+%% の機能を用いています。
+%
+% [2020-08-03 LTJ] \LaTeX\~2020-10-01に対応するため、Lua\TeX-jaの提供する命令
+% （|filehook|パッケージの命令の別名か、新\LaTeX のフック機構を利用して同様の内容を書いたもの）
+% に置き換えました。
 %
 % \subsection{\texttt{ftnright}パッケージ}
 % 脚注番号の書式が|ftnright|パッケージによって勝手に書き換えられるので、
@@ -4715,8 +4720,8 @@
 % \changes{v1.7d}{2017/02/19}{コード追加}
 %    \begin{macrocode}
 %<*article|report|book>
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 %</article|report|book>
 %    \end{macrocode}
 %

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index 109758d..a7a7389 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -951,8 +951,8 @@
 \else
   \@mparswitchfalse
 \fi
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjreport.cls'.

diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls
index 960a483..41e7b75 100644 (file)
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -851,8 +851,8 @@
 \fi
 \normalmarginpar
 \@mparswitchfalse
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjtarticle.cls'.

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 386d2c2..e7b6c31 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -955,8 +955,8 @@
 \fi
 \normalmarginpar
 \@mparswitchfalse
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjtbook.cls'.

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index cd11192..36128bf 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -952,8 +952,8 @@
 \fi
 \normalmarginpar
 \@mparswitchfalse
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjtreport.cls'.

diff --git a/src/patches/lltjp-geometry.sty b/src/patches/lltjp-geometry.sty
index bba78fb..c60089e 100644 (file)
--- a/src/patches/lltjp-geometry.sty
+++ b/src/patches/lltjp-geometry.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-geometry}[2020/02/25 Patch to geometry for LuaTeX-ja with vertical writing mode]
+\ProvidesPackage{lltjp-geometry}[2020-08-03 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
@@ -32,13 +32,17 @@
 %============================================
 \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}}
+  \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+  \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+  \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}}%
+  }
 \else
   \RequirePackage{filehook}
   \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile