OSDN Git Service

more
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Mon, 3 Aug 2020 11:20:44 +0000 (20:20 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Mon, 3 Aug 2020 11:20:44 +0000 (20:20 +0900)
src/ltj-latex.sty
src/patches/lltjp-geometry.sty

index b47eb57..7da60fd 100644 (file)
@@ -48,8 +48,8 @@
   \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{\@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%]
+\def\ltj@pkgpatch@im@#1[#2]{\ltj@ExecuteAfterPackage*{#1}{\ltj@pkgpatch@im@@{#2}}}
 \def\ltj@pkgpatch@im@@#1{%
   \@ifpackageloaded{#1}{}{%
     \if\catcode`@=11\let\ltj@temp\relax\else
     \@@input{#1.\@pkgextension}\ltj@temp
   }%
 }
-\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]}}%]
-\def\ltj@pkgpatch@@#1[#2]{%
-  \gpreto\@begindocumenthook{%
-    \@ifpackageloaded{#1}{%
-         \@ifpackageloaded{#2}{}{\RequirePackage{#2}}%
-       }{}%
+\def\ltj@pkgpatch#1{\@ifnextchar[{\ltj@pkgpatch@{#1}}{\ltj@pkgpatch@{#1}[lltjp-#1]}}%]
+\ifltj@ltfilehook@avail
+  \def\ltj@pkgpatch@@{\AddToHook{env/document/before}[luatexja.autopatch]}
+\else
+  \def\ltj@pkgpatch@@{\gpreto\@begindocumenthook}
+\fi
+\def\ltj@pkgpatch@#1[#2]{%
+  \ltj@pkgpatch@@{%
+    \@ifpackageloaded{#1}{\@ifpackageloaded{#2}{}{\RequirePackage{#2}}}{}%
   }%
 }
 
index c60089e..e27a6fa 100644 (file)
 
 %============================================
 \unless\ifdefined\ltj@ExecuteAfterPackage
-\newif\ifltj@ltfilehook@avail
+\expandafter\newif\csname ifltj@ltfilehook@avail\endcsname
+\@ifl@t@r\fmtversion{2020-10-01}{%
+  \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\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}}