summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2016-04-21 12:41:27 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2016-04-21 12:41:27 +0200
commit726df97b4fd308f923fb1b4bf00ce533a7c88ebe (patch)
tree4dcfca0d800cb2b27ef98f89382481e8bd5647a2 /tex/generic
parent595681ed25471f1206e4942adbf0abd664fa7e11 (diff)
downloadcontext-726df97b4fd308f923fb1b4bf00ce533a7c88ebe.tar.gz
2016-04-21 12:17:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua16
1 files changed, 10 insertions, 6 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index d029bf4f8..7c06c2552 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 04/21/16 10:10:19
+-- merge date : 04/21/16 12:13:25
do -- begin closure to overcome local limits and interference
@@ -5653,9 +5653,13 @@ function constructors.scale(tfmdata,specification)
elseif autoitalicamount then
local vi=description.italic
if not vi then
- local vi=description.boundingbox[3]-description.width+autoitalicamount
- if vi>0 then
- chr.italic=vi*hdelta
+ local bb=description.boundingbox
+ if bb then
+ local vi=bb[3]-description.width+autoitalicamount
+ if vi>0 then
+ chr.italic=vi*hdelta
+ end
+ else
end
elseif vi~=0 then
chr.italic=vi*hdelta
@@ -8809,7 +8813,7 @@ readers.hmtx=function(f,fontdata,specification)
glyph.width=width
end
end
- for i=nofmetrics,nofglyphs do
+ for i=nofmetrics,nofglyphs-1 do
local glyph=glyphs[i]
if width~=0 then
glyph.width=width
@@ -15587,7 +15591,7 @@ local trace_defining=false registertracker("fonts.defining",function(v) trace_de
local report_otf=logs.reporter("fonts","otf loading")
local fonts=fonts
local otf=fonts.handlers.otf
-otf.version=3.017
+otf.version=3.018
otf.cache=containers.define("fonts","otl",otf.version,true)
local otfreaders=otf.readers
local hashes=fonts.hashes