X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-latex.sty;h=922a9c9d440af1cf59544d1bc6c3e2ffe2e11e41;hb=0526b27bf88ed7f2adedef267f4d9226f6f5a692;hp=3cb52389e14c866c5e834a5af20babedacad70fd;hpb=1a139ec449b922a03f1e6608380bdea12aa532b0;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index 3cb5238..922a9c9 100644
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -12,7 +12,12 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2012/04/21 LuaLaTeX-ja]
+\ProvidesPackage{ltj-latex}[2013/05/14 LaTeX support of LuaTeX-ja]
+
+% I (HK) don't know why the code below is not necessary.
+%\let\ltj@@orig@end=\@@end
+%\outer\protected\def\@@end{%
+%  \directlua{luatexja.direction.remove_end_whatsit()}\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{
@@ -38,20 +43,26 @@
 \usepackage{lltjcore}
 
 %%% 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=0pt plus 0.4pt minus 0.4pt,
   xkanjiskip=.25\zw plus 1pt minus 1pt,
   autospacing, autoxspacing, jacharrange={-1},
   yalbaselineshift=0pt, yjabaselineshift=0pt,
-  jcharwidowpenalty=500, differentjfm=average
+  jcharwidowpenalty=500, differentjfm=paverage
 }
 
-\input luatexja-kinsoku.tex
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 
 %%% patch for packages
 \ltj@pkgpatch{listings}
 \ltj@pkgpatch{unicode-math}
 \ltj@pkgpatch{xunicode}
+\ltj@pkgpatch{fontspec}
+\ltj@pkgpatch{stfloats}
 
 
 %%------------------ all done