compatibility

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

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 469970e..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
 ------------------------------------------------------------------------
@@ -71,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
@@ -123,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
@@ -137,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