diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-17 22:15:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-17 22:15:40 +0000 |
commit | 64f6ef59da37e7dfcaedbc874997dd5cc56ed813 (patch) | |
tree | 66c080e48dfa112456f9fda55ddd804c79afe9ac /Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua | |
parent | 366e3a9df92823f8bdb06251114a235967b8b1bf (diff) |
luaotfload (17jun16)
git-svn-id: svn://tug.org/texlive/trunk@41471 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua index e482aba353d..3c43eb926b9 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua @@ -212,15 +212,19 @@ end local query_ascender = function (fontdata) local parameters = fontdata.parameters if not parameters then return false end + local ascender = parameters.ascender + if ascender then + return ascender --- pre-scaled + end + local shared = fontdata.shared if not shared then return false end local rawdata = shared.rawdata if not rawdata then return false end local metadata = rawdata.metadata if not metadata then return false end - local ascender = parameters.ascender - or metadata.ascender if not ascender then return false end + ascender = metadata.ascender if not ascender then return false end local size = parameters.size if not size then return false end local units = lookup_units (fontdata) if not units or units == 0 then return false end - return ascender * size / units + return ascender * size / units --- scaled end local query_capheight = function (fontdata) |