X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-adjust.lua;h=0f6bff18d796baf9dfc0ef214590142c67263345;hb=0526b27bf88ed7f2adedef267f4d9226f6f5a692;hp=3882c5162ea1281fc52f9c9c0f2cf82ce3344d5d;hpb=c7107a5e1f0c97e8edfc5cb35fa695519eca4fb6;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua index 3882c51..0f6bff1 100644 --- a/src/ltj-adjust.lua +++ b/src/ltj-adjust.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.adjust', - date = '2014/05/08', + date = '2014/09/30', description = 'Advanced line adjustment for LuaTeX-ja', }) module('luatexja.adjust', package.seeall) @@ -46,7 +46,7 @@ local id_glue_spec = node.id('glue_spec') local id_whatsit = node.id('whatsit') local attr_icflag = luatexbase.attributes['ltj@icflag'] local attr_jchar_class = luatexbase.attributes['ltj@charclass'] -local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] +local lang_ja = token.create('ltj@@japanese')[2] local ltjf_font_metric_table = ltjf.font_metric_table local spec_zero_glue = ltjj.spec_zero_glue @@ -174,39 +174,40 @@ end -- step 1: 行末に kern を挿入(句読点,中点用) local ltjd_glyph_from_packed = ltjd.glyph_from_packed local function aw_step1(p, res, total) - local x = node_tail(getlist(p)); if not x then return false end + local head = getlist(p) + local x = node_tail(head); if not x then return false end -- x: \rightskip x = node_prev(x); if not x then return false end - if getid(x) == id_glue and getsubtype(x) == 15 then + local xi, xc = getid(x) + if xi == id_glue and getsubtype(x) == 15 then -- 段落最終行のときは,\penalty10000 \parfillskip が入るので, -- その前の node が本来の末尾文字となる - x = node_prev(node_prev(x)) + x = node_prev(node_prev(x)); xi = getid(x) end -- local xi = getid(x) -- while (get_attr_icflag(x) == PACKED) -- and ((xi == id_penalty) or (xi == id_kern) or (xi == id_kern)) do -- x = node_prev(x); xi = getid(x) -- end - local xi, xc = getid(x) - if xi == id_glyph and has_attr(x, attr_curjfnt) == getfont(x) then + if xi == id_glyph and getfield(x, 'lang')==lang_ja then -- 和文文字 xc = x elseif xi == id_hlist and get_attr_icflag(x) == PACKED then -- packed JAchar xc = ltjd_glyph_from_packed(x) - while getid(xc) == id_whatsit do xc = node_next(xc) end + while getid(xc) == id_whatsit do xc = node_next(xc) end -- これはなんのために? else return false-- それ以外は対象外. end local xk = ltjf_font_metric_table[getfont(xc)] - .char_type[has_attr(xc, attr_jchar_class) or 0]['end_' .. res.name] or 0 + .char_type[has_attr(xc, attr_jchar_class) or 0]['end_' .. res.name] or 0 if xk>0 and total>=xk then total = total - xk local kn = node_new(id_kern) setfield(kn, 'kern', (res.name=='shrink' and -1 or 1) * xk) set_attr(kn, attr_icflag, FROM_JFM) - insert_after(p, x, kn) + insert_after(head, x, kn) return true else return false end