diff options
author | Karl Berry <karl@freefriends.org> | 2015-04-21 23:46:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-04-21 23:46:31 +0000 |
commit | dbf06c3ecc6528bd2410630d2a251940ec0c9b23 (patch) | |
tree | c875bdd9f4e6a021f50e1e36e2779c07b828347c /Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty | |
parent | 142d903dcd96ad083d58f5518aa138a676eb68c0 (diff) |
luatexja (21apr15)
git-svn-id: svn://tug.org/texlive/trunk@36992 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty index 933d056bb59..3d2095cc21d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/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> %%------------------ @@ -28,12 +28,12 @@ \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 \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 @@ -42,41 +42,56 @@ \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=\z@ plus .4pt minus .4pt, xkanjiskip=.25\zw plus 1pt minus 1pt, - autospacing, autoxspacing, jacharrange={-1}, - yalbaselineshift=0pt, yjabaselineshift=0pt, - jcharwidowpenalty=500, differentjfm=paverage + autospacing, autoxspacing, jacharrange={-1}, + yalbaselineshift=\z@, yjabaselineshift=\z@, + jcharwidowpenalty=500, differentjfm=paverage, + jatextfont={0, \tenmin}, jascriptfont={0, \sevenmin}, + jascriptscriptfont={0, \fivemin}, } +\setbox\z@=\hbox{M} +\jfam\z@ +\ltjsetparameter{talbaselineshift=.5\ht0, tjabaselineshift=\z@} -\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-"E00FF, "E01F0-"10FFFF} +\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF} \ltjdefcharrange{6}{% - "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, + "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 +\protected\def\@@end{% + \directlua{luatexja.ext_cleanup()}\ltj@@orig@end} %%------------------ all done \ltj@plain@AtEnd |