From fde411dd869e9b19c98ef73c38fea591a468262f Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Fri, 18 Dec 2009 11:12:00 +0100
Subject: beta 2009.12.18 11:12

---
 tex/generic/context/luatex-fonts-merged.lua | 33 +++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'tex/generic')

diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index b21e5a2d9..959033e31 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua
--- merge date  : 12/14/09 22:36:17
+-- merge date  : 12/18/09 11:16:33
 
 do -- begin closure to overcome local limits and interference
 
@@ -5349,7 +5349,7 @@ otf.features.default = otf.features.default or { }
 otf.enhancers        = otf.enhancers        or { }
 otf.glists           = { "gsub", "gpos" }
 
-otf.version          = 2.636 -- beware: also sync font-mis.lua
+otf.version          = 2.640 -- beware: also sync font-mis.lua
 otf.pack             = true  -- beware: also sync font-mis.lua
 otf.syncspace        = true
 otf.notdef           = false
@@ -5480,6 +5480,7 @@ local enhancers = {
     "share widths",
     "strip not needed data",
     "migrate metadata",
+    "check math parameters",
 }
 
 function otf.load(filename,format,sub,featurefile)
@@ -5504,8 +5505,12 @@ function otf.load(filename,format,sub,featurefile)
             ff, messages = fontloader.open(filename)
         end
         if trace_loading and messages and #messages > 0 then
-            for m=1,#messages do
-                logs.report("load otf","warning: %s",messages[m])
+            if type(messages) == "string" then
+                logs.report("load otf","warning: %s",messages)
+            else
+                for m=1,#messages do
+                    logs.report("load otf","warning: %s",tostring(messages[m]))
+                end
             end
         end
         if ff then
@@ -6432,6 +6437,26 @@ otf.enhancers["migrate metadata"] = function(data,filename)
     metadata.charwidth    = pfminfo and pfminfo.avgwidth
 end
 
+local private_math_parameters = {
+    "FractionDelimiterSize",
+    "FractionDelimiterDisplayStyleSize",
+}
+
+otf.enhancers["check math parameters"] = function(data,filename)
+    local mathdata = data.metadata.math
+    if mathdata then
+        for m=1,#private_math_parameters do
+            local pmp = private_math_parameters[m]
+            if not mathdata[pmp] then
+                if trace_loading then
+                    logs.report("load otf", "setting math parameter '%s' to 0", pmp)
+                end
+                mathdata[pmp] = 0
+            end
+        end
+    end
+end
+
 otf.enhancers["flatten glyph lookups"] = function(data,filename)
     for k, v in next, data.glyphs do
         if v.lookups then
-- 
cgit v1.2.3