X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-pretreat.lua;h=99b8d60f686cc6c24529e7be0488636a546ab42a;hb=26649839d59f6fb2d9517806a2850200a16895bc;hp=14743db21186bb45ebf83976d7893924e876e482;hpb=0526b27bf88ed7f2adedef267f4d9226f6f5a692;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 14743db..99b8d60 100644
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -8,28 +8,25 @@ 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
+local to_node =  node.direct.tonode
+local to_direct =  node.direct.todirect
 
-local nullfunc = function(n) return n end
-local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc
-local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
-
-local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
-local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
-local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
-local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end
-local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end
+local setfield =  node.direct.setfield
+local getid =  node.direct.getid
+local getfont =  node.direct.getfont
+local getchar =  node.direct.getchar
+local getfield =  node.direct.getfield
+local getsubtype =  node.direct.getsubtype
 
 local pairs = pairs
 local floor = math.floor
-local has_attr = Dnode.has_attribute
-local set_attr = Dnode.set_attribute
-local node_traverse = Dnode.traverse
-local node_remove = Dnode.remove
-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 has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
+local node_traverse = node.direct.traverse
+local node_remove = node.direct.remove
+local node_next =  node.direct.getnext
+local node_free = node.direct.free
+local node_end_of_math = node.direct.end_of_math
 local tex_getcount = tex.getcount
 
 local id_glyph = node.id('glyph')
@@ -44,15 +41,16 @@ local attr_icflag = luatexbase.attributes['ltj@icflag']
 
 local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
 local ltjs_orig_char_table = ltjs.orig_char_table
-local ltjf_get_vert_glyph = ltjf.get_vert_glyph
 local ltjf_replace_altfont = ltjf.replace_altfont
+local ltjf_font_extra_info = ltjf.font_extra_info
 local attr_orig_char = luatexbase.attributes['ltj@origchar']
 local STCK  = luatexja.userid_table.STCK
 local DIR   = luatexja.userid_table.DIR
 local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
 
 local dir_tate = luatexja.dir_table.dir_tate
-local lang_ja = token.create('ltj@@japanese')[2]
+local lang_ja = luatexja.lang_ja
+
 ------------------------------------------------------------------------
 -- MAIN PROCESS STEP 1: replace fonts
 ------------------------------------------------------------------------
@@ -62,56 +60,61 @@ do
    local start_time_measure, stop_time_measure
       = ltjb.start_time_measure, ltjb.stop_time_measure
    local head
-   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)
-	 setfield(p, 'font', pf); setfield(p, 'lang', lang_ja)
-	 ltjs_orig_char_table[p] = pc
-      end
-      return p
-   end
-   suppress_hyphenate_ja_aux[id_math] = function(p)
-      return node_end_of_math(node_next(p)) end
-   suppress_hyphenate_ja_aux[50] = function(p) return p end
-   suppress_hyphenate_ja_aux[id_whatsit] = function(p)
-      if getsubtype(p)==sid_user then
-         local uid = getfield(p, 'user_id')
-         if uid==STCK then
-            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)
+   local suppress_hyphenate_ja_aux = {
+      [id_math] = function(p) return node_next(node_end_of_math(node_next(p))) end,
+      [id_whatsit] = function(p)
+	 if getsubtype(p)==sid_user then
+	    local uid = getfield(p, 'user_id')
+	    if uid==STCK then
+	       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
 	    end
-         end
-      end
-      return p
-   end
-
-   local function suppress_hyphenate_ja (h,t)
+	 end
+	 return node_next(p)
+      end,
+   }
+   setmetatable(suppress_hyphenate_ja_aux, 
+		{
+		   __index = function() return node_next end,
+		})
+   local function suppress_hyphenate_ja (h)
       start_time_measure('ltj_hyphenate')
       head = to_direct(h)
-      local p = head
       for i = 1,#wt do wt[i]=nil end
       for i = 1,#wtd do wtd[i]=nil end
       for i,_ in pairs(ltjs_orig_char_table) do
 	 ltjs_orig_char_table[i] = nil
       end
       ltjs.list_dir=ltjd_get_dir_count()
-      while p and p~=t do
-	 local pfunc = suppress_hyphenate_ja_aux[getid(p)]
-	 p = node_next(pfunc and pfunc(p) or p)
+      do
+	 local p = head
+	 while p do
+	    local pid = getid(p)
+	    while pid==id_glyph do
+	       local pc = getchar(p)
+	       if (has_attr(p, attr_icflag) or 0)<=0 and is_ucs_in_japanese_char(p, pc) then
+		  setfield(p, 'font', 
+			   ltjf_replace_altfont(has_attr(p, attr_curjfnt) or getfont(p), pc))
+		  setfield(p, 'lang', lang_ja)
+		  ltjs_orig_char_table[p] = pc
+	       end
+	       p = node_next(p); pid = getid(p)
+	    end
+	    p = (suppress_hyphenate_ja_aux[pid])(p)
+	 end
       end
       stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
-      lang.hyphenate(h, t)
+      lang.hyphenate(h, nil)
       stop_time_measure('tex_hyphenate')
       return h
    end
 
-   luatexbase.add_to_callback('hyphenate',
+   ltjb.add_to_callback('hyphenate',
 			      function (head,tail)
 				 return suppress_hyphenate_ja(head)
 			      end,'ltj.hyphenate')
@@ -119,6 +122,8 @@ end
 
 -- mode: true iff this function is called from hpack_filter
 local ltjs_report_stack_level = ltjs.report_stack_level
+local ltjf_font_metric_table  = ltjf.font_metric_table
+local font_getfont = font.getfont
 local function set_box_stack_level(head, mode)
    local box_set, cl = 0, tex.currentgrouplevel + 1
    for _,p  in pairs(wt) do
@@ -129,31 +134,31 @@ local function set_box_stack_level(head, mode)
       node_free(p)
    end
    if ltjs.list_dir == dir_tate then
-      for p in Dnode.traverse_id(id_glyph,to_direct(head)) do
+      for p in node.direct.traverse_id(id_glyph,to_direct(head)) do
          if (has_attr(p, attr_icflag) or 0)<=0 and getfield(p, 'lang')==lang_ja then
-            local pfn = has_attr(p, attr_curtfnt) or getfont(p)
             local pc = ltjs_orig_char_table[p]
-            local pf = ltjf_replace_altfont(pfn, pc)
-	    ltjs_orig_char_table[p] = { pc, ltjs_orig_char_table[p] }
-	    local xc = ltjf_get_vert_glyph(pf, pc) or pc
-            setfield(p, 'char', xc); setfield(p, 'font', pf);
-	    ltjs_orig_char_table[p] = { pc, xc }
+	    local nf = ltjf_replace_altfont( has_attr(p, attr_curtfnt) or getfont(p) , pc)
+	    setfield(p, 'font', nf)
+	    if ltjf_font_metric_table[nf].vert_activated then
+	       local pc = getchar(p)
+	       pc = (ltjf_font_extra_info[nf] and ltjf_font_extra_info[nf][pc] and ltjf_font_extra_info[nf][pc].vform)
+	       if pc and font_getfont(nf).characters[pc] then setfield(p, 'char', pc) end
+	    end
 	 end
       end
    end
-   --luatexja.ext_show_node_list(head, 'S> ', print)
    return head
 end
 
 -- CALLBACKS
-luatexbase.add_to_callback('hpack_filter',
+ltjb.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',
+   end,'ltj.set_stack_level',1)
+ltjb.add_to_callback('pre_linebreak_filter',
   function (head)
      return set_box_stack_level(head, false)
-  end,'ltj.pre_linebreak_filter_pre',1)
+  end,'ltj.set_stack_level',1)
 
 luatexja.pretreat = {
    set_box_stack_level = set_box_stack_level,