X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-pretreat.lua;h=249927ad69e7293f861ab31279a902c09af68989;hb=79e952ea40e3ac4ebd79a2b1c65c3a3745b0289a;hp=8df99a45d96816f676e3900c911c067130ea4e89;hpb=a5b897150b428f4336e7dffd21ef6f86678be96c;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 8df99a4..249927a 100644
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -2,6 +2,7 @@
 -- luatexja/ltj-pretreat.lua
 --
 
+luatexja.load_module('base');      local ltjb = luatexja.base
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
 luatexja.load_module('stack');     local ltjs = luatexja.stack
 luatexja.load_module('jfont');     local ltjf = luatexja.jfont
@@ -25,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_free = Dnode.free
 local node_end_of_math = Dnode.end_of_math
@@ -42,63 +43,71 @@ 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
-local DIR = luatexja.userid_table.DIR
-
-local dir_tate = 3
-local dir_yoko = 4
+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 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 is_dir_tate
-   local dir_frozen
    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);  set_attr(p, attr_curjfnt, pf)
-	 setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2)
+	 setfield(p, 'lang', lang_ja)
+	 --setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2)
          set_attr(p, attr_orig_char, pc)
       end
       return p
    end
-   suppress_hyphenate_ja_aux[id_math] = function(p) 
-      dir_frozen = true
+   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; head = node_remove(head, p)
-         elseif uid==DIR and not dir_frozen then
-            ltjs.list_dir = getfield(p, 'value')
+            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
-         dir_frozen = true
       end
       return p
    end
 
-   local function suppress_hyphenate_ja (h)
-      local p = to_direct(h)
-      wt, head, dir_frozen = {}, p, false
-      ltjs.list_dir=ltjd.get_dir_count()
-      while p do
+   local function suppress_hyphenate_ja (h,t)
+      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
+      ltjs.list_dir=ltjd_get_dir_count()
+      while p and p~=t do
 	 local pfunc = suppress_hyphenate_ja_aux[getid(p)]
-	 if pfunc then p = pfunc(p) else dir_frozen = true end
-	 p = node_next(p)
+	 p = node_next(pfunc and pfunc(p) or p)
       end
-      head = to_node(head)
-      lang.hyphenate(head)
-      return head
+      stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
+      lang.hyphenate(h, t)
+      stop_time_measure('tex_hyphenate')
+      return h
    end
 
    luatexbase.add_to_callback('hyphenate',
@@ -108,12 +117,16 @@ do
 end
 
 -- mode: true iff this function is called from hpack_filter
+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 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
    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
@@ -122,7 +135,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