X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fluatexja.lua;h=422035edccee2737d94abcfabe7b917e75601e35;hb=701f26e908cc8b76e8d3a1354460b3128191f398;hp=075b3f1482387d446838302610a1755ada855794;hpb=6d3b123b361683172e8d236fc8eb7cdb8b4117d8;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja.lua b/src/luatexja.lua index 075b3f1..422035e 100644 --- a/src/luatexja.lua +++ b/src/luatexja.lua @@ -1,5 +1,6 @@ require('lualibs') +tableunpack = table.unpack ------------------------------------------------------------------------ -- naming: @@ -13,29 +14,51 @@ function luatexja.load_lua(fn) local found = kpse.find_file(fn, 'tex') if not found then tex.error("LuaTeX-ja error: File `" .. fn .. "' not found") - else + else texio.write_nl('(' .. found .. ')') dofile(found) end end +do + local setfield = node.direct.setfield + luatexja.setglue = node.direct.setglue or + function(g,w,st,sh,sto,sho) + setfield(g,'width', w or 0) + setfield(g,'stretch',st or 0) + setfield(g,'shrink', sh or 0) + setfield(g,'stretch_order',sto or 0) + setfield(g,'shrink_order', sho or 0) + end + local getfield = node.direct.getfield + luatexja.getglue = node.direct.getglue or + function(g) + return getfield(g,'width'), + getfield(g,'stretch'), + getfield(g,'shrink'), + getfield(g,'stretch_order'), + getfield(g,'shrink_order') + 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 +icflag_table.FROM_JFM = 4 -- FROM_JFM: 4, 5, 6, 7, 8 →優先度高（伸びやすく，縮みやすい） -- 6 が標準 -icflag_table.KANJI_SKIP = 9 -icflag_table.KANJI_SKIP_JFM = 10 -icflag_table.XKANJI_SKIP = 11 -icflag_table.XKANJI_SKIP_JFM = 12 -icflag_table.PROCESSED = 13 -icflag_table.IC_PROCESSED = 14 -icflag_table.BOXBDD = 15 -icflag_table.PROCESSED_BEGIN_FLAG = 128 +icflag_table.KANJI_SKIP = 68 -- = 4+64 +icflag_table.KANJI_SKIP_JFM = 69 +icflag_table.XKANJI_SKIP = 70 +icflag_table.XKANJI_SKIP_JFM = 71 +icflag_table.LINEEND = 72 +icflag_table.PROCESSED = 73 +icflag_table.IC_PROCESSED = 74 +icflag_table.BOXBDD = 75 +icflag_table.PROCESSED_BEGIN_FLAG = 4096 -- sufficiently large power of 2 local stack_table_index = {} luatexja.stack_table_index = stack_table_index @@ -43,6 +66,8 @@ 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.RIPRE = 0xA00000 -- characterごと，ruby pre +stack_table_index.RIPOST = 0xC00000 -- characterごと，ruby post stack_table_index.JWP = 0 -- これだけ stack_table_index.KSK = 1 -- これだけ stack_table_index.XSK = 2 -- これだけ @@ -56,69 +81,48 @@ luatexja.userid_table = userid_table userid_table.IHB = luatexbase.newuserwhatsitid('inhibitglue', 'luatexja') -- \inhibitglue userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- スタック管理 userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」 - -do - local node_remove, node_next, node_prev = node.remove, node.next, node.prev - function luatexja.node_remove (head, current) - if head==current then - local q, r = node_next(current), node_prev(current) - current.next = nil - if q then q.prev = r end - if r and node_next(r)==current then -- r is "real prev" - r.next = q - end - return q, q - else - return node_remove(head, current) - end - end - - local Dnode = node.direct or node - local Dnode_remove, Dnode_next, Dnode_prev = Dnode.remove, Dnode.getnext, Dnode.getprev - local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end - local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end - function luatexja.Dnode_remove (head, current) - if head==current then - local q, r = Dnode_next(current), Dnode_prev(current) - setfield(current, 'next', nil) - if q then setfield(q, 'prev', r) end - if r and Dnode_next(r) == current then -- r is "real prev" - setfield(r, 'next', q) - end - return q, q - else - return Dnode_remove(head, current) - end - end - -end - +userid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向 +userid_table.BOXB = luatexbase.newuserwhatsitid('box_boundary', 'luatexja') -- 「ボックス始め・終わり」 + +local dir_table = {} +luatexja.dir_table = dir_table +dir_table.dir_dtou = 1 +dir_table.dir_tate = 3 +dir_table.dir_yoko = 4 +dir_table.dir_math_mod = 8 +dir_table.dir_node_auto = 128 -- 組方向を合わせるために自動で作られたもの +dir_table.dir_node_manual = 256 -- 寸法代入によって作られたもの +dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod + -- 「縦数式ディレクション」 in pTeX --- 定義終わり local load_module = luatexja.load_module load_module('base'); local ltjb = luatexja.base load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st + +if luatexja_debug then load_module('debug') end + load_module('charrange'); local ltjc = luatexja.charrange +load_module('stack'); local ltjs = luatexja.stack +load_module('direction'); local ltjd = luatexja.direction -- +1 hlist +1 attr_list load_module('jfont'); local ltjf = luatexja.jfont load_module('inputbuf'); local ltji = luatexja.inputbuf -load_module('stack'); local ltjs = luatexja.stack load_module('pretreat'); local ltjp = luatexja.pretreat -load_module('jfmglue'); local ltjj = luatexja.jfmglue load_module('setwidth'); local ltjw = luatexja.setwidth +load_module('jfmglue'); local ltjj = luatexja.jfmglue -- +1 glue +1 gs +1 attr_list load_module('math'); local ltjm = luatexja.math load_module('tangle'); local ltjb = luatexja.base + local attr_jchar_class = luatexbase.attributes['ltj@charclass'] +local attr_jchar_code = luatexbase.attributes['ltj@charcode'] local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] local attr_yablshift = luatexbase.attributes['ltj@yablshift'] local attr_icflag = luatexbase.attributes['ltj@icflag'] local attr_uniqid = luatexbase.attributes['ltj@uniqid'] +local attr_dir = luatexbase.attributes['ltj@dir'] local cat_lp = luatexbase.catcodetables['latex-package'] - ----- table: charprop_stack_table [stack_level].{pre|post|xsp}[chr_code] - - -- Three aux. functions, bollowed from tex.web local unity=65536 @@ -127,19 +131,20 @@ local floor = math.floor local function print_scaled(s) local out='' local delta=10 - if s<0 then + if s<0 then out=out..'-'; s=-s end out=out..tostring(floor(s/unity)) .. '.' s=10*(s%unity)+5 repeat if delta>unity then s=s+32768-50000 end - out=out .. tostring(floor(s/unity)) + out=out .. tostring(floor(s/unity)) s=10*(s%unity) delta=delta*10 until s<=delta return out end +luatexja.print_scaled = print_scaled local function print_glue(d,order) local out=print_scaled(d) @@ -148,7 +153,7 @@ local function print_glue(d,order) while order>1 do out=out..'l'; order=order-1 end - else + else out=out..'pt' end return out @@ -167,32 +172,43 @@ end ------------------------------------------------------------------------ --- CODE FOR GETTING/SETTING PARAMETERS +-- CODE FOR GETTING/SETTING PARAMETERS ------------------------------------------------------------------------ -- EXT: print parameters that don't need arguments do + local tex_getattr = tex.getattribute + local function getattr(a) + local r = tex.getattribute(a) + return (r==-0x7FFFFFFF) and 0 or r + end luatexja.unary_pars = { - yalbaselineshift = function(t) - return print_scaled(tex.getattribute('ltj@yablshift'))..'pt' + yalbaselineshift = function(t) + return print_scaled(getattr('ltj@yablshift'))..'pt' + end, + yjabaselineshift = function(t) + return print_scaled(getattr('ltj@ykblshift'))..'pt' end, - yjabaselineshift = function(t) - return print_scaled(tex.getattribute('ltj@ykblshift'))..'pt' + talbaselineshift = function(t) + return print_scaled(getattr('ltj@tablshift'))..'pt' end, - kanjiskip = function(t) + tjabaselineshift = function(t) + return print_scaled(getattr('ltj@tkblshift'))..'pt' + end, + kanjiskip = function(t) return print_spec(ltjs.get_stack_skip(stack_table_index.KSK, t)) end, - xkanjiskip = function(t) + xkanjiskip = function(t) return print_spec(ltjs.get_stack_skip(stack_table_index.XSK, t)) end, jcharwidowpenalty = function(t) return ltjs.get_stack_table(stack_table_index.JWP, 0, t) end, autospacing = function(t) - return tex.getattribute('ltj@autospc') + return getattr('ltj@autospc') end, autoxspacing = function(t) - return tex.getattribute('ltj@autoxspc') + return getattr('ltj@autoxspc') end, differentjfm = function(t) local f, r = luatexja.jfmglue.diffmet_rule, '???' @@ -205,7 +221,15 @@ do elseif f == math.two_add then r = 'both' end return r - end + end, + direction = function() + local v = ltjd.get_dir_count() + if math.abs(tex.nest[tex.nest.ptr].mode) == ltjs.mmode and v == dir_table.dir_tate then + v = dir_table.dir_utod + end + return v + end, + adjustdir = ltjd.get_adjust_dir_count, } local unary_pars = luatexja.unary_pars @@ -213,6 +237,7 @@ do if unary_pars[k] then tex.write(tostring(unary_pars[k](tex.getcount('ltj@@stack')))) end + ltjb.stop_time_measure('get_par') end end @@ -221,8 +246,8 @@ end do luatexja.binary_pars = { jacharrange = function(c, t) - if type(c)~='number' or c<0 or c>31*ltjc.ATTR_RANGE then - -- 0 はエラーにしない（隠し） + if type(c)~='number' or c<-1 or c>31*ltjc.ATTR_RANGE then + -- 0, -1 はエラーにしない（隠し） ltjb.package_error('luatexja', 'invalid character range number (' .. tostring(c) .. ')', 'A character range number should be in the range 1..' @@ -235,15 +260,15 @@ do return (c<0) and 1 or ltjc.get_range_setting(c) end, prebreakpenalty = function(c, t) - return ltjs.get_stack_table(stack_table_index.PRE + return ltjs.get_stack_table(stack_table_index.PRE + ltjb.in_unicode(c, true), 0, t) end, postbreakpenalty = function(c, t) - return ltjs.get_stack_table(stack_table_index.POST + return ltjs.get_stack_table(stack_table_index.POST + ltjb.in_unicode(c, true), 0, t) end, kcatcode = function(c, t) - return ltjs.get_stack_table(stack_table_index.KCAT + return ltjs.get_stack_table(stack_table_index.KCAT + ltjb.in_unicode(c, false), 0, t) end, chartorange = function(c, t) @@ -253,14 +278,25 @@ do return ltjs.get_stack_table(stack_table_index.XSP + ltjb.in_unicode(c, true), 3, t) end, + boxdir = function(c, t) + if type(c)~='number' or c<0 or c>65535 then + ltjb.package_error('luatexja', + 'Bad register code (' .. tostring(c) .. ')', + 'A register must be between 0 and 65535.\n'.. + 'I changed this one to zero.') + c=0 + end + return ltjd.get_register_dir(c) + end, } - local binary_pars = luatexja.binary_pars + local binary_pars = luatexja.binary_pars binary_pars.alxspmode = binary_pars.jaxspmode function luatexja.ext_get_parameter_binary(k,c) if binary_pars[k] then tex.write(tostring(binary_pars[k](c,tex.getcount('ltj@@stack')))) end + ltjb.stop_time_measure('get_par') end end @@ -269,53 +305,78 @@ function luatexja.ext_print_global() if luatexja.isglobal=='global' then tex.sprint(cat_lp, '\\global') end end + -- main process do - local Dnode = node.direct or node + local start_time_measure, stop_time_measure + = ltjb.start_time_measure, ltjb.stop_time_measure local nullfunc = function (n) return n end - local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc - local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc + local to_node = node.direct.tonode + local to_direct = node.direct.todirect + local ensure_tex_attr = ltjb.ensure_tex_attr + -- mode = true iff main_process is called from pre_linebreak_filter - local function main_process(head, mode, dir) - local p = to_direct(head) - p = ltjj.main(p,mode) - if p then p = ltjw.set_ja_width(p, dir) end - return to_node(p) + local function main_process(head, mode, dir, gc) + ensure_tex_attr(attr_icflag, 0) + if gc == 'fin_row' then return head + else + --luatexja.ext_show_node_list(head, 'T> ', print) + start_time_measure('jfmglue') + local p = ltjj.main(to_direct(head),mode, dir) + stop_time_measure('jfmglue') + return to_node(p) + end end - + + local function adjust_icflag(h) + -- kern from luaotfload will have icflag = 1 + -- (same as italic correction) + ensure_tex_attr(attr_icflag, 1) + return h + end + -- callbacks - - luatexbase.add_to_callback( - 'pre_linebreak_filter', + ltjb.add_to_callback( + 'pre_linebreak_filter', function (head,groupcode) - return main_process(head, true, tex.textdir) - end,'ltj.pre_linebreak_filter', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'luaotfload.node_processor') + 1) - luatexbase.add_to_callback( - 'hpack_filter', + return main_process(head, true, tex.textdir, groupcode) + end,'ltj.main', + luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor')+1) + ltjb.add_to_callback( + 'hpack_filter', function (head,groupcode,size,packtype, dir) - return main_process(head, false, dir) - end,'ltj.hpack_filter', - luatexbase.priority_in_callback('hpack_filter', - 'luaotfload.node_processor') + 1) -end + return main_process(head, false, dir, groupcode) + end,'ltj.main', + luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor')+1) + ltjb.add_to_callback('pre_linebreak_filter', adjust_icflag, 'ltj.adjust_icflag', 1) + ltjb.add_to_callback('hpack_filter', adjust_icflag, 'ltj.adjust_icflag', 1) --- define_font -do - local otfl_fdr = fonts.definers.read - local ltjr_font_callback = ltjr.font_callback - function luatexja.font_callback(name, size, id) - return ltjf.font_callback( - name, size, id, - function (name, size, id) return ltjr_font_callback(name, size, id, otfl_fdr) end - ) - end - luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1) end +-- cleanup process +function luatexja.ext_cleanup() + ltjf.cleanup_size_cache() + ltjd.remove_end_whatsit() +end +-- lastnodechar +do + local id_glyph = node.id('glyph') + function luatexja.pltx_composite_last_node_char() + local n = tex.nest[tex.nest.ptr].tail + local r = '-1' + if n then + if n.id==id_glyph then + while n.componetns and n.subtype and n.subtype%4 >= 2 do + n = node.tail(n) + end + r = tostring(n.char) + end + end + tex.sprint(r) + end +end -- debug @@ -327,7 +388,6 @@ local has_attr = node.has_attribute local id_penalty = node.id('penalty') local id_glyph = node.id('glyph') -local id_glue_spec = node.id('glue_spec') local id_glue = node.id('glue') local id_kern = node.id('kern') local id_hlist = node.id('hlist') @@ -341,32 +401,44 @@ local function get_attr_icflag(p) return (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG end -local debug_depth +local prefix, inner_depth -local function debug_show_node_X(p,print_fn) - local k = debug_depth +local function debug_show_node_X(p,print_fn, limit) + local k = prefix local s local pt=node_type(p.id) - local base = debug_depth .. string.format('%X', get_attr_icflag(p)) + local base = prefix .. string.format('%X', get_attr_icflag(p)) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' if pt == 'glyph' then - s = base .. ' ' .. utf.char(p.char) .. ' ' .. tostring(p.font) - .. ' (' .. print_scaled(p.height) .. '+' + s = base .. ' ' .. + (p.char>=0xF0000 and string.format('(U+%X)', p.char) or utf.char(p.char)) .. ' ' + .. tostring(p.font) .. ' (' .. print_scaled(p.height) .. '+' .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + if p.xoffset~=0 or p.yoffset~=0 then + s = s .. ' off: (' .. print_scaled(p.xoffset) + .. ',' .. print_scaled(p.yoffset) .. ')' + end print_fn(s) - elseif pt=='hlist' or pt=='vlist' then - s = base .. '(' .. print_scaled(p.height) .. '+' - .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) .. p.dir - if p.shift~=0 then + elseif pt=='hlist' or pt=='vlist' or pt=='unset'or pt=='ins' then + if pt=='ins' then + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')' + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + else + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + end + if (p.shift or 0)~=0 then s = s .. ', shifted ' .. print_scaled(p.shift) end - if p.glue_sign >= 1 then + if p.glue_set and p.glue_sign ==2 or ( p.glue_sign==1 and p.glue_set>0) then s = s .. ' glue set ' if p.glue_sign == 2 then s = s .. '-' end s = s .. tostring(floor(p.glue_set*10000)/10000) - if p.glue_order == 0 then - s = s .. 'pt' - else + if p.glue_order == 0 then + s = s .. 'pt' + else s = s .. 'fi' for i = 2, p.glue_order do s = s .. 'l' end end @@ -374,16 +446,23 @@ local function debug_show_node_X(p,print_fn) if get_attr_icflag(p) == icflag_table.PACKED then s = s .. ' (packed)' end - print_fn(s) - local q = p.head - debug_depth=debug_depth.. '.' - while q do - debug_show_node_X(q, print_fn); q = node_next(q) + print_fn(s); + local bid = inner_depth + prefix, inner_depth = prefix.. '.', inner_depth + 1 + if inner_depth < limit then + for q in node.traverse(p.head) do + debug_show_node_X(q, print_fn, limit) + end end - debug_depth=k + prefix=k + elseif pt=='rule' then + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + print_fn(s) elseif pt == 'glue' then - s = base .. ' ' .. print_spec(p.spec) - if get_attr_icflag(p)>icflag_table.KINSOKU + s = base .. ' ' .. print_spec(p) + if get_attr_icflag(p)>icflag_table.KINSOKU and get_attr_icflag(p)icflag_table.KINSOKU + elseif get_attr_icflag(p)>icflag_table.KINSOKU and get_attr_icflag(p)