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

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index d55dfe2..14743db 100644
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -28,7 +28,6 @@ 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_prev = (Dnode ~= node) and Dnode.getprev or node.prev
 local node_free = Dnode.free
 local node_end_of_math = Dnode.end_of_math
 local tex_getcount = tex.getcount
@@ -44,7 +43,8 @@ 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 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 attr_orig_char = luatexbase.attributes['ltj@origchar']
 local STCK  = luatexja.userid_table.STCK
@@ -52,24 +52,23 @@ 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, wtd = {}, {}
 do
-   local start_time_measure, stop_time_measure 
+   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, real_head
-   local is_dir_tate
+   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);  set_attr(p, attr_curjfnt, pf)
-	 setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2)
-         set_attr(p, attr_orig_char, pc)
+	 setfield(p, 'font', pf); setfield(p, 'lang', lang_ja)
+	 ltjs_orig_char_table[p] = pc
       end
       return p
    end
@@ -77,42 +76,37 @@ do
       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 
+      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)
-	       if not node_next(p) and real_head==p then
-		  return p, true
-	       end
+	    else
+	       wtd[#wtd+1] = p; node_remove(head, p)
 	    end
-	    wtd[#wtd+1] = p; node_remove(head, p)
          end
       end
       return p
    end
 
-   local function suppress_hyphenate_ja (h)
+   local function suppress_hyphenate_ja (h,t)
       start_time_measure('ltj_hyphenate')
-      head = to_direct(h); real_head = node_next(head)
+      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 do
-	 local flag
+      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)]
-	 if pfunc then p, flag = pfunc(p) end
-	 if flag then 
-	    stop_time_measure('ltj_hyphenate')
-	    return h
-	 end
-	 p = node_next(p)
+	 p = node_next(pfunc and pfunc(p) or p)
       end
       stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
-      lang.hyphenate(h)
+      lang.hyphenate(h, t)
       stop_time_measure('tex_hyphenate')
       return h
    end
@@ -124,29 +118,30 @@ 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
+   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 has_attr(p, attr_curjfnt)==getfont(p) then
+         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 = getchar(p)
+            local pc = ltjs_orig_char_table[p]
             local pf = ltjf_replace_altfont(pfn, pc)
-	    set_attr(p, attr_dir, pc)
-	    pc = ltjd_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
+	    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 }
+	 end
       end
    end
+   --luatexja.ext_show_node_list(head, 'S> ', print)
    return head
 end
 
@@ -162,4 +157,5 @@ luatexbase.add_to_callback('pre_linebreak_filter',
 
 luatexja.pretreat = {
    set_box_stack_level = set_box_stack_level,
+   orig_char_table = orig_char_table,
 }