OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ltjclasses.dtx: Make ltjt*.cls compatible with \geometry, etc.
[luatex-ja/luatexja.git]
/
src
/
luatexja.lua
diff --git
a/src/luatexja.lua
b/src/luatexja.lua
index
6dddc1a
..
1c67eb6
100644
(file)
--- a/
src/luatexja.lua
+++ b/
src/luatexja.lua
@@
-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.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
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') -- 組方向
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
------------------------------------------------------------------------
------------------------------------------------------------------------
-- FIX node.remove
------------------------------------------------------------------------
@@
-118,9
+126,7
@@
do
luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
end
luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
end
-
---load_module('debug')
-
+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
load_module('charrange'); local ltjc = luatexja.charrange
load_module('jfont'); local ltjf = luatexja.jfont
load_module('inputbuf'); local ltji = luatexja.inputbuf
@@
-387,8
+393,9
@@
local function debug_show_node_X(p,print_fn)
print_fn(s)
elseif pt=='hlist' or pt=='vlist' or pt=='unset' then
s = base .. '(' .. print_scaled(p.height) .. '+'
print_fn(s)
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 or 0~=0 then
+ .. 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
s = s .. ', shifted ' .. print_scaled(p.shift)
end
if p.glue_sign >= 1 then
@@
-445,18
+452,22
@@
local function debug_show_node_X(p,print_fn)
end
print_fn(s)
elseif pt == 'whatsit' then
end
print_fn(s)
elseif pt == 'whatsit' then
- s = base
.. '(' .. node.whatsits()[p.subtype] .. ') '
+ s = base
if p.subtype==sid_user then
if p.subtype==sid_user then
+ local t = tostring(p.user_id) .. ' (' ..
+ luatexbase.get_user_whatsit_name(p.user_id) .. ') '
if p.type ~= 110 then
if p.type ~= 110 then
- s = s .. ' user
_id: ' .. p.user_id .. ' '
.. p.value
+ s = s .. ' user
id:' .. t
.. p.value
print_fn(s)
else
print_fn(s)
else
- s = s .. ' user_id: ' .. p.user_id .. ' (node list)'
+ s = s .. ' userid:' .. t .. '(node list)'
+ if p.user_id==userid_table.DIR then
+ s = s .. ' dir: ' .. tostring(node.has_attribute(p, attr_dir))
+ end
print_fn(s)
print_fn(s)
- local q = p.value
debug_depth=debug_depth.. '.'
debug_depth=debug_depth.. '.'
-
while q
do
- debug_show_node_X(q, print_fn)
; q = node_next(q)
+
for q in node.traverse(p.value)
do
+ debug_show_node_X(q, print_fn)
end
debug_depth=k
end
end
debug_depth=k
end