X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-plain.sty;h=27f860c4128a05012f023e9750cbbf092ff99c55;hb=6e437c91858f98e9b24b93209f6301a9111df1ff;hp=d09d05be2bd70603d13503d8c495a08d5e122f0f;hpb=1a139ec449b922a03f1e6608380bdea12aa532b0;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index d09d05b..27f860c 100644
--- a/src/ltj-plain.sty
+++ b/src/ltj-plain.sty
@@ -13,7 +13,7 @@
 
 \ifltj@in@latex                 %<*LaTeX>
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{ltj-plain}[2012/04/21 v0.2]
+  \ProvidesPackage{ltj-plain}[2013/05/14]
 \fi                             %</LaTeX>
 
 %%------------------
@@ -32,24 +32,28 @@
 \let\mc=\tenmin
 \let\gt=\tengt
 \mc
+
+\directlua{
+  luatexja.stack.charprop_stack_table[0] 
+    = dofile(assert(kpse.find_file('ltj-kinsoku.lua', 'tex'),
+      "File `ltj-kinsoku.lua' not found"))
+}
+
 \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
-
-
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} 
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} 
 \ltjdefcharrange{3}{%
-  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF, "E000-"F8FF}
+  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
 \ltjdefcharrange{4}{%
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, 
   "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB50-"FE0F, 
-  "FE20-"FE2F, "FE70-"FEFF, "FB00-"FB4F, "10000-"1FFFF} % non-Japanese
+  "FE20-"FE2F, "FE70-"FEFF, "FB00-"FB4F, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF} 
 \ltjdefcharrange{6}{%
   "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,