Supprted '(文字)*' syntax in JFM.

[luatex-ja/luatexja.git] / src / ltj-pretreat.lua

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 8096145..87cbdd6 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -10,13 +10,14 @@ luatexbase.provides_module({
 module('luatexja.pretreat', package.seeall)
 local err, warn, info, log = luatexbase.errwarinf(_NAME)
 
-require('luatexja.charrange'); local ltjc = luatexja.charrange
-require('luatexja.jfont');     local ltjf = luatexja.jfont
-require('luatexja.stack');     local ltjs = luatexja.stack
+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
@@ -33,6 +34,9 @@ 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_jchar_class = luatexbase.attributes['ltj@charclass']
+local ltjf_find_char_class = ltjf.find_char_class
 
 ------------------------------------------------------------------------
 -- MAIN PROCESS STEP 1: replace fonts
@@ -42,22 +46,13 @@ box_stack_level = 0
 
 local function suppress_hyphenate_ja(head)
    local non_math = true
-   for p in node.traverse(head) do
+   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
+        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
+           set_attr(p, attr_jchar_class, p.char)
+           set_attr(p, attr_yablshift, has_attr(p, attr_ykblshift) or 0)
+           p.subtype = floor(p.subtype/2)*2
         end
       elseif p.id == id_math then 
         non_math = (p.subtype ~= 0)
@@ -79,11 +74,7 @@ function set_box_stack_level(head, mode)
         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') 
-   end
+   box_stack_level = tex.getcount('ltj@@stack') + (box_set and 1 or 0)
    return head
 end