From a80dbd114813c8bc1fc4e7bc7b787ab371e6c786 Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Fri, 15 Jan 2021 15:48:57 +0900
Subject: [PATCH] #40953

---
 src/ltj-jfont.lua    | 12 +++++++++---
 src/ltj-setwidth.lua | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index ed40e86..a18acf8 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -784,6 +784,11 @@ end
 luatexja.jfont.font_extra_info = font_extra_info -- key: fontnumber
 local font_extra_basename = {} -- key: basename
 
+local rotate_exception = {
+  [0xFF1A]= { ['zht'] = true, },
+  [0xFF1B]= { ['zht'] = true, },
+}
+luatexja.jfont.rotate_exception = rotate_exception
 local list_rotate_glyphs
 do
   local ceil = math.ceil
@@ -825,14 +830,14 @@ do
     --   end)
     for i,_ in pairs(rot) do
        dest = dest or {}; dest.rotation = dest.rotation or {}
-       dest.rotation[i] = true
+       dest.rotation[i] = rotate_exception[i] or true
     end
     return dest
   end
 end
 
 do
-   local cache_ver = 23
+   local cache_ver = 24
    local nameonly, lower = file.nameonly, string.lower
    local lfs = require"lfs"
    local file_attributes = lfs.attributes
@@ -972,7 +977,8 @@ luatexbase.add_to_callback(
           for j,w in pairs(vform) do
             if (i==j)and(w==k) then vform[j]=nil elseif w==i then vform[j] = k end
           end
-        end)
+      end)
+      print(vform[0xFF1A], vform[0xFF1B])
       return fmtable
    end, 'ltj.get_vert_form', 1
 )
diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua
index c502e98..03ec44f 100644
--- a/src/ltj-setwidth.lua
+++ b/src/ltj-setwidth.lua
@@ -190,13 +190,19 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
       local pf, pc = getfont(p), getchar(p)
       local feir = ltjf_font_extra_info[pf]
       if met.rotation and met.vert_activated then
-         if met.rotation[pc] and (has_attr(p, attr_vert_ori) or 0)<=0 then
+          local f = font_getfont(pf)
+          local r, l = met.rotation[pc], f.properties and f.properties.language
+          if ((r==true) or (type(r)=="table" and not r[l])) and (has_attr(p, attr_vert_ori) or 0)<=0 then
             return capsule_glyph_tate_rot(p, met, char_data, head, dir, 
               0.5*(get_ascender(pf)-get_descender(pf)))
-         end
-     end
-     pwidth, ascender = feir.vheight[pc]*met.size, feir.vorigin[pc]*met.size
+          end
+      end
+      pwidth, ascender = feir.vheight[pc]*met.size, feir.vorigin[pc]*met.size
+     -- print(pwidth/65536.,ascender/65536.)
    end
+   -- luatexja.ext_show_node(node.direct.tonode(p), 'B> ', print)
+   local xo, yo = getoffsets(p)
+   --pwidth = pwidth - yo
    fwidth = fwidth or pwidth
    if pwidth>fwidth and char_data.round_threshold then
       local frac = pwidth / fwidth
@@ -207,7 +213,6 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
    fshift = call_callback("luatexja.set_width", fshift, met, char_data)
    local fheight = char_data.height or 0
    local fdepth  = char_data.depth or 0
-   local xo, yo = getoffsets(p)
    local y_shift = xo + (has_attr(p,attr_tkblshift) or 0)
    local q
    head, q = node_remove(head, p)
@@ -215,7 +220,7 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
    setwhd(box, fwidth, fheight, fdepth)
    setfield(box, 'shift', y_shift)
    setdir(box, dir)
-
+   -- print(yo, ascender, char_data.align, fwidth-pwidth)
    setoffsets(p, -fshift.down,
               yo -(ascender + char_data.align*(fwidth-pwidth) - fshift.left) )
    local ws = node_new(id_whatsit, sid_save)
@@ -231,6 +236,7 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
    setnext(k3, wr);
 
    set_attr(box, attr_icflag, PACKED)
+   -- luatexja.ext_show_node(node.direct.tonode(box), 'A> ', print)
    head = q and node_insert_before(head, q, box)
       or node_insert_after(head, node_tail(head), box)
    return q, head, box
-- 
2.11.0