\edef\ltj@latex@AtEnd{%
\endlinechar=\the\endlinechar
\relax}
-\endlinechar=-1 %
+\endlinechar\m@ne%
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2013/05/14 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2017/01/28 LaTeX support of LuaTeX-ja]
-% I (HK) don't know why the code below is not necessary.
+% cleanup at end of the document
%\let\ltj@@orig@end=\@@end
-%\outer\protected\def\@@end{%
-% \directlua{luatexja.direction.remove_end_whatsit()}\ltj@@orig@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{
+\long\def\ltj@g@addto@macro#1#2{%
\begingroup
\def\ltj@tmpa{#2}
\toks@\expandafter\expandafter\expandafter{\expandafter\ltj@tmpa#1}
luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
}
-\ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt,
+\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
- yalbaselineshift=0pt, yjabaselineshift=0pt,
+ yalbaselineshift=\z@, yjabaselineshift=\z@,
jcharwidowpenalty=500, differentjfm=paverage
}
\ltj@pkgpatch{unicode-math}
\ltj@pkgpatch{xunicode}
\ltj@pkgpatch{fontspec}
+\ltj@pkgpatch{footmisc}
+\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{stfloats}
+\RequirePackage{lltjp-geometry}
+\RequirePackage{filehook}
+\AtEndOfPackageFile*{fontspec}{%
+ \input{lltjp-fontspec-immediate.sty}
+ % \RequirePackage だと fontspec にオプション指定したときにエラー出る
+}
+
%%------------------ all done
\ltj@latex@AtEnd