From 0b0256403b7e111df0ecdb8ca589f20df787dacd Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Tue, 10 Mar 2020 15:42:39 +0100
Subject: 2020-03-10 14:47:00

---
 tex/context/base/mkiv/font-ctx.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua
index bf14dd309..6f8354de8 100644
--- a/tex/context/base/mkiv/font-ctx.lua
+++ b/tex/context/base/mkiv/font-ctx.lua
@@ -83,8 +83,7 @@ local nextchar            = nuts.traversers.char
 
 local getattr             = nuts.getattr
 local setattr             = nuts.setattr
-local getprop             = nuts.getprop
-local setprop             = nuts.setprop
+local getstate            = nuts.getstate
 local setsubtype          = nuts.setsubtype
 
 local texgetdimen         = tex.getdimen
@@ -109,6 +108,7 @@ local parameters          = hashes.parameters
 local designsizefilename  = fontgoodies.designsizes.filename
 
 local ctx_char            = context.char
+local ctx_safechar        = context.safechar
 local ctx_getvalue        = context.getvalue
 
 local otffeatures         = otf.features
@@ -320,6 +320,7 @@ function definers.resetnullfont()
     parameters.x_height      = 0 -- 5
     parameters.quad          = 0 -- 6
     parameters.extra_space   = 0 -- 7
+    parameters.designsize    = 655360
     --
     constructors.enhanceparameters(parameters) -- official copies for us
     --
@@ -2105,7 +2106,7 @@ do -- else too many locals
 
     implement {
         name      = "tochar",
-        actions   = { tochar, context },
+        actions   = { tochar, ctx_safechar },
         arguments = "string",
     }
 
@@ -2651,7 +2652,6 @@ do
 
     local a_color         = attributes.private('color')
     local a_colormodel    = attributes.private('colormodel')
-    local a_state         = attributes.private('state')
     local m_color         = attributes.list[a_color] or { }
 
     local glyph_code      = nodes.nodecodes.glyph
@@ -2680,7 +2680,7 @@ do
             head = tonut(head)
             local model = getattr(head,a_colormodel) or 1
             for glyph in nextchar, head do
-                local a = getprop(glyph,a_state)
+                local a = getstate(glyph)
                 if a then
                     local name = colornames[a]
                     if name then
-- 
cgit v1.2.3