2017-05-25 12:56:00

1 files changed, 212 insertions, 211 deletions

diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml
index c246905f0..c774ef273 100644
--- a/tex/context/interface/mkiv/i-fonts.xml
+++ b/tex/context/interface/mkiv/i-fonts.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definefontfallback" file="font-col.mkvi">
+    <cd:command name="definefontfallback" category="fonts" level="style" file="font-col.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords>
@@ -31,32 +31,35 @@
                     <cd:constant type="cd:number"/>
                     <cd:constant type="cd:name"/>
                 </cd:parameter>
+                <cd:parameter name="features">
+                    <cd:constant type="cd:name"/>
+                </cd:parameter>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetfontfallback" file="font-col.mkvi">
+    <cd:command name="resetfontfallback" category="fonts" file="font-col.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-font-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="emphasistypeface" file="font-emp.mkvi"/>
+    <cd:command name="emphasistypeface" category="fonts" file="font-emp.mkvi"/>
 
-    <cd:command name="emphasisboldface" file="font-emp.mkvi"/>
+    <cd:command name="emphasisboldface" category="fonts" file="font-emp.mkvi"/>
 
-    <cd:command name="normalboldface" file="font-emp.mkvi"/>
+    <cd:command name="normalboldface" category="fonts" file="font-emp.mkvi"/>
 
-    <cd:command name="normaltypeface" file="font-emp.mkvi"/>
+    <cd:command name="normaltypeface" category="fonts" file="font-emp.mkvi"/>
 
-    <cd:command name="swaptypeface" file="font-emp.mkvi"/>
+    <cd:command name="swaptypeface" category="fonts" file="font-emp.mkvi"/>
 
-    <cd:command name="typeface" file="font-emp.mkvi"/>
+    <cd:command name="typeface" category="fonts" file="font-emp.mkvi"/>
 
-    <cd:command name="boldface" file="font-emp.mkvi"/>
+    <cd:command name="boldface" category="fonts" file="font-emp.mkvi"/>
 
-    <cd:command name="swapface" file="font-emp.mkvi"/>
+    <cd:command name="swapface" category="fonts" file="font-emp.mkvi"/>
 
     <!--
 
@@ -98,7 +101,7 @@
 
     -->
 
-    <cd:command name="definefontfeature" file="font-fea.mkvi">
+    <cd:command name="definefontfeature" category="fonts" level="style" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -270,11 +273,15 @@
                 <cd:parameter name="mathnolimitsmode">
                     <cd:constant type="cd:number"/>
                 </cd:parameter>
+                <cd:parameter name="blockligatures">
+                    <cd:constant type="yes"/>
+                    <cd:constant type="no" default="yes"/>
+                </cd:parameter>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="adaptfontfeature" file="font-fea.mkvi">
+    <cd:command name="adaptfontfeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/> <!-- pattern -->
             <cd:assignments list="yes">
@@ -283,72 +290,72 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fontfeaturelist" file="font-fea.mkvi">
+    <cd:command name="fontfeaturelist" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="addfeature" file="font-fea.mkvi">
+    <cd:command name="addfeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="addfeature" variant="direct" file="font-fea.mkvi">
+    <cd:command name="addfeature" variant="direct" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="subtractfeature" file="font-fea.mkvi">
+    <cd:command name="subtractfeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="subtractfeature" variant="direct" file="font-fea.mkvi">
+    <cd:command name="subtractfeature" variant="direct" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="replacefeature" file="font-fea.mkvi">
+    <cd:command name="replacefeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="replacefeature" variant="direct" file="font-fea.mkvi">
+    <cd:command name="replacefeature" variant="direct" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetandaddfeature" file="font-fea.mkvi">
+    <cd:command name="resetandaddfeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetandaddfeature" variant="direct" file="font-fea.mkvi">
+    <cd:command name="resetandaddfeature" variant="direct" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetfeature" file="font-fea.mkvi"/>
+    <cd:command name="resetfeature" category="fonts" file="font-fea.mkvi"/>
 
-    <cd:command name="revivefeature" file="font-fea.mkvi"/>
+    <cd:command name="revivefeature" category="fonts" file="font-fea.mkvi"/>
 
-    <cd:command name="setfontfeature" file="font-fea.mkvi">
+    <cd:command name="setfontfeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="feature" file="font-fea.mkvi">
+    <cd:command name="feature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="+"/>
@@ -369,7 +376,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="feature" variant="direct" file="font-fea.mkvi">
+    <cd:command name="feature" variant="direct" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="+"/>
@@ -390,7 +397,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecurrentfonthasfeature" file="font-fea.mkvi">
+    <cd:command name="doifelsecurrentfonthasfeature" category="fonts" level="system" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -398,7 +405,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcurrentfonthasfeatureelse" file="font-fea.mkvi">
+    <cd:command name="doifcurrentfonthasfeatureelse" category="fonts" level="system" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -406,31 +413,31 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doaddfeature" file="font-fea.mkvi">
+    <cd:command name="doaddfeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosubtractfeature" file="font-fea.mkvi">
+    <cd:command name="dosubtractfeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doreplacefeature" file="font-fea.mkvi">
+    <cd:command name="doreplacefeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doresetandafffeature" file="font-fea.mkvi">
+    <cd:command name="doresetandafffeature" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fontclass" type="environment" file="font-fil.mkvi">
+    <cd:command name="fontclass" type="environment" category="fonts" file="font-fil.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="each"/>
@@ -439,14 +446,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="classfont" file="font-fil.mkvi">
+    <cd:command name="classfont" category="fonts" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefontsynonym" file="font-fil.mkvi">
+    <cd:command name="definefontsynonym" category="fonts" level="style" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-font"/>
@@ -468,7 +475,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefontfile" file="font-fil.mkvi">
+    <cd:command name="definefontfile" category="fonts" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-file"/>
@@ -490,20 +497,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="truefontname" file="font-fil.mkvi">
+    <cd:command name="truefontname" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expandfontsynonym" file="font-fil.mkvi">
+    <cd:command name="expandfontsynonym" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefontsynonym" file="font-fil.mkvi">
+    <cd:command name="doifelsefontsynonym" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -511,7 +518,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffontsynonymelse" file="font-fil.mkvi">
+    <cd:command name="doiffontsynonymelse" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -519,87 +526,87 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tracedfontname" file="font-fil.mkvi">
+    <cd:command name="tracedfontname" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fontclassname" file="font-fil.mkvi">
+    <cd:command name="fontclassname" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="loadfontgoodies" file="font-gds.mkvi">
+    <cd:command name="loadfontgoodies" category="fonts" file="font-gds.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setfontcolorsheme" file="font-gds.mkvi">
+    <cd:command name="setfontcolorsheme" category="fonts" file="font-gds.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetfontcolorsheme" file="font-gds.mkvi"/>
+    <cd:command name="resetfontcolorsheme" category="fonts" file="font-gds.mkvi"/>
 
-    <cd:command name="definedfont" file="font-ini.mkvi">
+    <cd:command name="definedfont" category="fonts" level="document" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-font-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="font" type="environment" file="font-ini.mkvi">
+    <cd:command name="font" type="environment" category="fonts" level="document" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-font-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bodyfontsize" file="font-ini.mkvi"/>
+    <cd:command name="bodyfontsize" category="fonts" file="font-ini.mkvi"/>
 
-    <cd:command name="normalizebodyfontsize" file="font-ini.mkvi">
+    <cd:command name="normalizebodyfontsize" category="fonts" level="system" file="font-ini.mkvi">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thenormalizedbodyfontsize" file="font-ini.mkvi">
+    <cd:command name="thenormalizedbodyfontsize" category="fonts" level="system" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mapfontsize" file="font-fil.mkvi">
+    <cd:command name="mapfontsize" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-dimension"/>
             <cd:resolve name="keyword-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefontstyle" file="font-ini.mkvi">
+    <cd:command name="definefontstyle" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefontsize" file="font-ini.mkvi">
+    <cd:command name="definefontsize" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefontalternative" file="font-ini.mkvi">
+    <cd:command name="definefontalternative" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefont" file="font-ini.mkvi">
+    <cd:command name="definefont" category="fonts" level="style" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-font"/>
@@ -609,7 +616,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefont" variant="argument" file="font-ini.mkvi">
+    <cd:command name="definefont" variant="argument" category="fonts" level="style" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-font"/>
@@ -617,14 +624,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefrozenfont" file="font-ini.mkvi">
+    <cd:command name="definefrozenfont" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definebodyfontenvironment" file="font-ini.mkvi">
+    <cd:command name="definebodyfontenvironment" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:keywords>
@@ -708,31 +715,31 @@
 
     -->
 
-    <cd:command name="processbodyfontenvironmentlist" file="font-fil.mkvi">
+    <cd:command name="processbodyfontenvironmentlist" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bodyfontenvironmentlist" file="font-fil.mkvi"/>
+    <cd:command name="bodyfontenvironmentlist" category="fonts" level="system" file="font-fil.mkvi"/>
 
-    <cd:command name="registerfontclass" file="font-fil.mkvi">
+    <cd:command name="registerfontclass" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setcurrentfontclass" file="font-fil.mkvi">
+    <cd:command name="setcurrentfontclass" category="fonts" level="system" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tx" file="font-ini.mkvi"/>
+    <cd:command name="tx" category="fonts" level="document" file="font-ini.mkvi"/>
 
-    <cd:command name="txx" file="font-ini.mkvi"/>
+    <cd:command name="txx" category="fonts" level="document" file="font-ini.mkvi"/>
 
-    <cd:command name="definebodyfont" file="font-fil.mkvi">
+    <cd:command name="definebodyfont" category="fonts" level="style" file="font-fil.mkvi">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="cd:name"/>
@@ -793,7 +800,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definebodyfont" variant="argument" file="font-fil.mkvi">
+    <cd:command name="definebodyfont" variant="argument" category="fonts" level="style" file="font-fil.mkvi">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="cd:name"/>
@@ -814,7 +821,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfonts" file="font-ini.mkiv">
+    <cd:command name="setupfonts" category="fonts" level="style" file="font-ini.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="language">
@@ -825,7 +832,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupbodyfont" file="font-ini.mkiv">
+    <cd:command name="setupbodyfont" category="fonts" level="style" file="font-ini.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="cd:dimension"/>
@@ -858,7 +865,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="switchtobodyfont" file="font-ini.mkvi">
+    <cd:command name="switchtobodyfont" category="fonts" level="style" file="font-ini.mkvi">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:inherit name="setupbodyfont"/>
@@ -866,7 +873,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastswitchtobodyfont" file="font-ini.mkiv">
+    <cd:command name="fastswitchtobodyfont" category="fonts" file="font-ini.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="x"/>
@@ -879,7 +886,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usebodyfont" file="font-ini.mkvi">
+    <cd:command name="usebodyfont" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:inherit name="setupbodyfont"/>
@@ -887,31 +894,31 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usebodyfontparameter" file="font-ini.mkvi">
+    <cd:command name="usebodyfontparameter" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fontchar" file="font-ini.mkvi">
+    <cd:command name="fontchar" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fontcharbyindex" file="font-ini.mkvi">
+    <cd:command name="fontcharbyindex" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tochar" file="font-ini.mkvi">
+    <cd:command name="tochar" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
-            <cd:resolve name="argument-name"/>
+            <cd:resolve name="argument-tochar"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="switchstyleonly" file="font-ini.mkiv">
+    <cd:command name="switchstyleonly" category="fonts" file="font-ini.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="rm"/>
@@ -934,13 +941,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="switchstyleonly" variant="command" file="font-ini.mkiv">
+    <cd:command name="switchstyleonly" variant="command" category="fonts" file="font-ini.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definebodyfontswitch" file="font-ini.mkvi">
+    <cd:command name="definebodyfontswitch" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes">
@@ -949,28 +956,28 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setsmallbodyfont" file="font-ini.mkvi"/>
+    <cd:command name="setsmallbodyfont" category="fonts" file="font-ini.mkvi"/>
 
-    <cd:command name="setbigbodyfont" file="font-ini.mkvi"/>
+    <cd:command name="setbigbodyfont" category="fonts" file="font-ini.mkvi"/>
 
-    <cd:command name="setmainbodyfont" file="font-ini.mkvi"/>
+    <cd:command name="setmainbodyfont" category="fonts" file="font-ini.mkvi"/>
 
-    <cd:command name="restoreglobalbodyfont" file="font-ini.mkvi"/>
+    <cd:command name="restoreglobalbodyfont" category="fonts" file="font-ini.mkvi"/>
 
-    <cd:command name="predefinefont" file="font-ini.mkvi">
+    <cd:command name="predefinefont" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="predefinedfont" file="font-ini.mkvi">
+    <cd:command name="predefinedfont" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showbodyfont" file="font-run.mkiv">
+    <cd:command name="showbodyfont" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:inherit name="setupbodyfont"/>
@@ -978,7 +985,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showbodyfontenvironment" file="font-run.mkiv">
+    <cd:command name="showbodyfontenvironment" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:inherit name="setupbodyfont"/>
@@ -986,14 +993,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showfont" file="font-run.mkiv">
+    <cd:command name="showfont" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-font"/>
             <cd:resolve name="keyword-number-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showfontstyle" file="font-run.mkiv">
+    <cd:command name="showfontstyle" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:inherit name="setupbodyfont"/>
@@ -1021,19 +1028,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showligature" file="font-run.mkiv">
+    <cd:command name="showligature" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showligatures" file="font-run.mkiv">
+    <cd:command name="showligatures" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showfontstrip" file="font-run.mkiv">
+    <cd:command name="showfontstrip" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:inherit name="setupbodyfont"/>
@@ -1041,111 +1048,109 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showminimalbaseline" file="font-run.mkiv"/>
+    <cd:command name="showminimalbaseline" category="fonts" file="font-run.mkiv"/>
 
-    <cd:command name="showkerning" file="font-run.mkiv">
+    <cd:command name="showkerning" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showcharratio" file="font-run.mkiv">
+    <cd:command name="showcharratio" category="fonts" file="font-run.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showfontparameters" file="font-run.mkiv"/>
+    <cd:command name="showfontparameters" category="fonts" file="font-run.mkiv"/>
 
-    <cd:command name="setsmallcaps" file="font-pre.mkiv"/>
+    <cd:command name="setsmallcaps" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="setoldstyle" file="font-pre.mkiv"/>
+    <cd:command name="setoldstyle" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="settabular" file="font-pre.mkiv"/>
+    <cd:command name="settabular" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="setfractions" file="font-pre.mkiv"/>
+    <cd:command name="setsuperiors" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="setsuperiors" file="font-pre.mkiv"/>
+    <cd:command name="tinyfont" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="tinyfont" file="font-pre.mkiv"/>
+    <cd:command name="infofont" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="infofont" file="font-pre.mkiv"/>
+    <cd:command name="infofontbold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="infofontbold" file="font-pre.mkiv"/>
+    <cd:command name="smallbodyfont" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smallbodyfont" file="font-pre.mkiv"/>
+    <cd:command name="bigbodyfont" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="bigbodyfont" file="font-pre.mkiv"/>
+    <cd:command name="smaller" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smaller" file="font-pre.mkiv"/>
+    <cd:command name="bigger" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="bigger" file="font-pre.mkiv"/>
+    <cd:command name="normal" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="normal" file="font-pre.mkiv"/>
+    <cd:command name="bold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="bold" file="font-pre.mkiv"/>
+    <cd:command name="mono" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="mono" file="font-pre.mkiv"/>
+    <cd:command name="monobold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="monobold" file="font-pre.mkiv"/>
+    <cd:command name="slanted" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="slanted" file="font-pre.mkiv"/>
+    <cd:command name="italic" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="italic" file="font-pre.mkiv"/>
+    <cd:command name="boldslanted" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="boldslanted" file="font-pre.mkiv"/>
+    <cd:command name="slantedbold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="slantedbold" file="font-pre.mkiv"/>
+    <cd:command name="bolditalic" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="bolditalic" file="font-pre.mkiv"/>
+    <cd:command name="italicbold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="italicbold" file="font-pre.mkiv"/>
+    <cd:command name="small" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="small" file="font-pre.mkiv"/>
+    <cd:command name="smallnormal" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smallnormal" file="font-pre.mkiv"/>
+    <cd:command name="smallbold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smallbold" file="font-pre.mkiv"/>
+    <cd:command name="smalltype" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smalltype" file="font-pre.mkiv"/>
+    <cd:command name="smallslanted" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smallslanted" file="font-pre.mkiv"/>
+    <cd:command name="smallboldslanted" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smallboldslanted" file="font-pre.mkiv"/>
+    <cd:command name="smallslantedbold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smallslantedbold" file="font-pre.mkiv"/>
+    <cd:command name="smallbolditalic" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smallbolditalic" file="font-pre.mkiv"/>
+    <cd:command name="smallitalicbold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="smallitalicbold" file="font-pre.mkiv"/>
+    <cd:command name="sans" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="sans" file="font-pre.mkiv"/>
+    <cd:command name="sansserif" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="sansserif" file="font-pre.mkiv"/>
+    <cd:command name="roman" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="roman" file="font-pre.mkiv"/>
+    <cd:command name="serif" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="serif" file="font-pre.mkiv"/>
+    <cd:command name="regular" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="regular" file="font-pre.mkiv"/>
+    <cd:command name="handwritten" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="handwritten" file="font-pre.mkiv"/>
+    <cd:command name="calligraphic" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="calligraphic" file="font-pre.mkiv"/>
+    <cd:command name="sansnormal" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="sansnormal" file="font-pre.mkiv"/>
+    <cd:command name="sansbold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="sansbold" file="font-pre.mkiv"/>
+    <cd:command name="serifnormal" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="serifnormal" file="font-pre.mkiv"/>
+    <cd:command name="serifbold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="serifbold" file="font-pre.mkiv"/>
+    <cd:command name="mononormal" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="mononormal" file="font-pre.mkiv"/>
+    <cd:command name="monobold" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="monobold" file="font-pre.mkiv"/>
-
-    <cd:command name="definefontsolution" file="font-sol.mkvi">
+    <cd:command name="definefontsolution" category="fonts" level="style" file="font-sol.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -1155,7 +1160,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfontsolution" file="font-sol.mkvi">
+    <cd:command name="setupfontsolution" category="fonts" level="style" file="font-sol.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -1198,21 +1203,21 @@
 
     -->
 
-    <cd:command name="setfontsolution" file="font-sol.mkvi">
+    <cd:command name="setfontsolution" category="fonts" file="font-sol.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetfontsolution" file="font-sol.mkvi"/>
+    <cd:command name="resetfontsolution" category="fonts" file="font-sol.mkvi"/>
 
-    <cd:command name="fontsolution" type="environment" file="font-sol.mkvi">
+    <cd:command name="fontsolution" type="environment" category="fonts" file="font-sol.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definealternativestyle" file="font-sty.mkvi">
+    <cd:command name="definealternativestyle" category="fonts" level="style" file="font-sty.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
             <cd:resolve name="keyword-command"/>
@@ -1220,17 +1225,17 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applyalternativestyle" file="font-sty.mkvi">
+    <cd:command name="applyalternativestyle" category="fonts" file="font-sty.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dontconvertfont" file="font-sty.mkvi"/>
+    <cd:command name="dontconvertfont" category="fonts" file="font-sty.mkvi"/>
 
-    <cd:command name="redoconvertfont" file="font-sty.mkvi"/>
+    <cd:command name="redoconvertfont" category="fonts" file="font-sty.mkvi"/>
 
-    <cd:command name="definestyle" file="font-sty.mkvi">
+    <cd:command name="definestyle" category="fonts" level="style" file="font-sty.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -1240,7 +1245,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupstyle" file="font-sty.mkvi">
+    <cd:command name="setupstyle" category="fonts" level="style" file="font-sty.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -1257,22 +1262,22 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="style" type="environment" generated="yes" variant="example" file="font-sty.mkvi">
+    <cd:command name="style" type="environment" generated="yes" variant="instance" category="fonts" file="font-sty.mkvi">
         <cd:sequence>
-            <cd:variable value="style"/>
+            <cd:instance value="style"/>
         </cd:sequence>
     </cd:command>
 
-    <cd:command name="style" generated="yes" variant="example" file="font-sty.mkvi">
+    <cd:command name="style" generated="yes" variant="instance" category="fonts" file="font-sty.mkvi">
         <cd:sequence>
-            <cd:variable value="style"/>
+            <cd:instance value="style"/>
         </cd:sequence>
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="style" type="environment" variant="argument" file="font-sty.mkvi">
+    <cd:command name="style" type="environment" variant="argument" category="fonts" file="font-sty.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="cd:name"/>
@@ -1281,7 +1286,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="style" type="environment" file="font-sty.mkvi">
+    <cd:command name="style" type="environment" category="fonts" file="font-sty.mkvi">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupstyle"/>
@@ -1289,7 +1294,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="style" variant="argument" file="font-sty.mkvi">
+    <cd:command name="style" variant="argument" category="fonts" file="font-sty.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="cd:name"/>
@@ -1299,7 +1304,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="style" file="font-sty.mkvi">
+    <cd:command name="style" category="fonts" file="font-sty.mkvi">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupstyle"/>
@@ -1308,7 +1313,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definestyleinstance" file="font-sty.mkvi">
+    <cd:command name="definestyleinstance" category="fonts" level="style" file="font-sty.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords optional="yes">
@@ -1334,59 +1339,59 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="styleinstance" file="font-sty.mkvi">
+    <cd:command name="styleinstance" category="fonts" file="font-sty.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseitalic" file="font-sym.mkvi">
+    <cd:command name="doifelseitalic" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifitalicelse" file="font-sym.mkvi">
+    <cd:command name="doifitalicelse" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getprivateslot" file="font-ini.mkvi">
+    <cd:command name="getprivateslot" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getprivatechar" file="font-ini.mkvi">
+    <cd:command name="getprivatechar" category="fonts" file="font-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="glyphfontfile" file="font-sym.mkvi">
+    <cd:command name="glyphfontfile" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getnamedglyphstyled" file="font-sym.mkvi">
+    <cd:command name="getnamedglyphstyled" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getnamedglyphdirect" file="font-sym.mkvi">
+    <cd:command name="getnamedglyphdirect" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getglyphstyled" file="font-sym.mkvi">
+    <cd:command name="getglyphstyled" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:keywords delimiters="braces">
@@ -1396,7 +1401,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getglyphdirect" file="font-sym.mkvi">
+    <cd:command name="getglyphdirect" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:keywords delimiters="braces">
@@ -1406,31 +1411,27 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resolvedglyphstyled" file="font-sym.mkvi">
+    <cd:command name="resolvedglyphstyled" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
-            <cd:keywords delimiters="braces">
-                <cd:constant type="cd:text"/>
-            </cd:keywords>
+            <cd:resolve name="argument-tochar"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resolvedglyphdirect" file="font-sym.mkvi">
+    <cd:command name="resolvedglyphdirect" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
-            <cd:keywords delimiters="braces">
-                <cd:constant type="cd:text"/>
-            </cd:keywords>
+            <cd:resolve name="argument-tochar"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setfont" file="font-sym.mkvi">
+    <cd:command name="setfont" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="string-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefontchar" file="font-sym.mkvi">
+    <cd:command name="doifelsefontchar" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-number"/>
@@ -1439,7 +1440,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffontcharelse" file="font-sym.mkvi">
+    <cd:command name="doiffontcharelse" category="fonts" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-number"/>
@@ -1448,15 +1449,15 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showchardata" file="font-tra.mkiv">
+    <cd:command name="showchardata" category="fonts" file="font-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showfontdata" file="font-tra.mkiv"/>
+    <cd:command name="showfontdata" category="fonts" file="font-tra.mkiv"/>
 
-    <cd:command name="doifelsefontpresent" file="font-tra.mkiv">
+    <cd:command name="doifelsefontpresent" category="fonts" file="font-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-true"/>
@@ -1464,7 +1465,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffontpresentelse" file="font-tra.mkiv">
+    <cd:command name="doiffontpresentelse" category="fonts" file="font-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-true"/>
@@ -1472,7 +1473,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showotfcomposition" file="font-tra.mkiv">
+    <cd:command name="showotfcomposition" category="fonts" file="font-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:keywords delimiters="braces">
@@ -1486,31 +1487,31 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fontclass" file="font-var.mkvi"/>
+    <cd:command name="fontclass" category="fonts" file="font-var.mkvi"/>
 
-    <cd:command name="fontbody" file="font-var.mkvi"/>
+    <cd:command name="fontbody" category="fonts" file="font-var.mkvi"/>
 
-    <cd:command name="fontstyle" file="font-var.mkvi"/>
+    <cd:command name="fontstyle" category="fonts" file="font-var.mkvi"/>
 
-    <cd:command name="fontalternative" file="font-var.mkvi"/>
+    <cd:command name="fontalternative" category="fonts" file="font-var.mkvi"/>
 
-    <cd:command name="fontsize" file="font-var.mkvi"/>
+    <cd:command name="fontsize" category="fonts" file="font-var.mkvi"/>
 
-    <cd:command name="fontface" file="font-var.mkvi"/>
+    <cd:command name="fontface" category="fonts" file="font-var.mkvi"/>
 
-    <cd:command name="typescriptone" file="type-ini.mkvi"/>
+    <cd:command name="typescriptone" category="fonts" file="type-ini.mkvi"/>
 
-    <cd:command name="typescripttwo" file="type-ini.mkvi"/>
+    <cd:command name="typescripttwo" category="fonts" file="type-ini.mkvi"/>
 
-    <cd:command name="typescriptthree" file="type-ini.mkvi"/>
+    <cd:command name="typescriptthree" category="fonts" file="type-ini.mkvi"/>
 
-    <cd:command name="typescriptcollection" type="environment" file="type-ini.mkvi">
+    <cd:command name="typescriptcollection" type="environment" category="fonts" file="type-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usetypescriptfile" file="type-ini.mkvi">
+    <cd:command name="usetypescriptfile" category="fonts" level="style" file="type-ini.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="reset"/>
@@ -1519,7 +1520,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usetypescript" file="type-ini.mkvi">
+    <cd:command name="usetypescript" category="fonts" level="style" file="type-ini.mkvi">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="serif"/>
@@ -1545,22 +1546,22 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="loadtypescriptfile" file="type-ini.mkvi">
+    <cd:command name="loadtypescriptfile" category="fonts" level="style" file="type-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="quittypescriptscanning" file="type-ini.mkvi"/>
+    <cd:command name="quittypescriptscanning" category="fonts" file="type-ini.mkvi"/>
 
-    <cd:command name="definetypescriptsynonym" file="type-ini.mkvi">
+    <cd:command name="definetypescriptsynonym" category="fonts" file="type-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typescript" type="environment" file="type-ini.mkvi">
+    <cd:command name="typescript" type="environment" category="fonts" level="style" file="type-ini.mkvi">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="serif"/>
@@ -1578,20 +1579,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definetypescriptprefix" file="type-ini.mkvi">
+    <cd:command name="definetypescriptprefix" category="fonts" file="type-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typescriptprefix" file="type-ini.mkvi">
+    <cd:command name="typescriptprefix" category="fonts" file="type-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definetypeface" file="type-ini.mkvi">
+    <cd:command name="definetypeface" category="fonts" level="style" file="type-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords>
@@ -1640,7 +1641,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfontexpansion" file="hand-ini.mkiv">
+    <cd:command name="setupfontexpansion" category="fonts" level="style" file="hand-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -1663,7 +1664,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfontprotrusion" file="hand-ini.mkiv">
+    <cd:command name="setupfontprotrusion" category="fonts" level="style" file="hand-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -1683,10 +1684,10 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="blockligatures" file="font-fea.mkiv">
+    <cd:command name="blockligatures" category="fonts" level="style" file="font-fea.mkvi">
         <cd:arguments>
-            <cd:resolve name="keyword-list"/>
+            <cd:resolve name="keyword-text-list"/>
         </cd:arguments>
     </cd:command>
-
+		
 </cd:interface>