X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-plain.sty;h=62cfcf7b19d75df855108640784baaa8428e3bfd;hb=3e8f91836a53e6864d3c5831fc7f91cfaad61bc3;hp=c512022628d94507c47620a4935577894cac17b4;hpb=5b893cf7d1678affcc2c7bcb0a9c767aa65efd36;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index c512022..62cfcf7 100644
--- a/src/ltj-plain.sty
+++ b/src/ltj-plain.sty
@@ -14,7 +14,7 @@
 \ifltj@in@latex                 %<*LaTeX>
   \NeedsTeXFormat{LaTeX2e}
   \PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.}
-  \ProvidesPackage{ltj-plain}[2014/09/19]
+  \ProvidesPackage{ltj-plain}[2015/02/22]
 \fi                             %</LaTeX>
 
 %%------------------
@@ -33,7 +33,7 @@
   \closein\ltj@@cfgread
   \input luatexja.cfg
 \fi
-\let\ltj@@cfgread\relax\advance\count16by-1\relax
+\let\ltj@@cfgread\relax\advance\count16\m@ne\relax
 
 \jfont\tenmin=\ltj@stdmcfont:jfm=ujis at 9.62216pt
 \jfont\sevenmin=\ltj@stdmcfont:jfm=ujis at 6.73551pt
@@ -51,27 +51,24 @@
 
 \def\mc{\tenmin\tentmin}
 \def\gt{\tengt\tentgt}
-\mc\tentmin
+\mc
 
 \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,
+\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,
   jatextfont={0, \tenmin}, jascriptfont={0, \sevenmin},
   jascriptscriptfont={0, \fivemin},
 }
-\setbox0=\hbox{M}
-\jfam0
-\ltjsetparameter{
-  talbaselineshift=0.5\ht0, tjabaselineshift=0pt,
-}
-\jfam0
+\setbox\z@=\hbox{M}
+\jfam\z@
+\ltjsetparameter{talbaselineshift=.5\ht0, tjabaselineshift=\z@}
 
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
@@ -92,9 +89,9 @@
 \ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, +8}}
 
 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
-\let\ltj@@orig@end=\end
-\outer\protected\def\end{%
-  \directlua{luatexja.direction.remove_end_whatsit()}\ltj@@orig@end}
+\let\ltj@@orig@end=\@@end
+\protected\def\@@end{%
+  \directlua{luatexja.ext_cleanup()}\ltj@@orig@end}
 
 %%------------------ all done
 \ltj@plain@AtEnd