summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua64
1 files changed, 25 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
index aa8ddf427b3..18a1df06e78 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
@@ -3,8 +3,8 @@
--
luatexbase.provides_module({
name = 'luatexja.pretreat',
- date = '2011/06/27',
- version = '0.1',
+ date = '2012/07/19',
+ version = '0.2',
description = '',
})
module('luatexja.pretreat', package.seeall)
@@ -14,13 +14,15 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange
luatexja.load_module('jfont'); local ltjf = luatexja.jfont
luatexja.load_module('stack'); local ltjs = luatexja.stack
+local floor = math.floor
local has_attr = node.has_attribute
local set_attr = node.set_attribute
-local unset_attr = node.unset_attribute
+local node_traverse = node.traverse
local node_type = node.type
local node_remove = node.remove
local node_next = node.next
local node_free = node.free
+local tex_getcount = tex.getcount
local id_glyph = node.id('glyph')
local id_math = node.id('math')
@@ -29,39 +31,33 @@ local sid_user = node.subtype('user_defined')
local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
local attr_icflag = luatexbase.attributes['ltj@icflag']
-local attr_yablshift = luatexbase.attributes['ltj@yablshift']
-local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
local ltjf_font_metric_table = ltjf.font_metric_table
+local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char
+local attr_orig_char = luatexbase.attributes['ltj@origchar']
------------------------------------------------------------------------
-- MAIN PROCESS STEP 1: replace fonts
------------------------------------------------------------------------
-box_stack_level = 0
--- This is used in jfmglue.lua.
+local wt
local function suppress_hyphenate_ja(head)
- local non_math = true
- for p in node.traverse(head) do
- if p.id == id_glyph and non_math then
- local i = has_attr(p, attr_icflag) or 0
- if i==0 and ltjc.is_ucs_in_japanese_char(p) then
- local v = has_attr(p, attr_curjfnt)
- if v then
- p.font = v
- end
- v = has_attr(p, attr_ykblshift)
- if v then
- set_attr(p, attr_yablshift, v)
- else
- unset_attr(p, attr_yablshift)
- end
- if p.subtype%2==1 then p.subtype = p.subtype - 1 end
- -- p.lang=lang_ja
+ local non_math, p = true, head
+ wt = {}
+ while p do
+ if p.id == id_glyph then
+ if (has_attr(p, attr_icflag) or 0)<=0 and ltjc_is_ucs_in_japanese_char(p) then
+ p.font = has_attr(p, attr_curjfnt) or p.font
+ p.subtype = floor(p.subtype*0.5)*2
+ set_attr(p, attr_orig_char, p.char)
end
elseif p.id == id_math then
- non_math = (p.subtype ~= 0)
+ p = node_next(p) -- skip math on
+ while p and p.id~=id_math do p = node_next(p) end
+ elseif p.id == id_whatsit and p.subtype==sid_user and p.user_id==30112 then
+ wt[#wt+1] = p; head = node_remove(head, p)
end
+ p = node_next(p)
end
lang.hyphenate(head)
return head
@@ -69,21 +65,11 @@ end
-- mode: true iff this function is called from hpack_filter
function set_box_stack_level(head, mode)
- local box_set = false
- local p = head
- local cl = tex.currentgrouplevel + 1
- for p in node.traverse_id(id_whatsit, head) do
- if p.subtype==sid_user and p.user_id==30112 then
- local g = p
- if mode and g.value==cl then box_set = true end
- head, p = node_remove(head, g); node_free(g); break
- end
- end
- if box_set then
- box_stack_level = tex.getcount('ltj@@stack') + 1
- else
- box_stack_level = tex.getcount('ltj@@stack')
+ local box_set, cl = 0, tex.currentgrouplevel + 1
+ for _,p in pairs(wt) do
+ if mode and p.value==cl then box_set = 1 end; node_free(p)
end
+ ltjs.report_stack_level(tex_getcount('ltj@@stack') + box_set)
return head
end