diff options
author | Karl Berry <karl@freefriends.org> | 2014-10-13 22:10:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-10-13 22:10:02 +0000 |
commit | 44cb8e3fdd11a1ec6f1dd29e110ba10309bc6cd1 (patch) | |
tree | 666a3352effc147618e30969bb89d02e77a3028d /Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua | |
parent | a81c9d1ef0b46432af068c7bb16347426eb1f7ce (diff) |
luatexja (13oct14)
git-svn-id: svn://tug.org/texlive/trunk@35368 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua index 14cec985159..5cdb1404ffd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua @@ -42,6 +42,7 @@ local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct local ltjf_replace_altfont = ltjf.replace_altfont local attr_orig_char = luatexbase.attributes['ltj@origchar'] local STCK = luatexja.userid_table.STCK +local lang_ja = token.create('ltj@japanese')[2] ------------------------------------------------------------------------ -- MAIN PROCESS STEP 1: replace fonts @@ -56,7 +57,8 @@ do local pc = getchar(p) local pf = ltjf_replace_altfont(has_attr(p, attr_curjfnt) or getfont(p), pc) setfield(p, 'font', pf); set_attr(p, attr_curjfnt, pf) - setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2) + setfield(p, 'lang', lang_ja) + -- setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2) set_attr(p, attr_orig_char, pc) end return p @@ -74,8 +76,7 @@ do wt, head = {}, p while p do local pfunc = suppress_hyphenate_ja_aux[getid(p)] - if pfunc then p = pfunc(p) end - p = node_next(p) + p = node_next(pfunc and pfunc(p) or p) end head = to_node(head) lang.hyphenate(head) |