\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2015/09/21 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2017/01/28 LaTeX support of LuaTeX-ja]
% cleanup at end of the document
%\let\ltj@@orig@end=\@@end
luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
}
-\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .4pt,
+\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
yalbaselineshift=\z@, yjabaselineshift=\z@,
\ltj@pkgpatch{unicode-math}
\ltj@pkgpatch{xunicode}
\ltj@pkgpatch{fontspec}
-\ltj@pkgpatch{stfloats}
\ltj@pkgpatch{footmisc}
\ltj@pkgpatch{tascmac}
-\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{\input{lltjp-tascmac.sty}}{}}% ascmac
+\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{stfloats}
\RequirePackage{lltjp-geometry}
+\RequirePackage{filehook}
+\AtEndOfPackageFile*{fontspec}{%
+ \input{lltjp-fontspec-immediate.sty}
+ % \RequirePackage だと fontspec にオプション指定したときにエラー出る
+}
%%------------------ all done