2015-07-07 21:45:00

1 files changed, 6 insertions, 5 deletions

diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6597ca93c..c0ad6bda9 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 : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 07/01/15 21:40:12
+-- merge date  : 07/07/15 21:43:15
 
 do -- begin closure to overcome local limits and interference
 
@@ -7428,6 +7428,7 @@ function otf.load(filename,sub,featurefile)
     end
    end
    if reload then
+    starttiming("fontloader")
     report_otf("loading %a, hash %a",filename,hash)
     local fontdata,messages
     if sub then
@@ -7489,7 +7490,6 @@ function otf.load(filename,sub,featurefile)
           tounicodetable=Ct(splitter),
         },
       }
-      starttiming(data)
       report_otf("file size: %s",size)
       enhancers.apply(data,filename,fontdata)
       local packtime={}
@@ -7506,10 +7506,10 @@ function otf.load(filename,sub,featurefile)
       if cleanup>1 then
         collectgarbage("collect")
       end
-      stoptiming(data)
+      stoptiming("fontloader")
       if elapsedtime then 
-        report_otf("preprocessing and caching time %s, packtime %s",
-          elapsedtime(data),packdata and elapsedtime(packtime) or 0)
+        report_otf("loading, optimizing, packing and caching time %s, pack time %s",
+          elapsedtime("fontloader"),packdata and elapsedtime(packtime) or 0)
       end
       close_font(fontdata) 
       if cleanup>3 then
@@ -7520,6 +7520,7 @@ function otf.load(filename,sub,featurefile)
         collectgarbage("collect")
       end
     else
+      stoptiming("fontloader")
       data=nil
       report_otf("loading failed due to read error")
     end