X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-plain.sty;h=c512022628d94507c47620a4935577894cac17b4;hb=0526b27bf88ed7f2adedef267f4d9226f6f5a692;hp=d372c55281d2b986b0b3e72386747091013fedfd;hpb=ea31acc3623d62cdedbbddb1111c0f4a655de586;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index d372c55..c512022 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}[2013/06/12]
+  \ProvidesPackage{ltj-plain}[2014/09/19]
 \fi                             %</LaTeX>
 
 %%------------------
@@ -23,12 +23,12 @@
 %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
 % LuaTeX-ja macros against plain TeX
 
-\def\ltj@stdmcfont{psft:Ryumin-Right}
-\def\ltj@stdgtfont{psft:GothicBBB-Medium}
+\def\ltj@stdmcfont{IPAExMincho}
+\def\ltj@stdgtfont{IPAExGothic}
 \newread\ltj@@cfgread
 \openin\ltj@@cfgread{luatexja.cfg}%
 \ifeof\ltj@@cfgread
-  \message{Cannot find file `luatexja.cfg'.}%
+  \@PackageInfoNoLine{ltj-plain}{Cannot find file `luatexja.cfg'}%
 \else
   \closein\ltj@@cfgread
   \input luatexja.cfg
@@ -42,41 +42,59 @@
 \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
+\tfont\tentmin=\ltj@stdmcfont:jfm=ujisv at 9.62216pt
+\tfont\seventmin=\ltj@stdmcfont:jfm=ujisv at 6.73551pt
+\tfont\fivetmin=\ltj@stdmcfont:jfm=ujisv at 4.81108pt
+\tfont\tentgt=\ltj@stdgtfont:jfm=ujisv at 9.62216pt
+\tfont\seventgt=\ltj@stdgtfont:jfm=ujisv at 6.73551pt
+\tfont\fivetgt=\ltj@stdgtfont:jfm=ujisv at 4.81108pt
+
+\def\mc{\tenmin\tentmin}
+\def\gt{\tengt\tentgt}
+\mc\tentmin
 
 \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=0pt plus 0.4pt minus 0.4pt,
   xkanjiskip=.25\zw plus 1pt minus 1pt,
-  autospacing, autoxspacing, jacharrange={-1}, 
+  autospacing, autoxspacing, jacharrange={-1},
   yalbaselineshift=0pt, yjabaselineshift=0pt,
-  jcharwidowpenalty=500, differentjfm=paverage
+  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
 
-\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} 
-\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} 
+\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
+\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
 \ltjdefcharrange{3}{%
   "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, "FB00-"FE0F, 
+   "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
+  "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-"10FFFF} 
+\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}
+  "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,
+  "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF,"E0100-"E01EF}
 \ltjdefcharrange{7}{
-  "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F, 
+  "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F,
   "AC00-"D7FF}
 \ltjdefcharrange{8}{"B4, "A8, "B1, "D7, "F7, "B0, "A7, "B6}
 \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}
 
 %%------------------ all done
 \ltj@plain@AtEnd