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
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
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)
-- 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
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.
-- 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) .. ')',
c=0
end
if k == 'jacharrange' then
- if c<0 or 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
- tex.write(ltjc.get_range_setting(c))
+ -- 負の値は <U+0080 の文字の文字範囲，として出てくる．この時はいつも欧文文字なので 1 を返す
+ tex.write( (c<0) and -1 or ltjc.get_range_setting(c))
else
if c<0 or c>0x10FFFF then
ltjb.package_error('luatexja',
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
-- 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
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)
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.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 .. ' (kanjiskip)'
- elseif get_attr_icflag(p)==XKANJI_SKIP then
+ elseif get_attr_icflag(p)==icflag_table.XKANJI_SKIP then
s = s .. ' (xkanjiskip)'
end
print_fn(s)
s = base .. ' ' .. print_scaled(p.kern) .. 'pt'
if p.subtype==2 then
s = s .. ' (for accent)'
- elseif get_attr_icflag(p)==IC_PROCESSED then
+ elseif get_attr_icflag(p)==icflag_table.IC_PROCESSED then
s = s .. ' (italic correction)'
-- elseif get_attr_icflag(p)==ITALIC then
-- s = s .. ' (italic correction)'
- elseif get_attr_icflag(p)==FROM_JFM then
- s = s .. ' (from JFM)'
- elseif get_attr_icflag(p)==LINE_END then
- s = s .. " (from 'lineend' in JFM)"
+ 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
print_fn(s)
elseif pt == 'penalty' then
s = base .. ' ' .. tostring(p.penalty)
- if get_attr_icflag(p)==KINSOKU then
+ if get_attr_icflag(p)==icflag_table.KINSOKU then
s = s .. ' (for kinsoku)'
end
print_fn(s)
OSDN Git Service
