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
luatexja-preset.sty: \defaultjfontfeatures -> \addjfontfeature, to prevent override.
[luatex-ja/luatexja.git]
/
src
/
ltj-pretreat.lua
diff --git
a/src/ltj-pretreat.lua
b/src/ltj-pretreat.lua
index
ad91821
..
6f72256
100644
(file)
--- a/
src/ltj-pretreat.lua
+++ b/
src/ltj-pretreat.lua
@@
-1,17
+1,8
@@
--
--
--- luatexja/pretreat.lua
+-- luatexja/
ltj-
pretreat.lua
--
--
-luatexbase.provides_module({
- name = 'luatexja.pretreat',
- date = '2012/07/19',
- version = '0.2',
- description = '',
-})
-module('luatexja.pretreat', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
luatexja.load_module('charrange'); local ltjc = luatexja.charrange
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
luatexja.load_module('stack'); local ltjs = luatexja.stack
local floor = math.floor
@@
-32,31
+23,30
@@
local sid_user = node.subtype('user_defined')
local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
local attr_icflag = luatexbase.attributes['ltj@icflag']
local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
local attr_icflag = luatexbase.attributes['ltj@icflag']
-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']
local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char
local attr_orig_char = luatexbase.attributes['ltj@origchar']
+local STCK = luatexja.userid_table.STCK
------------------------------------------------------------------------
-- MAIN PROCESS STEP 1: replace fonts
------------------------------------------------------------------------
------------------------------------------------------------------------
-- 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, p = true, head
wt = {}
while p do
local wt
local function suppress_hyphenate_ja(head)
local non_math, p = true, head
wt = {}
while p do
- --for p in node_traverse(head) do
- if p
.
id == id_glyph then
+ local pid = p.id
+ if pid == 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
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
- while 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
+ elseif pid == id_math then
+ p = node_next(p) -- skip math on
+ while p and p.id~=id_math do p = node_next(p) end
+ elseif pid == id_whatsit and p.subtype==sid_user and p.user_id==STCK then
wt[#wt+1] = p; head = node_remove(head, p)
end
p = node_next(p)
wt[#wt+1] = p; head = node_remove(head, p)
end
p = node_next(p)
@@
-66,12
+56,12
@@
local function suppress_hyphenate_ja(head)
end
-- mode: true iff this function is called from hpack_filter
end
-- mode: true iff this function is called from hpack_filter
-function set_box_stack_level(head, mode)
+
local
function set_box_stack_level(head, mode)
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
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
- box_stack_level = tex_getcount('ltj@@stack') + box_set
+ ltjs.report_stack_level(tex_getcount('ltj@@stack') + box_set)
return head
end
return head
end
@@
-88,3
+78,7
@@
luatexbase.add_to_callback('hyphenate',
function (head,tail)
return suppress_hyphenate_ja(head)
end,'ltj.hyphenate')
function (head,tail)
return suppress_hyphenate_ja(head)
end,'ltj.hyphenate')
+
+luatexja.pretreat = {
+ set_box_stack_level = set_box_stack_level,
+}