2017-05-25 12:56:00

1 files changed, 43 insertions, 35 deletions

diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml
index a7ecb5401..339bb58ad 100644
--- a/tex/context/interface/mkiv/i-note.xml
+++ b/tex/context/interface/mkiv/i-note.xml
@@ -18,7 +18,7 @@
 
     -->
 
-    <cd:command name="setupnotation" file="strc-not.mkvi">
+    <cd:command name="setupnotation" category="notes" level="style" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -183,7 +183,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnotations" file="strc-not.mkvi">
+    <cd:command name="setupnotations" category="notes" level="style" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -192,7 +192,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" file="strc-not.mkvi">
+    <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" category="notes" level="document" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -204,7 +204,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" type="environment" generated="yes" variant="instance" file="strc-not.mkvi">
+    <cd:command name="note" type="environment" generated="yes" variant="instance" category="notes" level="document" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -216,7 +216,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" generated="yes" variant="instance" file="strc-not.mkvi">
+    <cd:command name="note" generated="yes" variant="instance" category="notes" level="document" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -229,7 +229,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" generated="yes" variant="instance:assignment" file="strc-not.mkvi">
+    <cd:command name="note" generated="yes" variant="instance:assignment" category="notes" level="document" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -241,7 +241,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="definenote" file="strc-not.mkvi">
+    <cd:command name="definenote" category="notes" level="style" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -251,7 +251,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnote" file="strc-not.mkvi">
+    <cd:command name="setupnote" category="notes" level="style" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -381,12 +381,20 @@
                 <cd:parameter name="anchor">
                     <cd:constant type="next"/>
                 </cd:parameter>
+                <!-- begin root only -->
+                <cd:parameter name="spacebefore">
+                    <cd:inherit name="blank"/>
+                </cd:parameter>
+                <cd:parameter name="spaceinbetween">
+                    <cd:inherit name="blank"/>
+                </cd:parameter>
+                <!-- end root only -->
                 <cd:inherit name="setupframed"/>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnotes" file="strc-not.mkvi">
+    <cd:command name="setupnotes" category="notes" level="style" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -395,7 +403,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnote" file="strc-not.mkvi">
+    <cd:command name="setnote" category="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference-list-optional"/>
@@ -403,14 +411,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnote" variant="assignment" file="strc-not.mkvi">
+    <cd:command name="setnote" variant="assignment" category="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" file="strc-not.mkvi">
+    <cd:command name="setnotetext" category="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference-list-optional"/>
@@ -418,14 +426,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnotetext" variant="assignment" file="strc-not.mkvi">
+    <cd:command name="setnotetext" variant="assignment" category="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" file="strc-not.mkvi">
+    <cd:command name="placenotes" category="notes" level="document" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
             <cd:assignments list="yes" optional="yes">
@@ -434,13 +442,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localnotes" type="environment" file="strc-not.mkvi">
+    <cd:command name="localnotes" type="environment" category="notes" level="document" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placelocalnotes" file="strc-not.mkvi">
+    <cd:command name="placelocalnotes" category="notes" level="document" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -449,11 +457,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="postponenotes" file="strc-not.mkvi"/>
+    <cd:command name="postponenotes" category="notes" file="strc-not.mkvi"/>
 
-    <cd:command name="flushnotes" file="strc-not.mkvi"/>
+    <cd:command name="flushnotes" category="notes" file="strc-not.mkvi"/>
 
-    <cd:command name="doifelsenoteonsamepage" file="strc-not.mkvi">
+    <cd:command name="doifelsenoteonsamepage" category="notes" level="system" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -461,7 +469,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnoteonsamepageelse" file="strc-not.mkvi">
+    <cd:command name="doifnoteonsamepageelse" category="notes" level="system" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -469,21 +477,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotescollected" file="strc-not.mkvi">
+    <cd:command name="doifnotescollected" category="notes" level="system" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="notesymbol" file="strc-not.mkvi">
+    <cd:command name="notesymbol" category="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" file="strc-not.mkvi">
+    <cd:command name="note" category="notes" level="document" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="keyword-reference"/>
@@ -519,20 +527,20 @@
 
     -->
 
-    <cd:command name="footnotetext" file="strc-not.mkvi">
+    <cd:command name="footnotetext" category="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" file="strc-not.mkvi">
+    <cd:command name="footnotetext" variant="assignment" category="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="assignment-constructiondata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placefootnotes" file="strc-not.mkvi">
+    <cd:command name="placefootnotes" category="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupnote"/>
@@ -540,9 +548,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localfootnotes" type="environment" file="strc-not.mkvi"/>
+    <cd:command name="localfootnotes" type="environment" category="notes" file="strc-not.mkvi"/>
 
-    <cd:command name="placelocalfootnotes" file="strc-not.mkvi">
+    <cd:command name="placelocalfootnotes" category="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupnote"/>
@@ -579,7 +587,7 @@
 
     -->
 
-    <cd:command name="definelinenote" file="strc-lnt.mkvi">
+    <cd:command name="definelinenote" category="notes" level="style" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -589,7 +597,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuplinenote" file="strc-lnt.mkvi">
+    <cd:command name="setuplinenote" category="notes" level="style" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -613,7 +621,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="linenote" generated="yes" variant="instance" file="strc-lnt.mkvi">
+    <cd:command name="linenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:instance value="linenote"/>
         </cd:sequence>
@@ -625,7 +633,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="startlinenote" generated="yes" variant="instance" file="strc-lnt.mkvi">
+    <cd:command name="startlinenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:string value="start"/>
             <cd:instance value="linenote"/>
@@ -639,7 +647,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="stoplinenote" generated="yes" variant="instance" file="strc-lnt.mkvi">
+    <cd:command name="stoplinenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:string value="stop"/>
             <cd:instance value="linenote"/>
@@ -652,14 +660,14 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="fromlinenote" file="strc-lnt.mkvi">
+    <cd:command name="fromlinenote" category="notes" level="document" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tolinenote" file="strc-lnt.mkvi">
+    <cd:command name="tolinenote" category="notes" level="document" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference"/>
         </cd:arguments>