1 files changed, 7 insertions, 7 deletions
diff --git a/tex/context/base/font-ini.mkiv b/tex/context/base/font-ini.mkiv
index 4b813d7f6..2987bd36d 100644
--- a/tex/context/base/font-ini.mkiv
+++ b/tex/context/base/font-ini.mkiv
@@ -59,6 +59,7 @@
 \registerctxluafile{font-clr}{1.001}
 \registerctxluafile{node-fnt}{1.001} % here
 \registerctxluafile{font-enc}{1.001}
+\registerctxluafile{font-agl}{1.001} % uses enc, needed in map
 \registerctxluafile{font-map}{1.001}
 \registerctxluafile{font-syn}{1.001}
 \registerctxluafile{font-log}{1.001}
@@ -72,7 +73,7 @@
 \registerctxluafile{font-oti}{1.001} % otf initialization
 \registerctxluafile{font-otb}{1.001} % otf main base
 \registerctxluafile{font-otn}{1.001} % otf main node
-\registerctxluafile{font-ota}{1.001} % otf analyzers
+\registerctxluafile{font-ota}{1.001} % otf analyzers (needs dynamics)
 \registerctxluafile{font-otp}{1.001} % otf pack
 \registerctxluafile{font-otc}{1.001} % otf context
 \registerctxluafile{font-oth}{1.001} % otf helpers
@@ -85,7 +86,6 @@
 \registerctxluafile{font-ext}{1.001}
 \registerctxluafile{font-pat}{1.001}
 \registerctxluafile{font-chk}{1.001}
-\registerctxluafile{font-agl}{1.001}
 
 \unprotect
 
@@ -699,7 +699,7 @@
 
 \def\lowleveldefinefont#1#2% #2 = cs
   {%
-   \ctxlua{fonts.define.command_1("\luaescapestring{#1}")}% the escapestring catches at \somedimen
+   \ctxlua{fonts.definers.stage_one("\luaescapestring{#1}")}% the escapestring catches at \somedimen
    % sets \scaledfontmode and \somefontname and \somefontsize
    \ifcase\scaledfontmode\relax
      % none, avoid the designsize if possible
@@ -730,7 +730,7 @@
    \fi
    \updatefontparameters
    \updatefontclassparameters
-   \ctxlua{fonts.define.command_2(
+   \ctxlua{fonts.definers.stage_two(
       \ifx\fontclass\empty false\else true\fi,
       "#2", % cs, trailing % is gone
       "\somefontfile",
@@ -2713,7 +2713,7 @@
 
 \def\dodefinefontfeature[#1][#2][#3]%
   {\global\expandafter\chardef\csname\??fq=#1\endcsname % beware () needed as we get two values returned
-     \ctxlua{tex.write((fonts.define.specify.preset_context("#1","#2","#3")))}\relax}
+     \ctxlua{tex.write((fonts.definers.specifiers.presetcontext("#1","#2","#3")))}\relax}
 
 \definefontfeature
   [default]
@@ -2798,7 +2798,7 @@
   {\dodoubleargument\dofontfeatureslist}
 
 \def\dofontfeatureslist[#1][#2]% todo: arg voor type
-  {\ctxlua{tex.sprint(tex.ctxcatcodes,fonts.define.specify.context_tostring("#1","otf","\luaescapestring{#2}","yes","no",true,{"number"}))}}
+  {\ctxlua{tex.sprint(tex.ctxcatcodes,fonts.definers.specifiers.contexttostring("#1","otf","\luaescapestring{#2}","yes","no",true,{"number"}))}}
 
 \attribute\zerocount\zerocount % first in list, so fast match
 
@@ -2819,7 +2819,7 @@
 %
 % \typebuffer \getbuffer
 
-\def\featureattribute#1{\ctxlua{tex.sprint(fonts.define.specify.context_number("#1"))}}
+\def\featureattribute#1{\ctxlua{tex.sprint(fonts.definers.specifiers.contextnumber("#1"))}}
 \def\setfontfeature  #1{\edef\currentfeature{#1}\attribute\zerocount\featureattribute{#1}\relax}
 \def\resetfontfeature#1{\let\currentfeature\empty\attribute\zerocount\zerocount} % initial value