diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2016-04-19 07:14:59 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2016-04-19 07:14:59 +0200 |
| commit | e5490055dfd11a6c6f25a2225cdeee6be4d27a61 (patch) | |
| tree | 79c74491c55c87f372a17bb8a3a6f1fedae532ae | |
| parent | 8631d1c4944f2cde0ba2dea1e1f0ac92e2538382 (diff) | |
| download | luaotfload-e5490055dfd11a6c6f25a2225cdeee6be4d27a61.tar.gz | |
[fontloader] sync with Context as of 2016-04-19
| -rw-r--r-- | src/fontloader/misc/fontloader-font-otr.lua | 2 | ||||
| -rw-r--r-- | src/fontloader/runtime/fontloader-reference.lua | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/fontloader/misc/fontloader-font-otr.lua b/src/fontloader/misc/fontloader-font-otr.lua index e6e7fa2..3542d18 100644 --- a/src/fontloader/misc/fontloader-font-otr.lua +++ b/src/fontloader/misc/fontloader-font-otr.lua @@ -2020,7 +2020,7 @@ local function loadfontdata(specification) ttcversion = ttcversion, nofsubfonts = nofsubfonts, } - for i=1,fontdata.nofsubfonts do + for i=1,nofsubfonts do subfonts[i] = readdata(f,offsets[i],specification) end end diff --git a/src/fontloader/runtime/fontloader-reference.lua b/src/fontloader/runtime/fontloader-reference.lua index 1595733..e784738 100644 --- a/src/fontloader/runtime/fontloader-reference.lua +++ b/src/fontloader/runtime/fontloader-reference.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/18/16 18:53:40 +-- merge date : 04/18/16 22:12:36 do -- begin closure to overcome local limits and interference @@ -9536,7 +9536,7 @@ local function loadfontdata(specification) ttcversion=ttcversion, nofsubfonts=nofsubfonts, } - for i=1,fontdata.nofsubfonts do + for i=1,nofsubfonts do subfonts[i]=readdata(f,offsets[i],specification) end end @@ -9667,7 +9667,7 @@ function readers.getinfo(filename,specification) info[i]=getinfo(fontdata,i,platformnames,rawfamilynames) end return info - elseif subfont>1 and subfont<=#subfonts then + elseif subfont>=1 and subfont<=#subfonts then return getinfo(fontdata,subfont,platformnames,rawfamilynames) else return { |