From d63cda7a13521d938fd1e770fb2d45d06f85c8e3 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Wed, 24 Jul 2019 23:40:47 +0900 Subject: [PATCH] support vertical origin (requires luaotfload 2019-07-24 or later) --- src/jfm-ujisv.lua | 1 - src/ltj-jfont.lua | 15 +++++++++++---- src/ltj-setwidth.lua | 17 +++++++++-------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/jfm-ujisv.lua b/src/jfm-ujisv.lua index 2a7e5a6..ccae212 100644 --- a/src/jfm-ujisv.lua +++ b/src/jfm-ujisv.lua @@ -297,7 +297,6 @@ end t[200]=table.fastcopy(t[0]) t[200].chars={'〱', '〲'} t[200].width = 2.0 -t[200].left=-0.5 for i,v in pairs(t) do if type(v)=='table' then if v.glue and v.glue[0] then v.glue[200] = v.glue[0] end diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index 375527a..b3d0fde 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -809,18 +809,25 @@ local prepare_fl_data do local sort = table.sort prepare_fl_data = function (dest, id) - local t = {} + local ascent = id.shared.rawdata.metadata.ascender + local t_vorigin, t_ind_to_uni = {}, {} for i,v in pairs(id.shared.rawdata.descriptions) do - t[v.index] = i + t_ind_to_uni[v.index] = i + if v.tsb then + local j = v.boundingbox[4] + v.tsb + if j~=ascent then print(i,j);t_vorigin[i]=j end + end end - dest = dest or {}; dest.ind_to_uni = t + dest = dest or {} + dest.ind_to_uni = t_ind_to_uni + dest.vorigin = t_vorigin return dest end end -- do - local cache_ver = 18 + local cache_ver = 19 local function prepare_extra_data_base(id) if (not id) or (not id.filename) then return end diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua index 14c6a24..43004f4 100644 --- a/src/ltj-setwidth.lua +++ b/src/ltj-setwidth.lua @@ -14,6 +14,7 @@ local getfont = node.direct.getfont local getlist = node.direct.getlist local getchar = node.direct.getchar local getsubtype = node.direct.getsubtype +local getwidth = node.direct.getwidth or function(n) return getfield(n,'width') end local getdepth = node.direct.getdepth or function(n) return getfield(n,'depth') end local getwhd = node.direct.getwhd or function(n) return getfield(n,'width'), getfield(n,'height'),getfield(n,'depth') end @@ -23,6 +24,7 @@ local setwhd = node.direct.setwhd or function(n,w,h,d) local setchar = node.direct.setchar or function(n,c) setfield(n,'char',c) end local setnext = node.direct.setnext or function(n,c) setfield(n,'next',c) end local setdir = node.direct.setdir or function(n,c) setfield(n,'dir',c) end +local setkern = node.direct.setkern or function(n,c) setfield(n,'kern',c) end local setoffsets = node.direct.setoffsets or function(n,x,y) setfield(n,'xoffset',x); setfield(n,'yoffset',y) end local getoffsets = node.direct.getoffsets or function(n) @@ -81,7 +83,7 @@ luatexbase.create_callback("luatexja.set_width", "data", end) local call_callback = luatexbase.call_callback -local fshift = { down = 0, left = 0} +local fshift = { down = 0, left = 0 } local min, max = math.min, math.max @@ -187,9 +189,8 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) pwidth = (ident.descriptions and ident.descriptions[pc] and ident.descriptions[pc].vheight and ident.descriptions[pc].vheight / ident.units * met.size) - or (ascent+descent) - pwidth = pwidth + (met.v_advance[pc] or 0) - ascent = met.v_origin[pc] and ascent - met.v_origin[pc] or ascent + or (ident.metadata and ident.metadate.defaultvheight) or (ascent+descent) + ascent = feir.vorigin[pc] and (feir.vorigin[pc] / ident.units * met.size) or ascent end fwidth = fwidth or pwidth fshift.down = char_data.down; fshift.left = char_data.left @@ -210,9 +211,9 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) local ws = node_new(id_whatsit, sid_save) local wm = node_new(id_whatsit, sid_matrix) setfield(wm, 'data', '0 1 -1 0') - local pwnh = -round(0.5*getfield(p, 'width')) - local k2 = node_new(id_kern, 1); setfield(k2, 'kern', pwnh) - local k3 = node_new(id_kern, 1); setfield(k3, 'kern', -getfield(p, 'width')-pwnh) + local pwnh = -round(0.5*getwidth(p)) + local k2 = node_new(id_kern, 1); setkern(k2, pwnh) + local k3 = node_new(id_kern, 1); setkern(k3, -getwidth(p)-pwnh) local wr = node_new(id_whatsit, sid_restore) setfield(box, 'head', ws) setnext(ws, wm); setnext(wm, k2); @@ -228,7 +229,7 @@ luatexja.setwidth.capsule_glyph_tate = capsule_glyph_tate local function capsule_glyph_math(p, met, char_data) if not char_data then return nil end - local fwidth, pwidth = char_data.width, getfield(p, 'width') + local fwidth, pwidth = char_data.width, getwidth(p) fwidth = fwidth or pwidth fshift.down = char_data.down; fshift.left = char_data.left fshift = call_callback("luatexja.set_width", fshift, met, char_data) -- 2.11.0