2018-03-15 15:36:00

1 files changed, 46 insertions, 21 deletions

diff --git a/tex/context/interface/mkiv/i-setup.xml b/tex/context/interface/mkiv/i-setup.xml
index 4771230eb..a4420bfcf 100644
--- a/tex/context/interface/mkiv/i-setup.xml
+++ b/tex/context/interface/mkiv/i-setup.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupsetup" file="x-setups-basics.mkiv">
+    <cd:command name="setupsetup" level="style" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="criterium">
@@ -19,124 +19,149 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="basicsetup" file="x-setups-basics.mkiv">
+    <cd:command name="basicsetup" level="system" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="basicsetup" variant="argument" file="x-setups-basics.mkiv">
+    <cd:command name="basicsetup" variant="argument" level="system" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="shortsetup" file="x-setups-basics.mkiv">
+    <cd:command name="shortsetup" level="system" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="shortsetup" variant="argument" file="x-setups-basics.mkiv">
+    <cd:command name="shortsetup" variant="argument" level="system" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setup" file="x-setups-basics.mkiv">
+    <cd:command name="setup" level="system" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setup" variant="argument" file="x-setups-basics.mkiv">
+    <cd:command name="setup" variant="argument" level="system" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showsetup" file="x-setups-basics.mkiv">
+    <cd:command name="showsetup" level="system" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showsetup" variant="argument" file="x-setups-basics.mkiv">
+    <cd:command name="showsetup" variant="argument" level="system" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdinternal" file="x-setups-basics.mkiv">
+    <cd:command name="placesetup" level="document" file="x-setups-basics.mkiv"/>
+
+    <cd:command name="placeallsetups" level="document" file="x-setups-basics.mkiv"/>
+
+    <cd:command name="placeeverysetup" level="document" file="x-setups-basics.mkiv"/>
+
+    <cd:command name="showrootvalues" level="document" file="x-setups-basics.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-text"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="showinstancevalues" level="document" file="x-setups-basics.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-text"/>
+            <cd:resolve name="keyword-text"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="cmdinternal" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdbasicsetup" file="x-setups-basics.mkiv">
+    <cd:command name="cmdbasicsetup" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdbasicsetup" variant="argument" file="x-setups-basics.mkiv">
+    <cd:command name="cmdbasicsetup" variant="argument" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdshortsetup" file="x-setups-basics.mkiv">
+    <cd:command name="cmdshortsetup" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdshortsetup" variant="argument" file="x-setups-basics.mkiv">
+    <cd:command name="cmdshortsetup" variant="argument" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdfullsetup" file="x-setups-basics.mkiv">
+    <cd:command name="cmdfullsetup" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdfullsetup" variant="argument" file="x-setups-basics.mkiv">
+    <cd:command name="cmdfullsetup" variant="argument" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdbasicsetupinstance" file="x-setups-basics.mkiv">
+    <cd:command name="cmdbasicsetupinstance" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdshortsetupinstance" file="x-setups-basics.mkiv">
+    <cd:command name="cmdshortsetupinstance" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdfullsetupinstance" file="x-setups-basics.mkiv">
+    <cd:command name="cmdfullsetupinstance" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showdefinition" file="x-setups-basics.mkiv">
+    <cd:command name="showdefinition" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definition" file="x-setups-basics.mkiv">
+    <cd:command name="showdefinition" variant="argument" level="document" file="x-setups-basics.mkiv">
+        <cd:arguments>
+            <cd:resolve name="argument-text"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="definition" level="document" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text-list"/>
         </cd:arguments>