X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-latex.sty;h=eaa55d1fd3440263fa3a53bf74baa6d63f550dbb;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=922a9c9d440af1cf59544d1bc6c3e2ffe2e11e41;hpb=e803f31e0495428067f149cb24c0eb3b92b19d92;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index 922a9c9..eaa55d1 100644
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -8,19 +8,19 @@
 \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}[2015/09/21 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}
@@ -48,10 +48,10 @@
   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 .4pt,
   xkanjiskip=.25\zw plus 1pt minus 1pt,
   autospacing, autoxspacing, jacharrange={-1},
-  yalbaselineshift=0pt, yjabaselineshift=0pt,
+  yalbaselineshift=\z@, yjabaselineshift=\z@,
   jcharwidowpenalty=500, differentjfm=paverage
 }
 
@@ -63,6 +63,11 @@
 \ltj@pkgpatch{xunicode}
 \ltj@pkgpatch{fontspec}
 \ltj@pkgpatch{stfloats}
+\ltj@pkgpatch{footmisc}
+\ltj@pkgpatch{tascmac}
+\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{\input{lltjp-tascmac.sty}}{}}% ascmac
+
+\RequirePackage{lltjp-geometry}
 
 
 %%------------------ all done