X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fluatexja.lua;h=83bfed33b5659cb34eda1b022da6d51bfe6772a7;hb=80b06f08f50cca186e53effcbecc20cbbf9afbe5;hp=1aa5c89c80643c5705cbf494d4c6e3649db612ca;hpb=05154b0c3459e40ef5d7aef48eb16337c2a020ed;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja.lua b/src/luatexja.lua index 1aa5c89..83bfed3 100644 --- a/src/luatexja.lua +++ b/src/luatexja.lua @@ -19,7 +19,7 @@ function luatexja.load_module(name) luatexja.error("File `" .. fn .. "' not found", {'This file ' .. fn .. ' is required for LuaTeX-ja.', 'Please check your installation.'}) else - texio.write('(' .. found .. ')\n') + texio.write_nl('(' .. found .. ')') dofile(found) end end @@ -29,11 +29,49 @@ function luatexja.load_lua(fn) if not found then error("File `" .. fn .. "' not found") else - texio.write('(' .. found .. ')\n') + texio.write_nl('(' .. found .. ')') dofile(found) end end +--- 以下は全ファイルで共有される定数 +local icflag_table = {} +luatexja.icflag_table = icflag_table +icflag_table.ITALIC = 1 +icflag_table.PACKED = 2 +icflag_table.KINSOKU = 3 +icflag_table.FROM_JFM = 6 +-- FROM_JFM: 4, 5, 6, 7, 8 →優先度高 +-- 6 が標準 +icflag_table.KANJI_SKIP = 9 +icflag_table.XKANJI_SKIP = 10 +icflag_table.PROCESSED = 11 +icflag_table.IC_PROCESSED = 12 +icflag_table.BOXBDD = 15 +icflag_table.PROCESSED_BEGIN_FLAG = 32 + +local stack_table_index = {} +luatexja.stack_table_index = stack_table_index +stack_table_index.PRE = 0x200000 -- characterごと +stack_table_index.POST = 0x400000 -- characterごと +stack_table_index.KCAT = 0x600000 -- characterごと +stack_table_index.XSP = 0x800000 -- characterごと +stack_table_index.JWP = 0 -- 0のみ +stack_table_index.MJT = 0x100 -- 0--255 +stack_table_index.MJS = 0x200 -- 0--255 +stack_table_index.MJSS = 0x300 -- 0--255 +stack_table_index.KSJ = 0x400 -- 0--9 + +local userid_table = {} +luatexja.userid_table = userid_table +userid_table.IHB = 30111 -- \inhibitglue +userid_table.STCK = 30112 -- スタック管理 +userid_table.OTF = 30113 -- luatexja-otf +userid_table.BPAR = 30114 -- 「段落始め」 + + +--- 定義終わり + local load_module = luatexja.load_module load_module('base'); local ltjb = luatexja.base load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st @@ -76,19 +114,6 @@ local attr_icflag = luatexbase.attributes['ltj@icflag'] local attr_uniqid = luatexbase.attributes['ltj@uniqid'] local cat_lp = luatexbase.catcodetables['latex-package'] -local ITALIC = 1 -local PACKED = 2 -local KINSOKU = 3 -local FROM_JFM = 4 -local LINE_END = 5 -local KANJI_SKIP = 6 -local XKANJI_SKIP = 7 -local PROCESSED = 8 -local IC_PROCESSED = 9 -local BOXBDD = 15 -local PROCESSED_BEGIN_FLAG = 16 - - -- Three aux. functions, bollowed from tex.web local unity=65536 local function print_scaled(s) @@ -141,16 +166,17 @@ end -- EXT: print parameters that don't need arguments function luatexja.ext_get_parameter_unary(k) + local t = tex.getcount('ltj@@stack') if k == 'yalbaselineshift' then tex.write(print_scaled(tex.getattribute('ltj@yablshift'))..'pt') elseif k == 'yjabaselineshift' then tex.write(print_scaled(tex.getattribute('ltj@ykblshift'))..'pt') elseif k == 'kanjiskip' then - tex.write(print_spec(ltjs.get_skip_table('kanjiskip', tex.getcount('ltj@@stack')))) + tex.write(print_spec(ltjs.get_skip_table('kanjiskip', t))) elseif k == 'xkanjiskip' then - tex.write(print_spec(ltjs.get_skip_table('xkanjiskip', tex.getcount('ltj@@stack')))) + tex.write(print_spec(ltjs.get_skip_table('xkanjiskip', t))) elseif k == 'jcharwidowpenalty' then - tex.write(ltjs.get_penalty_table('jwp', 0, 0, tex.getcount('ltj@@stack'))) + tex.write(ltjs.get_penalty_table(stack_table_index.JWP, 0, t)) elseif k == 'autospacing' then tex.write(tex.getattribute('ltj@autospc')) elseif k == 'autoxspacing' then @@ -162,6 +188,12 @@ function luatexja.ext_get_parameter_unary(k) tex.write('small') elseif luatexja.jfmglue.diffmet_rule == math.two_average then tex.write('average') + elseif luatexja.jfmglue.diffmet_rule == math.two_paverage then + tex.write('paverage') + elseif luatexja.jfmglue.diffmet_rule == math.two_pleft then + tex.write('pleft') + elseif luatexja.jfmglue.diffmet_rule == math.two_pright then + tex.write('pright') elseif luatexja.jfmglue.diffmet_rule == math.two_add then tex.write('both') else -- This can't happen. @@ -173,6 +205,7 @@ end -- EXT: print parameters that need arguments function luatexja.ext_get_parameter_binary(k,c) + local t = tex.getcount('ltj@@stack') if type(c)~='number' then ltjb.package_error('luatexja', 'invalid the second argument (' .. tostring(c) .. ')', @@ -180,10 +213,11 @@ function luatexja.ext_get_parameter_binary(k,c) c=0 end if k == 'jacharrange' then - if c>216 then + if c>=7*ltjc.ATTR_RANGE then ltjb.package_error('luatexja', 'invalid character range number (' .. c .. ')', - 'A character range number should be in the range 0..216,\n'.. + 'A character range number should be in the range 0..' + .. 7+ATTR_RANGE-1 .. ",\n".. 'So I changed this one to zero.') c=0 end @@ -199,15 +233,15 @@ function luatexja.ext_get_parameter_binary(k,c) c=0 end if k == 'prebreakpenalty' then - tex.write(ltjs.get_penalty_table('pre', c, 0, tex.getcount('ltj@@stack'))) + tex.write(ltjs.get_penalty_table(stack_table_index.PRE + c, 0, t)) elseif k == 'postbreakpenalty' then - tex.write(ltjs.get_penalty_table('post', c, 0, tex.getcount('ltj@@stack'))) + tex.write(ltjs.get_penalty_table(stack_table_index.POST+ c, 0, t)) elseif k == 'kcatcode' then - tex.write(ltjs.get_penalty_table('kcat', c, 0, tex.getcount('ltj@@stack'))) + tex.write(ltjs.get_penalty_table(stack_table_index.KCAT+ c, 0, t)) elseif k == 'chartorange' then tex.write(ltjc.char_to_range(c)) elseif k == 'jaxspmode' or k == 'alxspmode' then - tex.write(ltjs.get_penalty_table('xsp', c, 3, tex.getcount('ltj@@stack'))) + tex.write(ltjs.get_penalty_table(stack_table_index.XSP + c, 3, t)) end end end @@ -243,7 +277,7 @@ luatexbase.add_to_callback('hpack_filter', -- debug local function get_attr_icflag(p) - return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG + return (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG end local debug_depth @@ -276,7 +310,7 @@ local function debug_show_node_X(p,print_fn) for i = 2, p.glue_order do s = s .. 'l' end end end - if get_attr_icflag(p) == PACKED then + if get_attr_icflag(p) == icflag_table.PACKED then s = s .. ' (packed)' end print_fn(s) @@ -288,11 +322,12 @@ local function debug_show_node_X(p,print_fn) debug_depth=k elseif pt == 'glue' then s = base .. ' ' .. print_spec(p.spec) - if get_attr_icflag(p)==FROM_JFM then - s = s .. ' (from JFM)' - elseif get_attr_icflag(p)==KANJI_SKIP then + if get_attr_icflag(p)>icflag_table.KINSOKU + and get_attr_icflag(p)icflag_table.KINSOKU + and get_attr_icflag(p)