2016-04-18 22:17:00

9 files changed, 7 insertions, 7 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 08b6cca9d..46eeebc0a 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index f597de6a8..62c2e3cd2 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.04.18 18:53}
+\newcontextversion{2016.04.18 22:12}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 14833fc2b..2d0bb2aeb 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.04.18 18:53}
+\edef\contextversion{2016.04.18 22:12}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/font-otr.lua b/tex/context/base/mkiv/font-otr.lua
index 7226907ca..3542d180e 100644
--- a/tex/context/base/mkiv/font-otr.lua
+++ b/tex/context/base/mkiv/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
@@ -2167,7 +2167,7 @@ function readers.getinfo(filename,specification) -- string, nil|number|table
                 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 {
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 4096b8195..3068ebbb9 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 72e1e9a57..5fae860b8 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 3141b961f..42fb600bf 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 45f72869c..5927d6f3a 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 1595733e1..e784738f4 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/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 {