X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.lua;h=6ca1b67836b56f8d489c249581331fe1d49c6a44;hb=1379fbf6aae445cdce3906e7b83cc1c8550e78d5;hp=0a6cdad56ff2943cab31076afaa9f18d160832b1;hpb=eafbc3f8730866394e8d20bcf6766f211cafa231;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja.lua b/src/luatexja.lua index 0a6cdad..6ca1b67 100644 --- a/src/luatexja.lua +++ b/src/luatexja.lua @@ -13,7 +13,7 @@ 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 @@ -48,7 +48,6 @@ stack_table_index.RIPOST = 0xC00000 -- characterごと，ruby post stack_table_index.JWP = 0 -- これだけ stack_table_index.KSK = 1 -- これだけ stack_table_index.XSK = 2 -- これだけ -stack_table_index.DIR = 3 -- これだけ stack_table_index.MJT = 0x100 -- 0--255 stack_table_index.MJS = 0x200 -- 0--255 stack_table_index.MJSS = 0x300 -- 0--255 @@ -61,6 +60,15 @@ userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」 userid_table.DIR = luatexbase.newuserwhatsitid('direction', '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_node_auto = 16 -- 組方向を合わせるために自動で作られたもの +dir_table.dir_node_manual = 32 -- 寸法代入によって作られたもの + + ------------------------------------------------------------------------ -- FIX node.remove ------------------------------------------------------------------------ @@ -70,7 +78,7 @@ do if head==current then local q, r = node_next(current), node_prev(current) if q then q.prev = r end - if r and node_next(r)==current then + if r and node_next(r)==current then r.next = q end return q, q @@ -95,7 +103,7 @@ do end end else - luatexja.Dnode_remove = luatexja.node_remove + luatexja.Dnode_remove = luatexja.node_remove end end @@ -104,6 +112,21 @@ end local load_module = luatexja.load_module load_module('base'); local ltjb = luatexja.base load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st + +-- define_font +do + local otfl_fdr = fonts.definers.read + local ltjr_font_callback = ltjr.font_callback + function luatexja.font_callback(name, size, id) + local res = ltjr_font_callback(name, size, id, otfl_fdr) + luatexbase.call_callback('luatexja.define_font', res, name, size, id) + return res + end + luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end) + luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1) +end + +if luatexja_debug then load_module('debug') end load_module('charrange'); local ltjc = luatexja.charrange load_module('jfont'); local ltjf = luatexja.jfont load_module('inputbuf'); local ltji = luatexja.inputbuf @@ -131,14 +154,14 @@ 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 @@ -152,7 +175,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 @@ -171,22 +194,28 @@ end ------------------------------------------------------------------------ --- CODE FOR GETTING/SETTING PARAMETERS +-- CODE FOR GETTING/SETTING PARAMETERS ------------------------------------------------------------------------ -- EXT: print parameters that don't need arguments do luatexja.unary_pars = { - yalbaselineshift = function(t) + yalbaselineshift = function(t) return print_scaled(tex.getattribute('ltj@yablshift'))..'pt' end, - yjabaselineshift = function(t) + yjabaselineshift = function(t) return print_scaled(tex.getattribute('ltj@ykblshift'))..'pt' end, - kanjiskip = function(t) + talbaselineshift = function(t) + return print_scaled(tex.getattribute('ltj@tablshift'))..'pt' + end, + tjabaselineshift = function(t) + return print_scaled(tex.getattribute('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) @@ -239,15 +268,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) @@ -258,7 +287,7 @@ do + ltjb.in_unicode(c, true), 3, t) 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) @@ -275,17 +304,26 @@ end -- main process do + local start_time_measure, stop_time_measure + = ltjb.start_time_measure, ltjb.stop_time_measure local Dnode = node.direct or node 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 time_jfm, time_width = 0,0 -- mode = true iff main_process is called from pre_linebreak_filter - local function main_process(head, mode, dir) + local function main_process(head, mode, dir, gc) tex.setattribute('global', attr_icflag, 0) - 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) + if gc == 'fin_row' then return head + else + local p = to_direct(head) + start_time_measure('jfmglue') + p = ltjj.main(p,mode) + stop_time_measure('jfmglue'); start_time_measure('setwidth') + if p then p = ltjw.set_ja_width(p, dir) end + stop_time_measure('setwidth') + return to_node(p) + end end local function adjust_icflag(h) @@ -296,18 +334,18 @@ do end -- callbacks - + luatexbase.add_to_callback( - 'pre_linebreak_filter', + 'pre_linebreak_filter', function (head,groupcode) - return main_process(head, true, tex.textdir) + return main_process(head, true, tex.textdir, groupcode) end,'ltj.pre_linebreak_filter', luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor') + 1) luatexbase.add_to_callback( - 'hpack_filter', + 'hpack_filter', function (head,groupcode,size,packtype, dir) - return main_process(head, false, dir) + return main_process(head, false, dir, groupcode) end,'ltj.hpack_filter', luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor') + 1) @@ -316,22 +354,6 @@ do end --- 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 - - - - -- debug do @@ -364,25 +386,25 @@ local function debug_show_node_X(p,print_fn) local pt=node_type(p.id) local base = debug_depth .. string.format('%X', get_attr_icflag(p)) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' - .. ' dir=' .. tostring(has_attr(p, attr_dir)) .. ' ' if pt == 'glyph' then s = base .. ' ' .. utf.char(p.char) .. ' ' .. tostring(p.font) - .. ' (' .. print_scaled(p.height) .. '+' + .. ' (' .. print_scaled(p.height) .. '+' .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) 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' then + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + if (p.shift or 0)~=0 then s = s .. ', shifted ' .. print_scaled(p.shift) end - if p.glue_sign >= 1 then + if p.glue_sign >= 1 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 @@ -397,7 +419,7 @@ 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)>icflag_table.KINSOKU + 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)