#40839

[luatex-ja/luatexja.git] / src / ltj-latex.sty

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index b2af322..506adea 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-10-09 LaTeX support of LuaTeX-ja]
 
 % cleanup at end of the document
 %\let\ltj@@orig@end=\@@end
@@ -21,27 +21,41 @@
 
 \endlinechar=13
 
+%%% LaTeX version detection
+\ifcsname tex_shipout:D\endcsname
+  \expandafter\let\csname tex_shipout:D\endcsname\ltj@shipout
+\fi
+\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@ltfilehook@availtrue\fi
+}{}
+
 %%% patch for LaTeX
 \usepackage{lltjfont}
 \usepackage{lltjdefs}
 \usepackage{lltjcore}
+\RequirePackage{lltjp-atbegshi}
 
 %%% patching commands
-\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
   \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
@@ -50,34 +64,18 @@
     \@@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]}}%]
-\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{begindocument/before}[luatexja.autopatch]}
+\else
+  \def\ltj@pkgpatch@@{\gpreto\@begindocumenthook}
+\fi
+\def\ltj@pkgpatch@#1[#2]{%
+  \ltj@pkgpatch@@{%
+    \@ifpackageloaded{#1}{\@ifpackageloaded{#2}{}{\RequirePackage{#2}}}{}%
   }%
 }
-
-%%% default parameters
-\directlua{
-  local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
-  luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
-}
-
-\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
-  xkanjiskip=.25\zw plus 1pt minus 1pt,
-  autospacing, autoxspacing, jacharrange={-1},
-  yalbaselineshift=\z@, yjabaselineshift=\z@,
-  jcharwidowpenalty=500, differentjfm=paverage
-}
-
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 
 %%% patch for packages
@@ -88,14 +86,17 @@
 \ltj@pkgpatch{tascmac}
 \ltj@pkgpatch{ascmac}[lltjp-tascmac]
 \ltj@pkgpatch@im{stfloats}
-\ltj@pkgpatch{preview}  %% at \begin{document}
+\ifltj@ltfilehook@avail\else
+  \ltj@pkgpatch{preview}  %% at \begin{document}
   % (preview package has delayed option)
+\fi
 \ltj@pkgpatch{array}    %% at \begin{document}
 \ltj@pkgpatch{collcell} %% at \begin{document}
 \ltj@pkgpatch@im{unicode-math}
 \ltj@pkgpatch@im{siunitx}
 \ltj@pkgpatch@im{microtype}
-\ltj@pkgpatch@im{everyshi}
+
+\ifltj@ltfilehook@avail\else\ltj@pkgpatch@im{everyshi}\fi
 
 \RequirePackage{lltjp-geometry}