2017-10-29 15:50:00

1 files changed, 48 insertions, 48 deletions

diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml
index 734702264..9bcf43d5b 100644
--- a/tex/context/interface/mkiv/i-note.xml
+++ b/tex/context/interface/mkiv/i-note.xml
@@ -6,7 +6,7 @@
 
     <!--
 
-        <cd:command name="definenotation" file="strc-not.mkvi">
+        <cd:command name="definenotation" level="system" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-name-optional"/>
@@ -18,7 +18,7 @@
 
     -->
 
-    <cd:command name="setupnotation" category="notes" level="style" file="strc-not.mkvi">
+    <cd:command name="setupnotation" level="style" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -189,7 +189,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnotations" category="notes" level="style" file="strc-not.mkvi">
+    <cd:command name="setupnotations" level="style" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -198,7 +198,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" category="notes" level="document" file="strc-not.mkvi">
+    <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -210,7 +210,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" type="environment" generated="yes" variant="instance" category="notes" level="document" file="strc-not.mkvi">
+    <cd:command name="note" type="environment" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -222,7 +222,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" generated="yes" variant="instance" category="notes" level="document" file="strc-not.mkvi">
+    <cd:command name="note" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -235,7 +235,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" generated="yes" variant="instance:assignment" category="notes" level="document" file="strc-not.mkvi">
+    <cd:command name="note" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -247,7 +247,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="definenote" category="notes" level="style" file="strc-not.mkvi">
+    <cd:command name="definenote" level="style" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -257,7 +257,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnote" category="notes" level="style" file="strc-not.mkvi">
+    <cd:command name="setupnote" level="style" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -400,7 +400,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnotes" category="notes" level="style" file="strc-not.mkvi">
+    <cd:command name="setupnotes" level="style" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -409,7 +409,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnote" category="notes" file="strc-not.mkvi">
+    <cd:command name="setnote" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference-list-optional"/>
@@ -417,14 +417,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnote" variant="assignment" category="notes" file="strc-not.mkvi">
+    <cd:command name="setnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="assignment-constructiondata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnotetext" category="notes" file="strc-not.mkvi">
+    <cd:command name="setnotetext" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference-list-optional"/>
@@ -432,14 +432,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnotetext" variant="assignment" category="notes" file="strc-not.mkvi">
+    <cd:command name="setnotetext" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="assignment-constructiondata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placenotes" category="notes" level="document" file="strc-not.mkvi">
+    <cd:command name="placenotes" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
             <cd:assignments list="yes" optional="yes">
@@ -448,13 +448,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localnotes" type="environment" category="notes" level="document" file="strc-not.mkvi">
+    <cd:command name="localnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placelocalnotes" category="notes" level="document" file="strc-not.mkvi">
+    <cd:command name="placelocalnotes" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -463,11 +463,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="postponenotes" category="notes" file="strc-not.mkvi"/>
+    <cd:command name="postponenotes" level="style" category="structure notes" file="strc-not.mkvi"/>
 
-    <cd:command name="flushnotes" category="notes" file="strc-not.mkvi"/>
+    <cd:command name="flushnotes" level="style" category="structure notes" file="strc-not.mkvi"/>
 
-    <cd:command name="doifelsenoteonsamepage" category="notes" level="system" file="strc-not.mkvi">
+    <cd:command name="doifelsenoteonsamepage" level="system" category="structure notes conditional" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -475,7 +475,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnoteonsamepageelse" category="notes" level="system" file="strc-not.mkvi">
+    <cd:command name="doifnoteonsamepageelse" level="system" category="structure notes conditional" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -483,21 +483,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotescollected" category="notes" level="system" file="strc-not.mkvi">
+    <cd:command name="doifnotescollected" level="system" category="structure notes conditional" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="notesymbol" category="notes" file="strc-not.mkvi">
+    <cd:command name="notesymbol" level="system" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="note" category="notes" level="document" file="strc-not.mkvi">
+    <cd:command name="note" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="keyword-reference"/>
@@ -506,26 +506,26 @@
 
     <!--
 
-        <cd:command name="footnote" type="environment" variant="assignment" file="strc-not.mkvi">
+        <cd:command name="footnote" type="environment" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-constructiondata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="footnote" type="environment" file="strc-not.mkvi">
+        <cd:command name="footnote" type="environment" level="document" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="footnote" file="strc-not.mkvi">
+        <cd:command name="footnote" level="document" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference-list-optional"/>
                 <cd:resolve name="argument-text"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="footnote" variant="assignment" file="strc-not.mkvi">
+        <cd:command name="footnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-constructiondata-list"/>
             </cd:arguments>
@@ -533,20 +533,20 @@
 
     -->
 
-    <cd:command name="footnotetext" category="notes" file="strc-not.mkvi">
+    <cd:command name="footnotetext" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference-list-optional"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="footnotetext" variant="assignment" category="notes" file="strc-not.mkvi">
+    <cd:command name="footnotetext" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="assignment-constructiondata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placefootnotes" category="notes" file="strc-not.mkvi">
+    <cd:command name="placefootnotes" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupnote"/>
@@ -554,9 +554,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localfootnotes" type="environment" category="notes" file="strc-not.mkvi"/>
+    <cd:command name="localfootnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi"/>
 
-    <cd:command name="placelocalfootnotes" category="notes" file="strc-not.mkvi">
+    <cd:command name="placelocalfootnotes" level="document" category="structure notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupnote"/>
@@ -566,26 +566,26 @@
 
     <!--
 
-        <cd:command name="endnote" type="environment" variant="assignment" file="strc-not.mkvi">
+        <cd:command name="endnote" type="environment" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-constructiondata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="endnote" type="environment" file="strc-not.mkvi">
+        <cd:command name="endnote" type="environment" level="document" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="endnote" file="strc-not.mkvi">
+        <cd:command name="endnote" level="document" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference-list-optional"/>
                 <cd:resolve name="argument-text"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="endnote" variant="assignment" file="strc-not.mkvi">
+        <cd:command name="endnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-constructiondata-list"/>
             </cd:arguments>
@@ -593,7 +593,7 @@
 
     -->
 
-    <cd:command name="definelinenote" category="notes" level="style" file="strc-lnt.mkvi">
+    <cd:command name="definelinenote" level="style" category="structure notes" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -603,7 +603,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuplinenote" category="notes" level="style" file="strc-lnt.mkvi">
+    <cd:command name="setuplinenote" level="style" category="structure notes" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -627,7 +627,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="linenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi">
+    <cd:command name="linenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:instance value="linenote"/>
         </cd:sequence>
@@ -639,7 +639,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="startlinenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi">
+    <cd:command name="startlinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:string value="start"/>
             <cd:instance value="linenote"/>
@@ -653,7 +653,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="stoplinenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi">
+    <cd:command name="stoplinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:string value="stop"/>
             <cd:instance value="linenote"/>
@@ -666,14 +666,14 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="fromlinenote" category="notes" level="document" file="strc-lnt.mkvi">
+    <cd:command name="fromlinenote" level="document" category="structure notes" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tolinenote" category="notes" level="document" file="strc-lnt.mkvi">
+    <cd:command name="tolinenote" level="document" category="structure notes" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference"/>
         </cd:arguments>
@@ -681,20 +681,20 @@
 
     <!--
 
-        <cd:command name="linenote" file="strc-lnt.mkvi">
+        <cd:command name="linenote" level="document" category="structure notes" file="strc-lnt.mkvi">
             <cd:arguments>
                 <cd:resolve name="argument-text"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="startlinenote" file="strc-lnt.mkvi">
+        <cd:command name="startlinenote" level="document" category="structure notes" file="strc-lnt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference"/>
                 <cd:resolve name="argument-text"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="stoplinenote" file="strc-lnt.mkvi">
+        <cd:command name="stoplinenote" level="document" category="structure notes" file="strc-lnt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference"/>
             </cd:arguments>
@@ -702,4 +702,4 @@
 
     -->
 
-</cd:interface>
+</cd:interface>
\ No newline at end of file