summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-03-24 20:42:07 +0000
committerKarl Berry <karl@freefriends.org>2014-03-24 20:42:07 +0000
commitf70b06da25c665c72900ba23f10ca1bc8dbadd79 (patch)
tree8274724e010ada8625e8abfef3454c5105e729b9 /Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
parent382a7e4800835b989130b7973529b1156ce82892 (diff)
luatexja (24mar14)
git-svn-id: svn://tug.org/texlive/trunk@33277 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/luatexja.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.lua15
1 files changed, 14 insertions, 1 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
index cfa499ae0e9..0e9f64ee310 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
@@ -43,6 +43,8 @@ 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.RIPRE = 0xA00000 -- characterごと,ruby pre
+stack_table_index.RIPOST = 0xC00000 -- characterごと,ruby post
stack_table_index.JWP = 0 -- これだけ
stack_table_index.KSK = 1 -- これだけ
stack_table_index.XSK = 2 -- これだけ
@@ -275,12 +277,20 @@ do
local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
-- mode = true iff main_process is called from pre_linebreak_filter
local function main_process(head, mode, dir)
+ 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)
end
-
+
+ local function adjust_icflag(h)
+ -- kern from luaotfload will have icflag = 1
+ -- (same as italic correction)
+ tex.setattribute('global', attr_icflag, 1)
+ return h
+ end
+
-- callbacks
luatexbase.add_to_callback(
@@ -297,6 +307,9 @@ do
end,'ltj.hpack_filter',
luatexbase.priority_in_callback('hpack_filter',
'luaotfload.node_processor') + 1)
+ luatexbase.add_to_callback('pre_linebreak_filter', adjust_icflag, 'adjust_icflag', 1)
+ luatexbase.add_to_callback('hpack_filter', adjust_icflag, 'adjust_icflag', 1)
+
end
-- define_font