check_box in tate direction

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

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 387fcc8..5300d4e 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -5,6 +5,7 @@
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
 luatexja.load_module('stack');     local ltjs = luatexja.stack
 luatexja.load_module('jfont');     local ltjf = luatexja.jfont
+luatexja.load_module('direction'); local ltjd = luatexja.direction
 
 local Dnode = node.direct or node
 
@@ -25,7 +26,7 @@ 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_next = Dnode.getnext
+local node_next = (Dnode ~= node) and Dnode.getnext or node.next
 local node_free = Dnode.free
 local node_end_of_math = Dnode.end_of_math
 local tex_getcount = tex.getcount
@@ -35,13 +36,20 @@ local id_math = node.id('math')
 local id_whatsit = node.id('whatsit')
 local sid_user = node.subtype('user_defined')
 
+local attr_dir = luatexbase.attributes['ltj@dir']
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
+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_replace_altfont = ltjf.replace_altfont
 local attr_orig_char = luatexbase.attributes['ltj@origchar']
 local STCK = luatexja.userid_table.STCK
+local DIR = luatexja.stack_table_index.DIR
+
+local dir_tate = 3
+local dir_yoko = 4
 
 ------------------------------------------------------------------------
 -- MAIN PROCESS STEP 1: replace fonts
@@ -49,15 +57,13 @@ local STCK = luatexja.userid_table.STCK
 local wt
 do
    local head
-
+   local is_dir_tate
    local suppress_hyphenate_ja_aux = {}
    suppress_hyphenate_ja_aux[id_glyph] = function(p)
       if (has_attr(p, attr_icflag) or 0)<=0 and is_ucs_in_japanese_char(p) then
-        local pc = getchar(p)
-        local pf = ltjf_replace_altfont(has_attr(p, attr_curjfnt) or getfont(p), pc)
+        local pf = has_attr(p, attr_curjfnt) or getfont(p)
         setfield(p, 'font', pf);  set_attr(p, attr_curjfnt, pf)
         setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2)
-        set_attr(p, attr_orig_char, pc)
       end
       return p
    end
@@ -81,8 +87,8 @@ do
       lang.hyphenate(head)
       return head
    end
-   
-   luatexbase.add_to_callback('hyphenate', 
+
+   luatexbase.add_to_callback('hyphenate',
                              function (head,tail)
                                 return suppress_hyphenate_ja(head)
                              end,'ltj.hyphenate')
@@ -95,15 +101,30 @@ local function set_box_stack_level(head, mode)
       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)
+   is_dir_tate = ltjs.table_current_stack[DIR] == dir_tate
+   local jfntattr = is_dir_tate and attr_curtfnt or attr_curjfnt
+   for p in Dnode.traverse_id(id_glyph,to_direct(head)) do
+      if has_attr(p, attr_curjfnt)==getfont(p) then
+        local pfn = has_attr(p, jfntattr) or getfont(p)
+        local pc = getchar(p)
+        local pf = ltjf_replace_altfont(pfn, pc)
+        if is_dir_tate then
+           set_attr(p, attr_dir, pc)
+           pc = ltjd_get_vert_glyph(pf, pc) or pc
+        end
+        setfield(p, 'char', pc); set_attr(p, attr_orig_char, pc)
+        setfield(p, 'font', pf); set_attr(p, attr_curjfnt, pf)
+      end
+   end
    return head
 end
 
 -- CALLBACKS
-luatexbase.add_to_callback('hpack_filter', 
+luatexbase.add_to_callback('hpack_filter',
    function (head)
      return set_box_stack_level(head, true)
    end,'ltj.hpack_filter_pre',1)
-luatexbase.add_to_callback('pre_linebreak_filter', 
+luatexbase.add_to_callback('pre_linebreak_filter',
   function (head)
      return set_box_stack_level(head, false)
   end,'ltj.pre_linebreak_filter_pre',1)