X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-latex.sty;h=6b8fa81b904995c02e74e0cf576d80a6d74b5ba5;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=e892d8f920f0c3f66789d3cc0e914f12bcfd691e;hpb=43ce654cd7265acfa4840e2417e84516204db1aa;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index e892d8f..6b8fa81 100644
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -12,25 +12,13 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2018/08/23 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2018/08/24 LaTeX support of LuaTeX-ja]
 
 % cleanup at end of the document
 %\let\ltj@@orig@end=\@@end
 %\protected\def\@@end{%
 %  \directlua{luatexja.ext_cleanup()}\ltj@@orig@end}
 
-% Globally add to the head of a macro (cf. LaTeX2e's \g@addto@macro)
-\long\def\ltj@g@addto@macro#1#2{%
-  \begingroup
-    \def\ltj@tmpa{#2}
-    \toks@\expandafter\expandafter\expandafter{\expandafter\ltj@tmpa#1}
-    \xdef#1{\the\toks@}
-  \endgroup}
-
-\def\ltj@AtBeginDocument{\ltj@g@addto@macro\@begindocumenthook}
-
-\def\ltj@pkgpatch#1{\ltj@AtBeginDocument{\@ifpackageloaded{#1}{\usepackage{lltjp-#1}}{}}}
-
 \endlinechar=13
 
 %%% patch for LaTeX
@@ -38,10 +26,32 @@
 \usepackage{lltjdefs}
 \usepackage{lltjcore}
 
+%%% patching commands
 \RequirePackage{filehook}
+
 \def\ltj@pkgpatch@im#1{%
  \@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%]
-\def\ltj@pkgpatch@im@#1[#2]{\AtEndOfPackageFile*{#1}{\input{#2.sty}}}
+\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#1{%
+  \@ifnextchar[{\ltj@pkgpatch@@{#1}}{\ltj@pkgpatch@@{#1}[lltjp-#1]}}%]
+\def\ltj@pkgpatch@@#1[#2]{%
+  \gpreto\@begindocumenthook{%
+    \@ifpackageloaded{#1}{%
+	  \@ifpackageloaded{#2}{}{\RequirePackage{#2}}%
+	}{}%
+  }%
+}
 
 %%% default parameters
 \directlua{
@@ -61,15 +71,10 @@
 %%% patch for packages
 \ltj@pkgpatch@im{listings}
 \ltj@pkgpatch{xunicode}  %% at \begin{document}
-\ltj@pkgpatch{fontspec}  %% at \begin{document}
-\ltj@pkgpatch@im{fontspec}[lltjp-fontspec-immediate]
+\ltj@pkgpatch@im{fontspec}
 \ltj@pkgpatch{footmisc}  %% at \begin{document}
 \ltj@pkgpatch{tascmac}
-\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{%
-  \edef\ltj@asc@temp{\noexpand\catcode`\noexpand\@=\the\catcode`\@}%
-  \makeatletter\input{lltjp-tascmac.sty}%
-  \ltj@asc@temp\let\ltj@asc@temp=\relax
-}{}}% ascmac
+\ltj@pkgpatch{ascmac}[lltjp-tascmac]
 \ltj@pkgpatch@im{stfloats}
 \ltj@pkgpatch{preview}  %% at \begin{document}
   % (preview package has delayed option)