From 7b271baae19db1528fbe6621bdf50af89a5a336b Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Fri, 22 Feb 2019 20:29:46 +0100
Subject: 2019-02-22 19:43:00

---
 tex/context/base/mkiv/font-hsh.lua | 101 +++++++++++++++++++++----------------
 1 file changed, 58 insertions(+), 43 deletions(-)

(limited to 'tex/context/base/mkiv/font-hsh.lua')

diff --git a/tex/context/base/mkiv/font-hsh.lua b/tex/context/base/mkiv/font-hsh.lua
index 60a27c043..8d1e85145 100644
--- a/tex/context/base/mkiv/font-hsh.lua
+++ b/tex/context/base/mkiv/font-hsh.lua
@@ -18,48 +18,50 @@ fonts.hashes        = hashes
 
 -- todo: autoallocate ... just create on the fly .. use constructors.keys (problem: plurals)
 
-local identifiers   = hashes.identifiers  or allocate()
-local characters    = hashes.characters   or allocate() -- chardata
-local descriptions  = hashes.descriptions or allocate()
-local parameters    = hashes.parameters   or allocate()
-local properties    = hashes.properties   or allocate()
-local resources     = hashes.resources    or allocate()
-local spacings      = hashes.spacings     or allocate()
-local spaces        = hashes.spaces       or allocate()
-local quads         = hashes.quads        or allocate() -- maybe also spacedata
-local xheights      = hashes.xheights     or allocate()
-local csnames       = hashes.csnames      or allocate() -- namedata
-local features      = hashes.features     or allocate()
-local marks         = hashes.marks        or allocate()
-local classes       = hashes.classes      or allocate()
-local italics       = hashes.italics      or allocate()
-local lastmathids   = hashes.lastmathids  or allocate()
-local dynamics      = hashes.dynamics     or allocate()
-local unicodes      = hashes.unicodes     or allocate()
-local originals     = hashes.originals    or allocate()
-local modes         = hashes.modes        or allocate()
-local variants      = hashes.variants     or allocate()
-
-hashes.characters   = characters
-hashes.descriptions = descriptions
-hashes.parameters   = parameters
-hashes.properties   = properties
-hashes.resources    = resources
-hashes.spacings     = spacings
-hashes.spaces       = spaces
-hashes.quads        = quads                 hashes.emwidths  = quads
-hashes.xheights     = xheights              hashes.exheights = xheights
-hashes.csnames      = csnames
-hashes.features     = features
-hashes.marks        = marks
-hashes.classes      = classes
-hashes.italics      = italics
-hashes.lastmathids  = lastmathids
-hashes.dynamics     = dynamics
-hashes.unicodes     = unicodes
-hashes.originals    = originals
-hashes.modes        = modes
-hashes.variants     = variants
+local identifiers    = hashes.identifiers    or allocate()
+local characters     = hashes.characters     or allocate() -- chardata
+local descriptions   = hashes.descriptions   or allocate()
+local parameters     = hashes.parameters     or allocate()
+local mathparameters = hashes.mathparameters or allocate()
+local properties     = hashes.properties     or allocate()
+local resources      = hashes.resources      or allocate()
+local spacings       = hashes.spacings       or allocate()
+local spaces         = hashes.spaces         or allocate()
+local quads          = hashes.quads          or allocate() -- maybe also spacedata
+local xheights       = hashes.xheights       or allocate()
+local csnames        = hashes.csnames        or allocate() -- namedata
+local features       = hashes.features       or allocate()
+local marks          = hashes.marks          or allocate()
+local classes        = hashes.classes        or allocate()
+local italics        = hashes.italics        or allocate()
+local lastmathids    = hashes.lastmathids    or allocate()
+local dynamics       = hashes.dynamics       or allocate()
+local unicodes       = hashes.unicodes       or allocate()
+local originals      = hashes.originals      or allocate()
+local modes          = hashes.modes          or allocate()
+local variants       = hashes.variants       or allocate()
+
+hashes.characters     = characters
+hashes.descriptions   = descriptions
+hashes.parameters     = parameters
+hashes.mathparameters = mathparameters
+hashes.properties     = properties
+hashes.resources      = resources
+hashes.spacings       = spacings
+hashes.spaces         = spaces
+hashes.quads          = quads                 hashes.emwidths  = quads
+hashes.xheights       = xheights              hashes.exheights = xheights
+hashes.csnames        = csnames
+hashes.features       = features
+hashes.marks          = marks
+hashes.classes        = classes
+hashes.italics        = italics
+hashes.lastmathids    = lastmathids
+hashes.dynamics       = dynamics
+hashes.unicodes       = unicodes
+hashes.originals      = originals
+hashes.modes          = modes
+hashes.variants       = variants
 
 local nodepool      = nodes and nodes.pool
 local dummyglyph    = nodepool and nodepool.register(nodepool.glyph())
@@ -68,7 +70,9 @@ local nulldata = allocate {
     name         = "nullfont",
     characters   = { },
     descriptions = { },
-    properties   = { },
+    properties   = {
+        designsize = 786432,
+    },
     parameters   = { -- lmromanregular @ 12pt
         slantperpoint =      0,
         spacing       = {
@@ -87,6 +91,7 @@ local nulldata = allocate {
         x_height      = 338952, -- 5
         quad          = 786432, -- 6
         extra_space   =  85459, -- 7
+        size          = 786432,
     },
 }
 
@@ -148,6 +153,16 @@ setmetatableindex(parameters, function(t,k)
     end
 end)
 
+setmetatableindex(mathparameters, function(t,k)
+    if k == true then
+        return mathparameters[currentfont()]
+    else
+        local mathparameters = identifiers[k].mathparameters
+        t[k] = mathparameters
+        return mathparameters
+    end
+end)
+
 setmetatableindex(properties, function(t,k)
     if k == true then
         return properties[currentfont()]
-- 
cgit v1.2.3