X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-plain.sty;h=c958ddd0b47dceeb2fc1b42b5edd7d66f2f996e3;hb=21a99e7265f96d2f77c8c5b6450dd24d91237707;hp=d09d05be2bd70603d13503d8c495a08d5e122f0f;hpb=880636d81e9819b31dec8a5f897bbfaf1732d18b;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index d09d05b..c958ddd 100644
--- a/src/ltj-plain.sty
+++ b/src/ltj-plain.sty
@@ -13,7 +13,8 @@
 
 \ifltj@in@latex                 %<*LaTeX>
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{ltj-plain}[2012/04/21 v0.2]
+  \PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.}
+  \ProvidesPackage{ltj-plain}[2013/06/12]
 \fi                             %</LaTeX>
 
 %%------------------
@@ -22,38 +23,53 @@
 %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
 % LuaTeX-ja macros against plain TeX
 
-\jfont\tenmin=psft:Ryumin-Light:jfm=ujis at 9.62216pt
-\jfont\sevenmin=psft:Ryumin-Light:jfm=ujis at 6.73551pt
-\jfont\fivemin=psft:Ryumin-Light:jfm=ujis at 4.81108pt
-\jfont\tengt=psft:GothicBBB-Medium:jfm=ujis at 9.62216pt
-\jfont\sevengt=psft:GothicBBB-Medium:jfm=ujis at 6.73551pt
-\jfont\fivegt=psft:GothicBBB-Medium:jfm=ujis at 4.81108pt
+\def\ltj@stdmcfont{psft:Ryumin-Light}
+\def\ltj@stdgtfont{psft:GothicBBB-Medium}
+\newread\ltj@@cfgread
+\openin\ltj@@cfgread{luatexja.cfg}%
+\ifeof\ltj@@cfgread
+  \message{Cannot find file `luatexja.cfg'.}%
+\else
+  \closein\ltj@@cfgread
+  \input luatexja.cfg
+\fi
+\let\ltj@@cfgread\relax\advance\count16by-1\relax
+
+\jfont\tenmin=\ltj@stdmcfont:jfm=ujis at 9.62216pt
+\jfont\sevenmin=\ltj@stdmcfont:jfm=ujis at 6.73551pt
+\jfont\fivemin=\ltj@stdmcfont:jfm=ujis at 4.81108pt
+\jfont\tengt=\ltj@stdgtfont:jfm=ujis at 9.62216pt
+\jfont\sevengt=\ltj@stdgtfont:jfm=ujis at 6.73551pt
+\jfont\fivegt=\ltj@stdgtfont:jfm=ujis at 4.81108pt
 
 \let\mc=\tenmin
 \let\gt=\tengt
 \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, 
   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
-\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF} 
+  "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB00-"FE0F, 
+  "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
+\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF} 
 \ltjdefcharrange{6}{%
   "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, 
-  "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF}
+  "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF,"E0100-"E01EF}
 \ltjdefcharrange{7}{
   "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F, 
   "AC00-"D7FF}