Fix ticket #34941

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index cda9d1d..d919172 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -901,3 +901,17 @@ do
       node_free(TEMP)
    end
 end
+
+------------------------------------------------------------------------
+-- VERT VARIANT TABLE
+------------------------------------------------------------------------
+vert_form_table = {
+   [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30,
+   [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38,
+   [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C,
+   [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40,
+   [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44,
+   [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33,
+}
+setmetatable(vert_form_table, {__index=function(t,k) return k end});
+

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index c21de3f..320ef54 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -124,6 +124,7 @@ 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 function set_box_stack_level(head, mode)
    local box_set, cl = 0, tex.currentgrouplevel + 1
    for _,p  in pairs(wt) do
@@ -138,7 +139,10 @@ 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)
+           pc = ltjf_vert_form_table [getchar(p)]
+           if font.getfont(nf).characters[pc] then setfield(p, 'char', pc) end
         end
       end
    end