diff options
author | Norbert Preining <norbert@preining.info> | 2021-01-17 03:02:33 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-01-17 03:02:33 +0000 |
commit | 8591b56496b93eed20f638ee1ce46b11c3f7be58 (patch) | |
tree | b2afe58ae1a4b7b138a752410d3d7232485a4f9d /macros/luatex/generic/luaotfload/fontloader-font-cff.lua | |
parent | 07a2495c5aecc2f871625ae63d25ee1cc18b2ca5 (diff) |
CTAN sync 202101170302
Diffstat (limited to 'macros/luatex/generic/luaotfload/fontloader-font-cff.lua')
-rw-r--r-- | macros/luatex/generic/luaotfload/fontloader-font-cff.lua | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/macros/luatex/generic/luaotfload/fontloader-font-cff.lua b/macros/luatex/generic/luaotfload/fontloader-font-cff.lua index b7d45392d6..4e2981011a 100644 --- a/macros/luatex/generic/luaotfload/fontloader-font-cff.lua +++ b/macros/luatex/generic/luaotfload/fontloader-font-cff.lua @@ -1425,13 +1425,15 @@ do -- to wrap my head around the rather complex variable font specification -- with regions and axis, the following approach kind of works but is more -- some trial and error trick. It's still not clear how much of the complex - -- truetype description applies to cff. + -- truetype description applies to cff. Once there are fonts out there we'll + -- get there. (Marcel and friends did some tests with recent cff2 fonts so + -- the code has been adapted accordingly.) local reginit = false local function updateregions(n) -- n + 1 if regions then - local current = regions[n] or regions[1] + local current = regions[n+1] or regions[1] nofregions = #current if axis and n ~= reginit then factors = { } @@ -2155,7 +2157,14 @@ do popped = 3 seacs = { } if regions then - regions = { regions } -- needs checking + -- this was: + -- regions = { regions } -- needs checking + -- and is now (MFC): + regions = { } + local deltas = data.deltas + for i = 1, #deltas do + regions[i] = deltas[i].regions + end axis = data.factors or false end end |