Changed the value type of ksp_{natural,stretch,shrink} to a float.

[luatex-ja/luatexja.git] / src / ltj-pretreat.lua

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 45cf0bf..4250775 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -51,7 +51,8 @@ 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,16 +63,6 @@ do
       = ltjb.start_time_measure, ltjb.stop_time_measure
    local head
    local suppress_hyphenate_ja_aux = {
-      [id_glyph] = function(p)
-        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
-        return node_next(p)
-      end,
       [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
@@ -81,7 +72,7 @@ do
            elseif uid==DIR then
               if has_attr(p, attr_icflag)<PROCESSED_BEGIN_FLAG  then
                  ltjs.list_dir = has_attr(p, attr_dir)
-              else
+              else -- こっちのケースは通常使用では起こらない
                  wtd[#wtd+1] = p; node_remove(head, p)
               end
            end
@@ -93,8 +84,6 @@ do
                {
                   __index = function() return node_next end,
                })
-   local function suppress_hyphenate_ja_iter(_,p)
-      return (suppress_hyphenate_ja_aux[getid(p)])(p) end
    local function suppress_hyphenate_ja (h)
       start_time_measure('ltj_hyphenate')
       head = to_direct(h)
@@ -104,7 +93,23 @@ do
         ltjs_orig_char_table[i] = nil
       end
       ltjs.list_dir=ltjd_get_dir_count()
-      for p in suppress_hyphenate_ja_iter, nil, head do end
+      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, nil)
       stop_time_measure('tex_hyphenate')
@@ -119,6 +124,8 @@ end
 
 -- mode: true iff this function is called from hpack_filter
 local ltjs_report_stack_level = ltjs.report_stack_level
+local ltjf_vert_form_table    = ltjf.vert_form_table
+local ltjf_font_metric_table  = ltjf.font_metric_table
 local function set_box_stack_level(head, mode)
    local box_set, cl = 0, tex.currentgrouplevel + 1
    for _,p  in pairs(wt) do
@@ -133,7 +140,12 @@ local function set_box_stack_level(head, mode)
          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))
+           local nf = ltjf_replace_altfont(pfn, pc)
+           setfield(p, 'font', nf)
+           if ltjf_font_metric_table[nf].vert_activated then
+              pc = ltjf_vert_form_table [getchar(p)]
+              if font.getfont(nf).characters[pc] then setfield(p, 'char', pc) end
+           end
         end
       end
    end