2017-10-29 15:50:00

1 files changed, 60 insertions, 61 deletions

diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml
index 856b41a18..b01c72a87 100644
--- a/tex/context/interface/mkiv/i-floats.xml
+++ b/tex/context/interface/mkiv/i-floats.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definefloat" level="style" file="strc-flt.mkvi">
+    <cd:command name="definefloat" level="style" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-singular"/>
             <cd:keywords optional="yes">
@@ -20,7 +20,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="definefloat" variant="name" level="style" file="strc-flt.mkvi">
+    <cd:command name="definefloat" variant="name" level="style" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-singular"/>
             <cd:resolve name="keyword-plural-optional"/>
@@ -31,7 +31,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="setupfloat" level="style" file="strc-flt.mkvi">
+    <cd:command name="setupfloat" level="style" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-singular-list-optional"/>
             <cd:assignments list="yes">
@@ -170,7 +170,6 @@
                     <cd:constant type="none"/>
                     <cd:inherit name="blank"/>
                 </cd:parameter>
-                </cd:parameter>
                 <cd:parameter name="sidethreshold">
                     <cd:constant type="old"/>
                     <cd:constant type="dimension" default="yes"/> <!--  value=".5\strutdp" -->
@@ -203,7 +202,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfloats" level="style" file="strc-flt.mkvi">
+    <cd:command name="setupfloats" level="style" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-singular-list-optional"/>
             <cd:assignments list="yes">
@@ -214,7 +213,7 @@
 
     <!--
 
-        <cd:command name="definefloatcaption" file="strc-flt.mkvi">
+        <cd:command name="definefloatcaption" level="style" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-name-optional"/>
@@ -226,7 +225,7 @@
 
     -->
 
-    <cd:command name="setupfloatcaption" level="style" file="strc-flt.mkvi">
+    <cd:command name="setupfloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -338,7 +337,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupcaption" level="style" file="strc-flt.mkvi">
+    <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -347,7 +346,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupcaptions" level="style" file="strc-flt.mkvi">
+    <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -356,7 +355,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placefloat" generated="yes" variant="instance" level="document" file="strc-flt.mkvi">
+    <cd:command name="placefloat" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi">
         <cd:sequence>
             <cd:string value="place"/>
             <cd:instance value="float"/>
@@ -372,7 +371,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="placefloat" level="document" file="strc-flt.mkvi">
+    <cd:command name="placefloat" level="document" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-singular"/>
             <cd:resolve name="keyword-floatlocation-list-optional"/>
@@ -382,7 +381,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placefloat" type="environment" generated="yes" variant="instance" level="document" file="strc-flt.mkvi">
+    <cd:command name="placefloat" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi">
         <cd:sequence>
             <cd:string value="place"/>
             <cd:instance value="float"/>
@@ -396,7 +395,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="placefloat" type="environment" level="document" file="strc-flt.mkvi">
+    <cd:command name="placefloat" type="environment" level="document" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-singular"/>
             <cd:resolve name="assignment-floatdata-list-optional"/>
@@ -404,7 +403,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="floattext" type="environment" generated="yes" variant="instance" level="document" file="strc-flt.mkvi">
+    <cd:command name="floattext" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi">
         <cd:sequence>
             <cd:instance value="float"/>
             <cd:string value="text"/>
@@ -419,7 +418,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="placelistoffloats" generated="yes" variant="instance" level="document" file="strc-flt.mkvi">
+    <cd:command name="placelistoffloats" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi">
         <cd:sequence>
             <cd:string value="placelistof"/>
             <cd:instance value="floats"/>
@@ -434,7 +433,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="completelistoffloats" generated="yes" variant="instance" level="document" file="strc-flt.mkvi">
+    <cd:command name="completelistoffloats" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi">
         <cd:sequence>
             <cd:string value="completelistof"/>
             <cd:instance value="floats"/>
@@ -449,48 +448,48 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="floatuserdataparameter" level="system" file="strc-flt.mkvi">
+    <cd:command name="floatuserdataparameter" level="system" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelserightpagefloat" level="system" file="strc-flt.mkvi">
+    <cd:command name="doifelserightpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifrightpagefloatelse" level="system" file="strc-flt.mkvi">
+    <cd:command name="doifrightpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseoddpagefloat" level="system" file="strc-flt.mkvi">
+    <cd:command name="doifelseoddpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifoddpagefloatelse" level="system" file="strc-flt.mkvi">
+    <cd:command name="doifoddpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemainfloatbody" level="system" file="strc-flt.mkvi">
+    <cd:command name="doifelsemainfloatbody" level="system" category="structure conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifmainfloatbodyelse" level="system" file="strc-flt.mkvi">
+    <cd:command name="doifmainfloatbodyelse" level="system" category="structure conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
@@ -499,7 +498,7 @@
 
     <!--
 
-        <cd:command name="placefigure" file="strc-flt.mkvi">
+        <cd:command name="placefigure" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -508,14 +507,14 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placefigure" type="environment" file="strc-flt.mkvi">
+        <cd:command name="placefigure" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-floatdata-list-optional"/>
                 <cd:resolve name="assignment-userdata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="figuretext" type="environment" file="strc-flt.mkvi">
+        <cd:command name="figuretext" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -523,7 +522,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placelistoffigures" file="strc-flt.mkvi">
+        <cd:command name="placelistoffigures" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -531,7 +530,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="completelistoffigures" file="strc-flt.mkvi">
+        <cd:command name="completelistoffigures" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -539,7 +538,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placetable" file="strc-flt.mkvi">
+        <cd:command name="placetable" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -548,14 +547,14 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placetable" type="environment" file="strc-flt.mkvi">
+        <cd:command name="placetable" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-floatdata-list-optional"/>
                 <cd:resolve name="assignment-userdata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="tabletext" type="environment" file="strc-flt.mkvi">
+        <cd:command name="tabletext" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -563,7 +562,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placelistoftables" file="strc-flt.mkvi">
+        <cd:command name="placelistoftables" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -571,7 +570,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="completelistoftables" file="strc-flt.mkvi">
+        <cd:command name="completelistoftables" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -579,7 +578,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placegraphic" file="strc-flt.mkvi">
+        <cd:command name="placegraphic" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -588,14 +587,14 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placegraphic" type="environment" file="strc-flt.mkvi">
+        <cd:command name="placegraphic" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-floatdata-list-optional"/>
                 <cd:resolve name="assignment-userdata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="graphictext" type="environment" file="strc-flt.mkvi">
+        <cd:command name="graphictext" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -603,7 +602,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placelistofgraphics" file="strc-flt.mkvi">
+        <cd:command name="placelistofgraphics" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -611,7 +610,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="completelistofgraphics" file="strc-flt.mkvi">
+        <cd:command name="completelistofgraphics" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -619,7 +618,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placeintermezzo" file="strc-flt.mkvi">
+        <cd:command name="placeintermezzo" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -628,14 +627,14 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placeintermezzo" type="environment" file="strc-flt.mkvi">
+        <cd:command name="placeintermezzo" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-floatdata-list-optional"/>
                 <cd:resolve name="assignment-userdata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="intermezzotext" type="environment" file="strc-flt.mkvi">
+        <cd:command name="intermezzotext" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -643,7 +642,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placelistofintermezzi" file="strc-flt.mkvi">
+        <cd:command name="placelistofintermezzi" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -651,7 +650,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="completelistofintermezzi" file="strc-flt.mkvi">
+        <cd:command name="completelistofintermezzi" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -659,7 +658,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placechemical" file="strc-flt.mkvi">
+        <cd:command name="placechemical" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-floatlocation-list-optional"/>
                 <cd:resolve name="keyword-reference-list-optional"/>
@@ -668,14 +667,14 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placechemical" type="environment" file="strc-flt.mkvi">
+        <cd:command name="placechemical" type="environment" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-floatdata-list-optional"/>
                 <cd:resolve name="assignment-userdata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placelistofchemicals" file="strc-flt.mkvi">
+        <cd:command name="placelistofchemicals" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -683,7 +682,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="completelistofchemicals" file="strc-flt.mkvi">
+        <cd:command name="completelistofchemicals" level="document" category="structure" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplist"/>
@@ -693,7 +692,7 @@
 
     -->
 
-    <cd:command name="setuplocalfloats" level="style" file="strc-flt.mkvi">
+    <cd:command name="setuplocalfloats" level="style" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="before">
@@ -709,25 +708,25 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="noflocalfloats" file="strc-flt.mkvi"/>
+    <cd:command name="noflocalfloats" level="system" category="structure" file="strc-flt.mkvi"/>
 
-    <cd:command name="resetlocalfloats" file="strc-flt.mkvi"/>
+    <cd:command name="resetlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/>
 
-    <cd:command name="somelocalfloat" file="strc-flt.mkvi"/>
+    <cd:command name="somelocalfloat" level="system" category="structure" file="strc-flt.mkvi"/>
 
-    <cd:command name="getlocalfloats" file="strc-flt.mkvi"/>
+    <cd:command name="getlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/>
 
-    <cd:command name="flushlocalfloats" file="strc-flt.mkvi"/>
+    <cd:command name="flushlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/>
 
-    <cd:command name="getlocalfloat" file="strc-flt.mkvi">
+    <cd:command name="getlocalfloat" level="system" category="structure" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="forcelocalfloats" file="strc-flt.mkvi"/>
+    <cd:command name="forcelocalfloats" level="system" category="structure" file="strc-flt.mkvi"/>
 
-    <cd:command name="setupfloatsplitting" level="style" file="tabl-tsp.mkiv">
+    <cd:command name="setupfloatsplitting" level="style" category="structure counter" file="tabl-tsp.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="before">
@@ -750,7 +749,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitfloat" level="system" file="tabl-tsp.mkiv">
+    <cd:command name="splitfloat" level="system" category="structure" file="tabl-tsp.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupfloatsplitting"/>
@@ -760,20 +759,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotinsidesplitfloat" level="system" file="tabl-tsp.mkiv">
+    <cd:command name="doifnotinsidesplitfloat" level="system" category="structure conditional" file="tabl-tsp.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placenamedfloat" level="document" file="page-flt.mkiv">
+    <cd:command name="placenamedfloat" level="document" category="structure" file="page-flt.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placefloatwithsetups" file="page-flt.mkiv">
+    <cd:command name="placefloatwithsetups" level="document" category="structure" file="page-flt.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-floatlocation-list-optional"/>
@@ -783,4 +782,4 @@
         </cd:arguments>
     </cd:command>
 
-</cd:interface>
+</cd:interface>
\ No newline at end of file