OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e9566b
)
Revert "Fix ticket #29140/" (for merging kitagawa_test branch)
author
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Tue, 4 Sep 2012 11:45:52 +0000
(20:45 +0900)
committer
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Tue, 4 Sep 2012 11:45:52 +0000
(20:45 +0900)
This reverts commit
2e9566b50d653da63edab02f263bcbf96df78d0e
.
src/ltj-jfmglue.lua
patch
|
blob
|
history
diff --git
a/src/ltj-jfmglue.lua
b/src/ltj-jfmglue.lua
index
0659fd0
..
be9515e
100644
(file)
--- a/
src/ltj-jfmglue.lua
+++ b/
src/ltj-jfmglue.lua
@@
-183,8
+183,12
@@
local function check_box(box_ptr, box_end)
end
while p and p~=box_end do
local pid = p.id
end
while p and p~=box_end do
local pid = p.id
- if pid==id_kern and p.subtype==2 then
- p = node_next(node_next(node_next(p))); pid = p.id -- p must be glyph_node
+ if pid==id_kern then
+ if p.subtype==2 then
+ p = node_next(node_next(node_next(p))); pid = p.id
+ elseif has_attr(p, attr_icflag)==IC_PROCESSED then
+ p = node_next(p); pid = p.id
+ end
end
if pid==id_glyph then
repeat
end
if pid==id_glyph then
repeat
@@
-194,11
+198,9
@@
local function check_box(box_ptr, box_end)
last_char = p; found_visible_node = true; p=node_next(p)
if (not p) or p==box_end then return found_visible_node end
until p.id~=id_glyph
last_char = p; found_visible_node = true; p=node_next(p)
if (not p) or p==box_end then return found_visible_node end
until p.id~=id_glyph
- pid = p.id
-- p must be non-nil
+ pid = p.id
end
end
- if pid==id_kern and has_attr(p, attr_icflag)==IC_PROCESSED then
- p = node_next(p);
- elseif pid==id_hlist then
+ if pid==id_hlist then
if has_attr(p, attr_icflag)==PACKED then
for q in node.traverse_id(id_glyph, p.head) do
if find_first_char then
if has_attr(p, attr_icflag)==PACKED then
for q in node.traverse_id(id_glyph, p.head) do
if find_first_char then