X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fltj-pretreat.lua;h=e2d294a795f4c44cf119389b5dde144ad94d424c;hb=3798f4baae838a412a2146a73abf1ef9a79d6772;hp=d0ea84da1be2d4bf6fe8a2244775ed82d39fcf03;hpb=c9d30939ae3f14256da39471808dcde3d3c32d7b;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index d0ea84d..e2d294a 100644
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -1,27 +1,35 @@
 --
--- luatexja/pretreat.lua
+-- luatexja/ltj-pretreat.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.pretreat',
-  date = '2012/07/19',
-  version = '0.2',
-  description = '',
-})
-module('luatexja.pretreat', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
 
+luatexja.load_module('base');      local ltjb = luatexja.base
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
-luatexja.load_module('jfont');     local ltjf = luatexja.jfont
 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 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 pairs = pairs
 local floor = math.floor
-local has_attr = node.has_attribute
-local set_attr = node.set_attribute
-local node_traverse = node.traverse
-local node_type = node.type
-local node_remove = node.remove
-local node_next = node.next
-local node_free = node.free
+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 tex_getcount = tex.getcount
 
 local id_glyph = node.id('glyph')
@@ -29,61 +37,125 @@ 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 ltjf_font_metric_table = ltjf.font_metric_table
-local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char
+local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
+local ltjs_orig_char_table = ltjs.orig_char_table
+local ltjf_replace_altfont = ltjf.replace_altfont
 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]
 ------------------------------------------------------------------------
 -- MAIN PROCESS STEP 1: replace fonts
 ------------------------------------------------------------------------
-local wt
-
-local function suppress_hyphenate_ja(head)
-   local non_math, p = true, head
-   wt = {}
-   while p do
-      local pid = p.id
-      if pid == id_glyph then
-	 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
-	    p.subtype = floor(p.subtype*0.5)*2
-	    set_attr(p, attr_orig_char, p.char)
+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 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
+	 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)
+      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()
+      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
-      elseif pid == id_math then 
-	 p = node_next(p) -- skip math on
-	 while p and p.id~=id_math do p = node_next(p) end
-      elseif pid == id_whatsit and p.subtype==sid_user and p.user_id==30112 then
-	 wt[#wt+1] = p; head = node_remove(head, p)
       end
-      p = node_next(p)
+      stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
+      lang.hyphenate(h, nil)
+      stop_time_measure('tex_hyphenate')
+      return h
    end
-   lang.hyphenate(head)
-   return head
+
+   luatexbase.add_to_callback('hyphenate',
+			      function (head,tail)
+				 return suppress_hyphenate_ja(head)
+			      end,'ltj.hyphenate')
 end
 
 -- mode: true iff this function is called from hpack_filter
-function set_box_stack_level(head, mode)
+local ltjs_report_stack_level = ltjs.report_stack_level
+local function set_box_stack_level(head, mode)
    local box_set, cl = 0, tex.currentgrouplevel + 1
    for _,p  in pairs(wt) do
-      if mode and p.value==cl then box_set = 1 end; node_free(p)
+      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)
+   ltjs_report_stack_level(tex_getcount('ltj@@stack') + box_set)
+   for _,p  in pairs(wtd) do
+      node_free(p)
+   end
+   if ltjs.list_dir == dir_tate then
+      for p in Dnode.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]
+	    setfield(p, 'font', ltjf_replace_altfont(pfn, pc))
+	 end
+      end
+   end
+   --luatexja.ext_show_node_list(head, 'S> ', print)
    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)
-luatexbase.add_to_callback('hyphenate', 
- function (head,tail)
-    return suppress_hyphenate_ja(head)
- end,'ltj.hyphenate')
+
+luatexja.pretreat = {
+   set_box_stack_level = set_box_stack_level,
+   orig_char_table = orig_char_table,
+}