diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-21 20:58:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-21 20:58:48 +0000 |
commit | debcb6d2bcbf0ad5742a37d1cdbd7f802346dcb5 (patch) | |
tree | f19b75104294d0fbee431b80acee40862dfc2ed3 /Master/texmf-dist/tex/luatex/luatexja/addons | |
parent | fa7cc6d43746db5802a4d63d29cff6ee619656be (diff) |
luatexja (21apr16)
git-svn-id: svn://tug.org/texlive/trunk@40661 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty index 1ba9cda333f..0e10c457799 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty @@ -64,7 +64,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-adjust}[2014/05/13] + \ProvidesPackage{luatexja-adjust}[2016/04/03] \fi %</LaTeX> % Load core module if not yet. @@ -84,7 +84,11 @@ %%------------------ %! Main part of luatexja-adjust -\RequireLuaTeXjaSubmodule{adjust} +\ifnum\luatexversion>90 + \RequireLuaTeXjaSubmodule{adjust} +\else + \RequireLuaTeXjaSubmodule{adjust_85} +\fi % enable/disable ``advanced'' line adjustment \protected\def\ltjdisableadjust{\directlua{luatexja.adjust.disable_cb()}} diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty index 6b5075f7ba6..2da6d5974dc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty @@ -23,7 +23,7 @@ \ltj@@set@stack@real{RIPOST}{0}{0x7FFFFFFF}#1 } \def\ltj@@set@stack@real#1#2#3{% \directlua{luatexja.stack.set_stack_perchar(luatexja.stack_table_index.#1, - #2, #3, luatexja.token.scan_word)}} + #2, #3, token.scan_word)}} % ルビ用のキー設定 \def\ltj@@rkeydef#1{ |