More LaTeX codes for vertical writing

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

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 080cf89..598c804 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -26,7 +26,7 @@ local floor = math.floor
 local has_attr = Dnode.has_attribute
 local set_attr = Dnode.set_attribute
 local node_traverse = Dnode.traverse
-local node_remove =luatexja.Dnode_remove -- Dnode.remove
+local node_remove = Dnode.remove
 local node_next = (Dnode ~= node) and Dnode.getnext or node.next
 local node_prev = (Dnode ~= node) and Dnode.getprev or node.prev
 local node_free = Dnode.free
@@ -44,7 +44,7 @@ local attr_curtfnt = luatexbase.attributes['ltj@curtfnt']
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 
 local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
-local ltjd_get_vert_glyph = ltjd.get_vert_glyph
+local ltjf_get_vert_glyph = ltjf.get_vert_glyph
 local ltjf_replace_altfont = ltjf.replace_altfont
 local attr_orig_char = luatexbase.attributes['ltj@origchar']
 local STCK  = luatexja.userid_table.STCK
@@ -56,11 +56,12 @@ local dir_tate = luatexja.dir_table.dir_tate
 ------------------------------------------------------------------------
 -- MAIN PROCESS STEP 1: replace fonts
 ------------------------------------------------------------------------
-local wt, wtd
+local wt, wtd = {}, {}
 do
+   local ltjd_get_dir_count = ltjd.get_dir_count
    local start_time_measure, stop_time_measure 
       = ltjb.start_time_measure, ltjb.stop_time_measure
-   local head
+   local head, real_head
    local is_dir_tate
    local suppress_hyphenate_ja_aux = {}
    suppress_hyphenate_ja_aux[id_glyph] = function(p)
@@ -80,12 +81,13 @@ do
       if getsubtype(p)==sid_user then 
          local uid = getfield(p, 'user_id')
          if uid==STCK then
-            wt[#wt+1] = p; head = node_remove(head, p)
+            wt[#wt+1] = p; node_remove(head, p)
          elseif uid==DIR then
            if has_attr(p, attr_icflag)<PROCESSED_BEGIN_FLAG  then
               ltjs.list_dir = has_attr(p, attr_dir)
+           else
+              wtd[#wtd+1] = p; node_remove(head, p)
            end
-           wtd[#wtd+1] = p; head = node_remove(head, p)
          end
       end
       return p
@@ -93,19 +95,21 @@ do
 
    local function suppress_hyphenate_ja (h)
       start_time_measure('ltj_hyphenate')
-      local p = to_direct(h)
-      wt, wtd, head = {}, {}, p
-      ltjs.list_dir=ltjd.get_dir_count()
+      head = to_direct(h); real_head = node_next(head)
+      local p = head
+      for i = 1,#wt do wt[i]=nil end
+      for i = 1,#wtd do wtd[i]=nil end
+      ltjs.list_dir=ltjd_get_dir_count()
       while p do
+        local flag
         local pfunc = suppress_hyphenate_ja_aux[getid(p)]
         if pfunc then p = pfunc(p) end
         p = node_next(p)
       end
-      head = to_node(head)
       stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
-      lang.hyphenate(head)
+      lang.hyphenate(h)
       stop_time_measure('tex_hyphenate')
-      return head
+      return h
    end
 
    luatexbase.add_to_callback('hyphenate',
@@ -120,10 +124,10 @@ local function set_box_stack_level(head, mode)
    for _,p  in pairs(wt) do
       if mode and getfield(p, 'value')==cl then box_set = 1 end; node_free(p)
    end
+   ltjs.report_stack_level(tex_getcount('ltj@@stack') + box_set)
    for _,p  in pairs(wtd) do
       node_free(p)
    end
-   ltjs.report_stack_level(tex_getcount('ltj@@stack') + box_set)
    is_dir_tate = ltjs.list_dir == dir_tate
    if is_dir_tate then
       for p in Dnode.traverse_id(id_glyph,to_direct(head)) do
@@ -132,7 +136,7 @@ local function set_box_stack_level(head, mode)
             local pc = getchar(p)
             local pf = ltjf_replace_altfont(pfn, pc)
            set_attr(p, attr_dir, pc)
-           pc = ltjd_get_vert_glyph(pf, pc) or pc
+           pc = ltjf_get_vert_glyph(pf, pc) or pc
             setfield(p, 'char', pc); set_attr(p, attr_orig_char, pc)
             setfield(p, 'font', pf); set_attr(p, attr_curjfnt, pf)
          end