2017-05-27 18:57:00

2 files changed, 10 insertions, 25 deletions

diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index a94ba85af..0c8e40ce4 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  : 05/25/17 12:50:49
+-- merge date  : 05/27/17 18:52:27
 
 do -- begin closure to overcome local limits and interference
 
@@ -7758,7 +7758,7 @@ function constructors.scale(tfmdata,specification)
   target.unscaled=tfmdata
   local mathsize=tonumber(specification.mathsize) or 0
   local textsize=tonumber(specification.textsize) or scaledpoints
-  local forcedsize=tonumber(parameters.mathsize  ) or 0
+  local forcedsize=tonumber(parameters.mathsize  ) or 0 
   local extrafactor=tonumber(specification.factor ) or 1
   if (mathsize==2 or forcedsize==2) and parameters.scriptpercentage then
     scaledpoints=parameters.scriptpercentage*textsize/100
@@ -7766,6 +7766,7 @@ function constructors.scale(tfmdata,specification)
     scaledpoints=parameters.scriptscriptpercentage*textsize/100
   elseif forcedsize>1000 then 
     scaledpoints=forcedsize
+  else
   end
   targetparameters.mathsize=mathsize  
   targetparameters.textsize=textsize  
@@ -8827,7 +8828,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-cid']={
   version=1.001,
-  comment="companion to font-otf.lua (cidmaps)",
+  comment="companion to font-ini.mkiv",
   author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files"
@@ -19850,7 +19851,7 @@ local function checkmathsize(tfmdata,mathsize)
     local parameters=tfmdata.parameters
     parameters.scriptpercentage=mathdata.ScriptPercentScaleDown
     parameters.scriptscriptpercentage=mathdata.ScriptScriptPercentScaleDown
-    parameters.mathsize=mathsize
+    parameters.mathsize=mathsize 
   end
 end
 registerotffeature {
@@ -21771,7 +21772,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-ota']={
   version=1.001,
-  comment="companion to font-otf.lua (analysing)",
+  comment="companion to font-ini.mkiv",
   author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files"
@@ -27534,7 +27535,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-ocl']={
   version=1.001,
-  comment="companion to font-otf.lua (context)",
+  comment="companion to font-ini.mkiv",
   author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files"
@@ -27982,7 +27983,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-otc']={
   version=1.001,
-  comment="companion to font-otf.lua (context)",
+  comment="companion to font-ini.mkiv",
   author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files"
@@ -29922,7 +29923,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-afk']={
   version=1.001,
-  comment="companion to font-afm.lua",
+  comment="companion to font-lib.mkiv",
   author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files",
diff --git a/tex/generic/context/luatex/luatex-fonts.lua b/tex/generic/context/luatex/luatex-fonts.lua
index 20690992c..93ead749e 100644
--- a/tex/generic/context/luatex/luatex-fonts.lua
+++ b/tex/generic/context/luatex/luatex-fonts.lua
@@ -231,21 +231,6 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
         loadmodule('luatex-fonts-syn.lua')
 
         loadmodule('font-oti.lua')
-
-        -- These are the old loader and processing modules. These use the built-in font loader and
-        -- will stay around (but not be extended), only fixed.
-
-        -- font-otf.lua
-        -- font-otb.lua
-        -- font-inj.lua
-        -- font-ota.lua
-        -- font-otn.lua
-        -- font-otp.lua
-
-        -- Here come the new loader and processing modules. The loader is written in Lua and although
-        -- initial loading is somewhat slower, identifying is faster, cached files can be slightly
-        -- more efficient, and processing is somewhat faster (only measureable on complex fonts).
-
         loadmodule('font-otr.lua')
         loadmodule('font-cff.lua')
         loadmodule('font-ttf.lua')
@@ -258,7 +243,6 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
         loadmodule('font-ots.lua')
         loadmodule('font-osd.lua')
         loadmodule('font-ocl.lua') -- svg needs 0.97 (for fix in memstreams)
-
         loadmodule('font-otc.lua')
 
         -- type one code
@@ -277,7 +261,7 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
         loadmodule('font-def.lua')
         loadmodule('font-xtx.lua')         -- xetex compatible specifiers (plain/latex only)
         loadmodule('luatex-fonts-ext.lua') -- some extensions
-     -- loadmodule('luatex-fonts-lig.lua') -- and another one
+        loadmodule('luatex-fonts-lig.lua') -- and another one
 
         -- We need to plug into a callback and the following module implements the handlers. Actual
         -- plugging in happens later.