summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua11
1 files changed, 5 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
index aca606e5d6e..7018c7adf4a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
@@ -1,10 +1,9 @@
--
--- luatexja/jfmglue.lua
+-- luatexja/ltj-jfmglue.lua
--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2012/07/19',
- version = '0.5',
+ date = '2013/04/27',
description = 'Insertion process of JFM glues and kanjiskip',
})
module('luatexja.jfmglue', package.seeall)
@@ -147,7 +146,7 @@ local first_char, last_char, find_first_char
local function check_box(box_ptr, box_end)
local p = box_ptr; local found_visible_node = false
if not p then
- find_first_char = false; first_char = nil; last_char = nil
+ find_first_char = false; last_char = nil
return true
end
while p and p~=box_end do
@@ -734,7 +733,7 @@ local function get_OA_skip()
if not ihb_flag then
local pm = Np.met
return new_jfm_glue(pm,
- fast_find_char_class(((Nq.id == id_math and -1) or 'jcharbdd'), pm), Np.class)
+ fast_find_char_class(((Nq.id == id_math and -1) or (type(Nq.char)=='string' and Nq.char or 'jcharbdd')), pm), Np.class)
else return nil
end
end
@@ -757,7 +756,7 @@ local function handle_np_jachar(mode)
local g = get_OA_skip() or get_kanjiskip() -- O_A->K
handle_penalty_normal(0, Np.pre, g); real_insert(g)
elseif Nq.pre then
- local g = get_OA_skip() or get_xkanjiskip(Np) -- O_A->X
+ local g = get_OA_skip() or get_xkanjiskip(Np) -- O_A->X
handle_penalty_normal((qid==id_hlist and 0 or Nq.post), Np.pre, g); real_insert(g)
else
local g = get_OA_skip() -- O_A