X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-pretreat.lua;h=6f72256d05e1615dc6a696c46e3bc863eecec84b;hb=cf51a2259a27eeed9a3d5d0c40c767a5e6bc403e;hp=e935a8950ac44d0cdb82b07f1d33dabc07692f15;hpb=61f972667616f209ffd2f5a9d3b1eee9e80b53bb;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index e935a89..6f72256 100644
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -1,17 +1,8 @@
 --
--- luatexja/pretreat.lua
+-- luatexja/ltj-pretreat.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.pretreat',
-  date = '2011/06/27',
-  version = '0.1',
-  description = '',
-})
-module('luatexja.pretreat', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
 
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
-luatexja.load_module('jfont');     local ltjf = luatexja.jfont
 luatexja.load_module('stack');     local ltjs = luatexja.stack
 
 local floor = math.floor
@@ -22,6 +13,7 @@ local node_type = node.type
 local node_remove = node.remove
 local node_next = node.next
 local node_free = node.free
+local tex_getcount = tex.getcount
 
 local id_glyph = node.id('glyph')
 local id_math = node.id('math')
@@ -30,51 +22,46 @@ local sid_user = node.subtype('user_defined')
 
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 local attr_icflag = luatexbase.attributes['ltj@icflag']
-local attr_yablshift = luatexbase.attributes['ltj@yablshift']
-local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
 
-local ltjf_font_metric_table = ltjf.font_metric_table
 local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char
 local attr_orig_char = luatexbase.attributes['ltj@origchar']
-local ltjf_find_char_class = ltjf.find_char_class
+local STCK = luatexja.userid_table.STCK
 
 ------------------------------------------------------------------------
 -- MAIN PROCESS STEP 1: replace fonts
 ------------------------------------------------------------------------
-box_stack_level = 0
--- This is used in jfmglue.lua.
+local wt
 
 local function suppress_hyphenate_ja(head)
-   local non_math = true
-   for p in node_traverse(head) do
-      if p.id == id_glyph and non_math then
+   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)
-	    set_attr(p, attr_yablshift, has_attr(p, attr_ykblshift) or 0)
-	    p.subtype = floor(p.subtype/2)*2
 	 end
-      elseif p.id == id_math then 
-	 non_math = (p.subtype ~= 0)
+      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==STCK then
+	 wt[#wt+1] = p; head = node_remove(head, p)
       end
+      p = node_next(p)
    end
    lang.hyphenate(head)
    return head
 end
 
 -- mode: true iff this function is called from hpack_filter
-function set_box_stack_level(head, mode)
-   local box_set = false
-   local p = head
-   local cl = tex.currentgrouplevel + 1
-   for p in node.traverse_id(id_whatsit, head) do
-      if p.subtype==sid_user and p.user_id==30112 then
-	 local g = p
-	 if mode and g.value==cl then box_set = true end
-	 head, p = node_remove(head, g); node_free(g); break
-      end
+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)
    end
-   box_stack_level = tex.getcount('ltj@@stack') + (box_set and 1 or 0)
+   ltjs.report_stack_level(tex_getcount('ltj@@stack') + box_set)
    return head
 end
 
@@ -91,3 +78,7 @@ 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,
+}