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
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
userid_table.IHB = luatexbase.newuserwhatsitid('inhibitglue', 'luatexja') -- \inhibitglue
userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- スタック管理
userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」
+userid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向
------------------------------------------------------------------------
-- FIX node.remove
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
end
end
else
- luatexja.Dnode_remove = luatexja.node_remove
+ luatexja.Dnode_remove = luatexja.node_remove
end
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
+
+
+--load_module('debug')
+
load_module('charrange'); local ltjc = luatexja.charrange
load_module('jfont'); local ltjf = luatexja.jfont
load_module('inputbuf'); local ltji = luatexja.inputbuf
load_module('setwidth'); local ltjw = luatexja.setwidth
load_module('math'); local ltjm = luatexja.math
load_module('tangle'); local ltjb = luatexja.base
+load_module('direction'); local ltjd = luatexja.direction
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
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']
-- Three aux. functions, bollowed from tex.web
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
while order>1 do
out=out..'l'; order=order-1
end
- else
+ else
out=out..'pt'
end
return out
------------------------------------------------------------------------
--- 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)
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)
+ 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)
-- 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)
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)
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
.. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' '
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) .. '+'
+ 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) .. p.dir
- if p.shift~=0 then
+ 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
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.KANJI_SKIP then
s = s .. ' (from JFM: priority ' .. get_attr_icflag(p)-icflag_table.FROM_JFM .. ')'
elseif get_attr_icflag(p)==icflag_table.KANJI_SKIP then
s = s .. ' (italic correction)'
-- elseif get_attr_icflag(p)==ITALIC then
-- s = s .. ' (italic correction)'
- elseif get_attr_icflag(p)>icflag_table.KINSOKU
+ elseif get_attr_icflag(p)>icflag_table.KINSOKU
and get_attr_icflag(p)<icflag_table.KANJI_SKIP then
s = s .. ' (from JFM: priority ' .. get_attr_icflag(p)-icflag_table.FROM_JFM .. ')'
end
end
print_fn(s)
elseif pt == 'whatsit' then
- s = base .. ' subtype: ' .. tostring(p.subtype)
+ s = base .. '(' .. node.whatsits()[p.subtype] .. ') '
if p.subtype==sid_user then
- if p.type ~= 110 then
+ if p.type ~= 110 then
s = s .. ' user_id: ' .. p.user_id .. ' ' .. p.value
print_fn(s)
else
print_fn(s)
local q = p.value
debug_depth=debug_depth.. '.'
- while q do
+ while q do
debug_show_node_X(q, print_fn); q = node_next(q)
end
debug_depth=k
elseif pt=='noad' then
s = base ; print_fn(s)
if p.nucleus then
- debug_depth = k .. 'N'; debug_show_node_X(p.nucleus, print_fn);
+ debug_depth = k .. 'N'; debug_show_node_X(p.nucleus, print_fn);
end
if p.sup then
- debug_depth = k .. '^'; debug_show_node_X(p.sup, print_fn);
+ debug_depth = k .. '^'; debug_show_node_X(p.sup, print_fn);
end
if p.sub then
- debug_depth = k .. '_'; debug_show_node_X(p.sub, print_fn);
+ debug_depth = k .. '_'; debug_show_node_X(p.sub, print_fn);
end
debug_depth = k;
elseif pt=='math_char' then
elseif pt=='sub_box' or pt=='sub_mlist' then
print_fn(base)
if p.head then
- debug_depth = k .. '.';
+ debug_depth = k .. '.';
for q in node.traverse(p.head) do
debug_show_node_X(q, print_fn)
end
OSDN Git Service
