From b821116421f0d942052ad225f4ea62aef2696817 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Mon, 13 Jul 2020 17:21:34 +0200
Subject: 2020-07-13 16:31:00

---
 tex/context/interface/mkiv/i-system.xml | 1024 +++++++++++++++----------------
 1 file changed, 511 insertions(+), 513 deletions(-)

(limited to 'tex/context/interface/mkiv/i-system.xml')

diff --git a/tex/context/interface/mkiv/i-system.xml b/tex/context/interface/mkiv/i-system.xml
index b7c46c9ce..08a4a917d 100644
--- a/tex/context/interface/mkiv/i-system.xml
+++ b/tex/context/interface/mkiv/i-system.xml
@@ -4,28 +4,28 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="expanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="expanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expanded" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="expanded" type="environment" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="gobbleoneargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleoneargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbletwoarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbletwoarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblethreearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblethreearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -33,7 +33,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblefourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblefourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -42,7 +42,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblefivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblefivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -52,7 +52,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblesixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblesixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -63,7 +63,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblesevenarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblesevenarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -75,7 +75,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleeightarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleeightarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -88,7 +88,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleninearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleninearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -102,7 +102,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbletenarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbletenarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -117,20 +117,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleoneoptional" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleoneoptional" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbletwooptionals" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbletwooptionals" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
             <cd:resolve name="keyword-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblethreeoptionals" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblethreeoptionals" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
             <cd:resolve name="keyword-dummy"/>
@@ -138,7 +138,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblefouroptionals" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblefouroptionals" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
             <cd:resolve name="keyword-dummy"/>
@@ -147,7 +147,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblefiveoptionals" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblefiveoptionals" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
             <cd:resolve name="keyword-dummy"/>
@@ -157,9 +157,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="donothing" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="donothing" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="doifelsenextchar" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextchar" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
             <cd:resolve name="argument-true"/>
@@ -167,7 +167,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextcharelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextcharelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
             <cd:resolve name="argument-true"/>
@@ -175,212 +175,212 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextoptional" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextoptional" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextoptionalelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextoptionalelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextoptionalcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextoptionalcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextoptionalcselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextoptionalcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextbgroup" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextbgroup" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextbgroupelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextbgroupelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextbgroupcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextbgroupcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextbgroupcselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextbgroupcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextparenthesis" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextparenthesis" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextparenthesiselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextparenthesiselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefastoptionalcheck" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsefastoptionalcheck" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffastoptionalcheckelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doiffastoptionalcheckelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefastoptionalcheckcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsefastoptionalcheckcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffastoptionalcheckcselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doiffastoptionalcheckcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="assumelongusagecs" level="system" file="syst-aux.mkiv">
+    <cd:command name="assumelongusagecs" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setgvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setgvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setevalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setxvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setxvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="getvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="letvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letgvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="letgvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="resetvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="undefinevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="undefinevalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ignorevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="ignorevalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setuvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setuevalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setugvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setugvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuxvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setuxvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getuvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="getuvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseundefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseundefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -388,7 +388,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifundefinedelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifundefinedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -396,7 +396,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsedefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -404,7 +404,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdefinedelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifdefinedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -412,39 +412,39 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifundefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifundefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifdefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letbeundefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="letbeundefined" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localundefine" level="system" file="syst-aux.mkiv">
+    <cd:command name="localundefine" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalundefine" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalundefine" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsealldefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsealldefined" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -452,7 +452,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifalldefinedelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifalldefinedelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -460,7 +460,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doif" level="system" file="syst-aux.mkiv">
+    <cd:command name="doif" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -468,7 +468,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnot" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnot" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -476,7 +476,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -485,7 +485,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-true"/>
@@ -493,7 +493,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptyelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifemptyelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-true"/>
@@ -501,21 +501,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -524,7 +524,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinsetelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -533,7 +533,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -541,7 +541,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -549,7 +549,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsecommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -558,7 +558,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcommonelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifcommonelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -567,7 +567,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -575,7 +575,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -583,60 +583,60 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommalist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="quitcommalist" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="quitcommalist" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="quitprevcommalist" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="quitprevcommalist" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="processcommacommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommacommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcommalistwithparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommalistwithparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcommalist" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommalist" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcommacommand" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommacommand" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentcommalistitem" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentcommalistitem" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="processaction" level="system" file="syst-aux.mkiv">
+    <cd:command name="processaction" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command"/>
             <cd:apply list="yes"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processfirstactioninset" level="system" file="syst-aux.mkiv">
+    <cd:command name="processfirstactioninset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command"/>
             <cd:apply list="yes"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processallactionsinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="processallactionsinset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command"/>
             <cd:apply list="yes"/>
@@ -645,17 +645,17 @@
 
     <cd:command name="commalistelement" level="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="firstcharacter" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="firstcharacter" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="remainingcharacters" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="remainingcharacters" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="getfirstcharacter" level="system" file="syst-aux.mkiv">
+    <cd:command name="getfirstcharacter" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefirstchar" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsefirstchar" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -664,7 +664,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffirstcharelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doiffirstcharelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -673,19 +673,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thefirstcharacter" level="system" file="syst-aux.mkiv">
+    <cd:command name="thefirstcharacter" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="theremainingcharacters" level="system" file="syst-aux.mkiv">
+    <cd:command name="theremainingcharacters" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseinstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -694,7 +694,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinstringelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifinstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -703,7 +703,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -711,7 +711,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotinstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -719,7 +719,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseincsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseincsname" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-csname"/>
@@ -728,7 +728,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifincsnameelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifincsnameelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-csname"/>
@@ -737,7 +737,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -745,7 +745,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnumberelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnumberelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -753,21 +753,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotnumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotnumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="percentdimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="percentdimen" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:dimension"/>
@@ -780,7 +780,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setpercentdimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="setpercentdimen" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:dimension"/>
@@ -793,28 +793,28 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="makerawcommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="makerawcommalist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawprocesscommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawprocesscommalist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawprocesscommacommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawprocesscommacommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawdoifelseinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -823,7 +823,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawdoifinsetelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -832,7 +832,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawdoifinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawdoifinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -840,123 +840,123 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawprocessaction" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawprocessaction" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command"/>
             <cd:apply list="yes"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentvalue" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentvalue" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="getparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="geteparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="geteparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getgparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getgparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getxparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getxparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="forgetparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="forgetparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getexpandedparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getexpandedparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doassign" level="system" file="syst-aux.mkiv">
+    <cd:command name="doassign" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doeassign" level="system" file="syst-aux.mkiv">
+    <cd:command name="doeassign" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="undoassign" level="system" file="syst-aux.mkiv">
+    <cd:command name="undoassign" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doassignempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doassignempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignmentlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignmentlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignmentcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignmentcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignmentlist" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignmentlist" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignmentcommand" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignmentcommand" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentassignmentlistkey" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentassignmentlistkey" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="currentassignmentlistvalue" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentassignmentlistvalue" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="getemptyparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getemptyparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="copyparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="copyparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="keyword-text"/>
@@ -964,13 +964,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="checkparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ifparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="ifparameters" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-true"/>
             <cd:delimiter name="else"/>
@@ -979,41 +979,41 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="commalistsize" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="commalistsize" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="getcommalistsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="getcommalistsize" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getcommacommandsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="getcommacommandsize" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getfromcommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="getfromcommalist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:resolve name="keyword-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getfromcommacommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="getfromcommacommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:resolve name="keyword-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstinlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstinlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dogetcommacommandelement" level="system" file="syst-aux.mkiv">
+    <cd:command name="dogetcommacommandelement" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-number"/>
             <cd:delimiter name="from"/>
@@ -1023,14 +1023,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosingleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosingleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoubleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoubleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1038,7 +1038,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotripleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotripleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1047,7 +1047,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquadrupleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquadrupleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1057,7 +1057,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquintupleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquintupleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1068,7 +1068,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosixtupleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosixtupleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1080,7 +1080,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doseventupleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doseventupleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1093,14 +1093,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosingleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosingleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoubleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoubleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1108,7 +1108,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotripleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotripleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1117,7 +1117,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquadrupleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquadrupleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1127,7 +1127,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquintupleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquintupleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1138,7 +1138,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosixtupleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosixtupleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1150,7 +1150,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doseventupleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="doseventupleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1163,13 +1163,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strippedcsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="strippedcsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strippedcsname" variant="string" level="system" file="syst-aux.mkiv">
+    <cd:command name="strippedcsname" variant="string" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="none">
                 <cd:constant type="cd:text"/>
@@ -1177,13 +1177,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="complexorsimple" level="system" file="syst-aux.mkiv">
+    <cd:command name="complexorsimple" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="complexorsimple" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="complexorsimple" variant="argument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:text"/>
@@ -1192,13 +1192,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="complexorsimpleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="complexorsimpleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="complexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="complexorsimpleempty" variant="argument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:text"/>
@@ -1207,13 +1207,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecomplexorsimple" level="system" file="syst-aux.mkiv">
+    <cd:command name="definecomplexorsimple" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecomplexorsimple" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="definecomplexorsimple" variant="argument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:text"/>
@@ -1222,13 +1222,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecomplexorsimpleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="definecomplexorsimpleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecomplexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="definecomplexorsimpleempty" variant="argument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:text"/>
@@ -1237,18 +1237,18 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="permitspacesbetweengroups" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="permitspacesbetweengroups" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dontpermitspacesbetweengroups" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="dontpermitspacesbetweengroups" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dosinglegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosinglegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoublegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoublegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
@@ -1256,7 +1256,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotriplegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotriplegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
@@ -1265,7 +1265,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquadruplegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquadruplegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
@@ -1275,7 +1275,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquintuplegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquintuplegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
@@ -1286,27 +1286,27 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofoneargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofoneargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstoftwoarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstoftwoarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondoftwoarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondoftwoarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofthreearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofthreearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1314,7 +1314,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondofthreearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondofthreearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1322,7 +1322,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdofthreearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdofthreearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1330,7 +1330,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstoffourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstoffourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1339,7 +1339,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondoffourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondoffourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1348,7 +1348,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdoffourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdoffourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1357,7 +1357,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fourthoffourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fourthoffourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1366,7 +1366,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1376,7 +1376,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1386,7 +1386,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1396,7 +1396,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fourthoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fourthoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1406,7 +1406,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fifthoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fifthoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1416,7 +1416,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1427,7 +1427,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1438,7 +1438,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1449,7 +1449,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fourthofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fourthofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1460,7 +1460,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fifthofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fifthofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1471,7 +1471,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="sixthofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="sixthofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1482,27 +1482,27 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofoneunexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofoneunexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstoftwounexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstoftwounexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondoftwounexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondoftwounexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofthreeunexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1510,7 +1510,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondofthreeunexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1518,7 +1518,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdofthreeunexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1526,56 +1526,56 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="letempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalletempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalletempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letvalueempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="letvalueempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letgvalueempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="letgvalueempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letvaluerelax" level="system" file="syst-aux.mkiv">
+    <cd:command name="letvaluerelax" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letgvalurelax" level="system" file="syst-aux.mkiv">
+    <cd:command name="letgvalurelax" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="relaxvalueifundefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="relaxvalueifundefined" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawgetparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawgetparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="texdefinition" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="texdefinition" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="none" optional="yes">
                 <cd:constant type="spaces"/>
@@ -1613,39 +1613,39 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="texdefinition" level="system" file="syst-aux.mkiv">
+    <cd:command name="texdefinition" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="texcode" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="texcode" type="environment" level="system" category="catcode" file="syst-aux.mkiv"/>
 
-    <cd:command name="newcounter" level="system" file="syst-aux.mkiv">
+    <cd:command name="newcounter" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastincrement" level="system" file="syst-aux.mkiv">
+    <cd:command name="fastincrement" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastdecrement" level="system" file="syst-aux.mkiv">
+    <cd:command name="fastdecrement" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="increment" level="system" file="syst-aux.mkiv">
+    <cd:command name="increment" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="increment" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="increment" variant="argument" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="parenthesis" list="yes">
                 <cd:constant type="cd:csname"/>
@@ -1654,13 +1654,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="decrement" level="system" file="syst-aux.mkiv">
+    <cd:command name="decrement" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="decrement" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="decrement" variant="argument" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="parenthesis" list="yes">
                 <cd:constant type="cd:csname"/>
@@ -1669,49 +1669,43 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="incrementvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="incrementvalue" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="decrementvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="decrementvalue" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="newsignal" level="system" file="syst-aux.mkiv">
+    <cd:command name="newsignal" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkedstrippedcsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="checkedstrippedcsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkedstrippedcsname" variant="string" level="system" file="syst-aux.mkiv">
-        <cd:arguments>
-            <cd:resolve name="string-text"/>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="savenormalmeaning" level="system" file="syst-aux.mkiv">
+    <cd:command name="savenormalmeaning" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="recursedepth" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="recursedepth" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="recurselevel" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="recurselevel" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="resetrecurselevel" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="resetrecurselevel" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dostepwiserecurse" level="system" file="syst-aux.mkiv">
+    <cd:command name="dostepwiserecurse" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
@@ -1722,79 +1716,79 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dorecurse" level="system" file="syst-aux.mkiv">
+    <cd:command name="dorecurse" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doexpandedrecurse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doexpandedrecurse" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowith" level="system" file="syst-aux.mkiv">
+    <cd:command name="dowith" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command-list"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doloop" level="system" file="syst-aux.mkiv">
+    <cd:command name="doloop" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="exitloop" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="exitloop" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="exitloopnow" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="exitloopnow" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dofastloopcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="dofastloopcs" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastloopindex" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="fastloopindex" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="fastloopfinal" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="fastloopfinal" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="doloopoverlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="doloopoverlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="recursestring" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="recursestring" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="newevery" level="system" file="syst-aux.mkiv">
+    <cd:command name="newevery" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="EveryPar" level="system" file="syst-aux.mkiv">
+    <cd:command name="EveryPar" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="EveryLine" level="system" file="syst-aux.mkiv">
+    <cd:command name="EveryLine" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="forgeteverypar" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="forgeteverypar" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="convertvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="convertvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
             <cd:delimiter name="to"/>
@@ -1802,14 +1796,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defconvertedvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="defconvertedvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseassignment" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -1817,7 +1811,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifassignmentelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifassignmentelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -1825,13 +1819,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="docheckassignment" level="system" file="syst-aux.mkiv">
+    <cd:command name="docheckassignment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ifassignment" level="system" file="syst-aux.mkiv">
+    <cd:command name="ifassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-true"/>
             <cd:delimiter name="else"/>
@@ -1840,7 +1834,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseassignmentcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseassignmentcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
@@ -1848,7 +1842,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifassignmentelsecs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifassignmentelsecs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
@@ -1856,7 +1850,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="convertargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="convertargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -1864,7 +1858,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="convertcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="convertcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:delimiter name="to"/>
@@ -1872,55 +1866,55 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defconvertedargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="defconvertedargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defconvertedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="defconvertedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="edefconvertedargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="edefconvertedargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gdefconvertedargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="gdefconvertedargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gdefconvertedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="gdefconvertedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xdefconvertedargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="xdefconvertedargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="showvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemeaning" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsemeaning" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
@@ -1929,7 +1923,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifmeaningelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifmeaningelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
@@ -1938,7 +1932,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesamestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsesamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -1947,7 +1941,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsamestringelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsamestringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -1956,7 +1950,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsamestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -1964,7 +1958,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotsamestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotsamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -1972,7 +1966,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ConvertToConstant" level="system" file="syst-aux.mkiv">
+    <!-- begin of obsolete -->
+
+    <cd:command name="ConvertToConstant" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
@@ -1980,7 +1976,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ConvertConstantAfter" level="system" file="syst-aux.mkiv">
+    <cd:command name="ConvertConstantAfter" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
@@ -1988,61 +1984,63 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="assignifempty" level="system" file="syst-aux.mkiv">
+    <!-- end of obsolete -->
+
+    <cd:command name="assignifempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="grabuntil" level="system" file="syst-aux.mkiv">
+    <cd:command name="grabuntil" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processbetween" level="system" file="syst-aux.mkiv">
+    <cd:command name="processbetween" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleuntil" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleuntil" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleuntilrelax" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleuntilrelax" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-content"/>
             <cd:delimiter name="relax"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processuntil" level="system" file="syst-aux.mkiv">
+    <cd:command name="processuntil" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="groupedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="groupedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="simplegroupedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="simplegroupedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pickupgroupedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="pickupgroupedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -2050,35 +2048,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="BeforePar" level="system" file="syst-aux.mkiv">
+    <cd:command name="BeforePar" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="AfterPar" level="system" file="syst-aux.mkiv">
+    <cd:command name="AfterPar" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="GetPar" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="GetPar" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="GotoPar" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="GotoPar" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dowithpargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dowithpargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowithwargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dowithwargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dorepeatwithcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="dorepeatwithcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="cd:text"/>
@@ -2088,7 +2086,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsestringinstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsestringinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -2097,7 +2095,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifstringinstringelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifstringinstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -2106,7 +2104,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendtoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendtoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2114,7 +2112,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependtoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependtoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2122,7 +2120,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendtoksonce" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendtoksonce" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2130,7 +2128,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependtoksonce" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependtoksonce" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2138,7 +2136,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseintoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseintoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -2147,7 +2145,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifintokselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifintokselse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -2156,25 +2154,25 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="collecting" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="collecting" type="environment" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="collect" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="collect" type="environment" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="expandedcollect" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="expandedcollect" type="environment" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="collect" level="system" file="syst-aux.mkiv">
+    <cd:command name="collect" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="collectexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="collectexpanded" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removetoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="removetoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="from"/>
@@ -2182,7 +2180,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendetoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendetoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2190,7 +2188,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependetoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependetoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2198,19 +2196,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="flushtoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="flushtoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="beforesplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="beforesplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2220,7 +2218,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="aftersplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="aftersplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2230,7 +2228,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2242,7 +2240,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="greedysplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="greedysplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2254,7 +2252,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="beforetestandsplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="beforetestandsplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2264,7 +2262,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="aftertestandsplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="aftertestandsplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2274,7 +2272,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testandsplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="testandsplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2286,7 +2284,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatperiod" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatperiod" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2294,7 +2292,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatcomma" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatcomma" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2302,7 +2300,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatasterisk" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatasterisk" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2310,7 +2308,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatcolon" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatcolon" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2318,7 +2316,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatcolons" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatcolons" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2326,7 +2324,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removesubstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="removesubstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="from"/>
@@ -2336,35 +2334,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendtocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendtocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependtocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependtocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="addtocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="addtocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pretocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="pretocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="robustdoifelseinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="robustdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -2373,7 +2371,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="robustdoifinsetelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="robustdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -2382,35 +2380,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="robustaddtocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="robustaddtocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="robustpretocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="robustpretocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xsplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="xsplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removefromcommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="removefromcommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="substituteincommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="substituteincommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -2418,14 +2416,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="replaceincommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="replaceincommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalprocesscommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalprocesscommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="cd:command"/>
@@ -2434,112 +2432,112 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="withoutpt" level="system" file="syst-aux.mkiv">
+    <cd:command name="withoutpt" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="PtToCm" level="system" file="syst-aux.mkiv">
+    <cd:command name="PtToCm" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dimensiontocount" level="system" file="syst-aux.mkiv">
+    <cd:command name="dimensiontocount" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="numberofpoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="numberofpoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="swapdimens" level="system" file="syst-aux.mkiv">
+    <cd:command name="swapdimens" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="swapcounts" level="system" file="syst-aux.mkiv">
+    <cd:command name="swapcounts" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="swapmacros" level="system" file="syst-aux.mkiv">
+    <cd:command name="swapmacros" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalswapdimens" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalswapdimens" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalswapcounts" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalswapcounts" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalswapmacros" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalswapmacros" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalpushmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalpushmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localpushmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="localpushmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalpopmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalpopmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localpopmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="localpopmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pushmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="pushmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="popmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="popmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localhsize" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="localhsize" level="system" category="layout" file="syst-aux.mkiv"/>
 
-    <cd:command name="setlocalhsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="setlocalhsize" level="system" category="layout" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="cd:dimension" prefix="cd:sign" method="none"/>
@@ -2547,9 +2545,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="availablehsize" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="availablehsize" level="system" category="layout" file="syst-aux.mkiv"/>
 
-    <cd:command name="distributedhsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="distributedhsize" level="system" category="layout" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
@@ -2557,14 +2555,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hsizefraction" level="system" file="syst-aux.mkiv">
+    <cd:command name="hsizefraction" level="system" category="layout" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvalue" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
@@ -2572,7 +2570,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
@@ -2580,7 +2578,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsevalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
@@ -2589,7 +2587,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvalueelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvalueelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
@@ -2598,21 +2596,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnothing" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsomething" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenothing" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2620,7 +2618,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnothingelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnothingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2628,7 +2626,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesomething" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsesomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2636,7 +2634,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsomethingelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsomethingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2644,21 +2642,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvaluenothing" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvaluenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvaluesomething" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvaluesomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsevaluenothing" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsevaluenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -2666,7 +2664,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvaluenothingelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvaluenothingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -2674,7 +2672,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseemptyvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -2682,7 +2680,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptyvalueelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifemptyvalueelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -2690,21 +2688,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptyvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotemptyvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseallcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -2713,7 +2711,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifallcommonelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifallcommonelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -2722,7 +2720,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifallcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -2730,7 +2728,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotallcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -2738,7 +2736,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoubleemptywithset" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoubleemptywithset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-list-optional"/>
@@ -2746,7 +2744,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotripleemptywithset" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotripleemptywithset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-list-optional"/>
@@ -2755,7 +2753,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoubleargumentwithset" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoubleargumentwithset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-list"/>
@@ -2763,7 +2761,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotripleargumentwithset" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotripleargumentwithset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-list"/>
@@ -2772,7 +2770,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="stripcharacter" level="system" file="syst-aux.mkiv">
+    <cd:command name="stripcharacter" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-character"/>
             <cd:delimiter name="from"/>
@@ -2782,7 +2780,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="stripspaces" level="system" file="syst-aux.mkiv">
+    <cd:command name="stripspaces" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:delimiter name="from"/>
             <cd:resolve name="string-text"/>
@@ -2791,7 +2789,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unspacestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="unspacestring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -2799,14 +2797,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="executeifdefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="executeifdefined" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesomespace" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsesomespace" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2814,7 +2812,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsomespaceelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsomespaceelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2822,7 +2820,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processseparatedlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processseparatedlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="keyword-text"/>
@@ -2833,7 +2831,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
             <cd:resolve name="argument-character"/>
@@ -2842,14 +2840,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="untexargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="untexargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:delimiter name="to"/>
@@ -2857,7 +2855,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="untexcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="untexcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-csname"/>
             <cd:delimiter name="to"/>
@@ -2865,56 +2863,56 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="PointsToBigPoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="PointsToBigPoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="PointsToWholeBigPoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="PointsToWholeBigPoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ScaledPointsToBigPoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="ScaledPointsToBigPoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ScaledPointsToWholeBigPoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="ScaledPointsToWholeBigPoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="PointsToReal" level="system" file="syst-aux.mkiv">
+    <cd:command name="PointsToReal" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dontleavehmode" level="style" file="syst-aux.mkiv"/>
+    <cd:command name="dontleavehmode" level="style" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="utfupper" level="system" file="syst-aux.mkiv">
+    <cd:command name="utfupper" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="utflower" level="system" file="syst-aux.mkiv">
+    <cd:command name="utflower" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="uppercasestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="uppercasestring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -2922,7 +2920,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lowercasestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="lowercasestring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -2930,7 +2928,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="counttoken" level="system" file="syst-aux.mkiv">
+    <cd:command name="counttoken" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="in"/>
@@ -2940,7 +2938,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="counttokens" level="system" file="syst-aux.mkiv">
+    <cd:command name="counttokens" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -2948,7 +2946,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitofftokens" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitofftokens" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="from"/>
@@ -2958,7 +2956,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="handletokens" level="system" file="syst-aux.mkiv">
+    <cd:command name="handletokens" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="with"/>
@@ -2966,11 +2964,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="settrialtypesetting" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="settrialtypesetting" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="resettrialtypesetting" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="resettrialtypesetting" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="iftrialtypesetting" level="system" file="syst-aux.mkiv">
+    <cd:command name="iftrialtypesetting" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-true"/>
             <cd:delimiter name="else"/>
@@ -2979,64 +2977,64 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="integerrounding" level="system" file="syst-aux.mkiv">
+    <cd:command name="integerrounding" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="onedigitrounding" level="system" file="syst-aux.mkiv">
+    <cd:command name="onedigitrounding" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="twodigitrounding" level="system" file="syst-aux.mkiv">
+    <cd:command name="twodigitrounding" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="threedigitrounding" level="system" file="syst-aux.mkiv">
+    <cd:command name="threedigitrounding" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcontent" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcontent" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dogobblesingleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dogobblesingleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dogobbledoubleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dogobbledoubleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy-optional"/>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblesingleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblesingleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbledoubleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbledoubleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy-optional"/>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesometoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsesometoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
@@ -3044,7 +3042,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsometokselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsometokselse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
@@ -3052,71 +3050,71 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsometoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsometoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptytoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifemptytoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strictinspectnextcharacter" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="strictinspectnextcharacter" type="environment" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="strictdoifelsenextoptional" level="system" file="syst-aux.mkiv">
+    <cd:command name="strictdoifelsenextoptional" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strictdoifnextoptionalelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="strictdoifnextoptionalelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblespacetokens" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="gobblespacetokens" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="verbatimstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="verbatimstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lastdigit" level="system" file="syst-aux.mkiv">
+    <cd:command name="lastdigit" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lasttwodigits" level="system" file="syst-aux.mkiv">
+    <cd:command name="lasttwodigits" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="serializedcommalist" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="serializedcommalist" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="serializecommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="serializecommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="purenumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="purenumber" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filterfromvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="filterfromvalue" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -3124,7 +3122,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filterfromnext" level="system" file="syst-aux.mkiv">
+    <cd:command name="filterfromnext" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
@@ -3136,61 +3134,61 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definemeasure" level="style" file="syst-aux.mkiv">
+    <cd:command name="definemeasure" level="style" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="freezemeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="freezemeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setmeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="setmeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setgmeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="setgmeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setemeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="setemeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setxmeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="setxmeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="measure" level="style" file="syst-aux.mkiv">
+    <cd:command name="measure" level="style" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="measured" level="style" file="syst-aux.mkiv">
+    <cd:command name="measured" level="style" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dividedsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="dividedsize" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
@@ -3198,7 +3196,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedimension" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsedimension" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3206,7 +3204,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdimensionelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifdimensionelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3214,7 +3212,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedimenstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsedimenstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3222,7 +3220,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdimenstringelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifdimenstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3230,23 +3228,23 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="compresult" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="compresult" level="system" category="counter" file="syst-aux.mkiv"/>
 
-    <cd:command name="comparedimension" level="system" file="syst-aux.mkiv">
+    <cd:command name="comparedimension" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="comparedimensioneps" level="system" file="syst-aux.mkiv">
+    <cd:command name="comparedimensioneps" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letcscsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="letcscsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:delimiter name="csname"/>
@@ -3255,7 +3253,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letcsnamecs" level="system" file="syst-aux.mkiv">
+    <cd:command name="letcsnamecs" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:delimiter name="csname"/>
             <cd:resolve name="string-name"/>
@@ -3264,7 +3262,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letcsnamecsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="letcsnamecsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:delimiter name="csname"/>
             <cd:resolve name="string-name"/>
@@ -3275,20 +3273,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="addvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="addvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unspaced" level="system" file="syst-aux.mkiv">
+    <cd:command name="unspaced" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unspaceargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="unspaceargument" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -3296,14 +3294,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unspaceafter" level="system" file="syst-aux.mkiv">
+    <cd:command name="unspaceafter" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsehasspace" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsehasspace" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3311,7 +3309,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifhasspaceelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifhasspaceelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3319,25 +3317,25 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setflag" level="system" file="syst-aux.mkiv">
+    <cd:command name="setflag" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetflag" level="system" file="syst-aux.mkiv">
+    <cd:command name="resetflag" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="flag" level="system" file="syst-aux.mkiv">
+    <cd:command name="flag" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseflagged" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseflagged" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -3345,7 +3343,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifflaggedelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifflaggedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -3353,14 +3351,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotflagged" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotflagged" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="inheritparameter" level="system" file="syst-aux.mkiv">
+    <cd:command name="inheritparameter" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="keyword-text"/>
@@ -3368,7 +3366,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenonzeropositive" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenonzeropositive" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -3376,7 +3374,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnonzeropositiveelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnonzeropositiveelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -3384,122 +3382,122 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrawparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getrawparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getraweparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getraweparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrawgparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getrawgparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrawxparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getrawxparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unprotected" level="system" file="syst-aux.mkiv">
+    <cd:command name="unprotected" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-content"/>
             <cd:delimiter name="par"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resettimer" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="resettimer" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="elapsedtime" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="elapsedtime" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="elapsedseconds" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="elapsedseconds" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="elapsedsteptime" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="elapsedsteptime" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="currentfeaturetest" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentfeaturetest" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="testfeature" level="system" file="syst-aux.mkiv">
+    <cd:command name="testfeature" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="retestfeature" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="retestfeature" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="showtimer" level="system" file="syst-aux.mkiv">
+    <cd:command name="showtimer" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testfeatureonce" level="system" file="syst-aux.mkiv">
+    <cd:command name="testfeatureonce" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="freezedimenmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="freezedimenmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="negated" level="system" file="syst-aux.mkiv">
+    <cd:command name="negated" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="assigndimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="assigndimen" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendgvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendgvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependgvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependgvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processranges" level="system" file="syst-aux.mkiv">
+    <cd:command name="processranges" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:constant type="cd:number"/>
@@ -3509,7 +3507,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowithrange" level="system" file="syst-aux.mkiv">
+    <cd:command name="dowithrange" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces" list="yes">
                 <cd:constant type="cd:number"/>
@@ -3519,11 +3517,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ignoreimplicitspaces" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="ignoreimplicitspaces" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="nointerference" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="nointerference" type="environment" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="expandcheckedcsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="expandcheckedcsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-key"/>
@@ -3531,43 +3529,43 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="docheckedpair" level="system" file="syst-aux.mkiv">
+    <cd:command name="docheckedpair" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantnumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantnumber" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantnumberargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantnumberargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantdimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantdimen" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantdimenargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantdimenargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantemptyargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantemptyargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getsubstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="getsubstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
@@ -3575,7 +3573,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="converteddimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="converteddimen" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:keywords delimiters="braces">
@@ -3595,14 +3593,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ntimes" level="system" file="syst-aux.mkiv">
+    <cd:command name="ntimes" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifelse" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3611,7 +3609,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoif" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoif" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3619,7 +3617,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifnot" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifnot" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3627,7 +3625,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expandeddoif" level="system" file="syst-lua.mkiv">
+    <cd:command name="expandeddoif" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3635,7 +3633,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expandeddoifnot" level="system" file="syst-lua.mkiv">
+    <cd:command name="expandeddoifnot" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3643,7 +3641,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expandeddoifelse" level="system" file="syst-lua.mkiv">
+    <cd:command name="expandeddoifelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3652,7 +3650,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifelsecommon" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifelsecommon" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -3661,7 +3659,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifcommonelse" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifcommonelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -3670,7 +3668,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifelseinset" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -3679,7 +3677,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifinsetelse" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -3688,13 +3686,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="luaexpr" level="system" file="syst-lua.mkiv">
+    <cd:command name="luaexpr" level="system" category="strings" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupsystem" level="style" file="core-sys.mkiv">
+    <cd:command name="setupsystem" level="style" category="counter" file="core-sys.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="n">
-- 
cgit v1.2.3