2017-05-25 12:56:00

1 files changed, 103 insertions, 98 deletions

diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml
index c7633aa91..db01f60cd 100644
--- a/tex/context/interface/mkiv/i-framed.xml
+++ b/tex/context/interface/mkiv/i-framed.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineframed" file="pack-rul.mkiv">
+    <cd:command name="defineframed" level="style" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframed" file="pack-rul.mkiv">
+    <cd:command name="setupframed" level="style" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -232,7 +232,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framed" file="pack-rul.mkiv">
+    <cd:command name="framed" level="document" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupframed"/>
@@ -241,9 +241,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framed" generated="yes" variant="example" file="pack-rul.mkiv">
+    <cd:command name="framed" generated="yes" variant="instance" level="document" file="pack-rul.mkiv">
         <cd:sequence>
-            <cd:variable value="framed"/>
+            <cd:instance value="framed"/>
         </cd:sequence>
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
@@ -252,8 +252,7 @@
             <cd:content/>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="unframed"/>
-            <cd:constant value="fitfieldframed"/>
+            <cd:resolve name="instance-framed"/>
         </cd:instances>
     </cd:command>
 
@@ -266,7 +265,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framed" type="environment" file="pack-rul.mkiv">
+    <cd:command name="framed" type="environment" level="document" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -312,7 +311,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placeframed" file="pack-rul.mkiv">
+    <cd:command name="placeframed" level="document" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -322,7 +321,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="inframed" file="pack-rul.mkiv">
+    <cd:command name="inframed" level="document" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupframed"/>
@@ -331,16 +330,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unframed" file="pack-rul.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupframed"/>
-            </cd:assignments>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+    <!--
 
-    <cd:command name="definemathframed" file="pack-rul.mkiv">
+        <cd:command name="unframed" file="pack-rul.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupframed"/>
+                </cd:assignments>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
+
+    -->
+
+    <cd:command name="definemathframed" level="style" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -350,7 +353,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmathframed" file="pack-rul.mkiv">
+    <cd:command name="setupmathframed" level="style" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -359,9 +362,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mathframed" generated="yes" variant="example" file="pack-rul.mkiv">
+    <cd:command name="mathframed" generated="yes" variant="instance" level="document" file="pack-rul.mkiv">
         <cd:sequence>
-            <cd:variable value="mathframed"/>
+            <cd:instance value="mathframed"/>
         </cd:sequence>
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
@@ -370,40 +373,42 @@
             <cd:content/>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="mframed"/>
-            <cd:constant value="inmframed"/>
-            <cd:constant value="mcframed"/>
+            <cd:resolve name="instance-mathframed"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="mframed" file="pack-rul.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupmathframed"/>
-            </cd:assignments>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+    <!--
 
-    <cd:command name="inmframed" file="pack-rul.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupmathframed"/>
-            </cd:assignments>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="mframed" file="pack-rul.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupmathframed"/>
+                </cd:assignments>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="mcframed" file="pack-rul.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupmathframed"/>
-            </cd:assignments>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="inmframed" file="pack-rul.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupmathframed"/>
+                </cd:assignments>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="defineformulaframed" file="math-for.mkiv">
+        <cd:command name="mcframed" file="pack-rul.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupmathframed"/>
+                </cd:assignments>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
+
+    -->
+
+    <cd:command name="defineformulaframed" level="style" file="math-for.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -413,7 +418,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupformulaframed" file="math-for.mkiv">
+    <cd:command name="setupformulaframed" level="style" file="math-for.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -422,7 +427,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineframedtext" file="pack-rul.mkiv">
+    <cd:command name="defineframedtext" level="style" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -432,7 +437,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframedtext" file="pack-rul.mkiv">
+    <cd:command name="setupframedtext" level="style" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -473,22 +478,18 @@
         </cd:arguments>
     </cd:command>
 
-    <!--
-
-        <cd:command name="setupframedtexts" file="pack-rul.mkiv">
-            <cd:arguments>
-                <cd:resolve name="keyword-name-list-optional"/>
-                <cd:assignments list="yes">
-                    <cd:inherit name="setupframedtext"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-    -->
+    <cd:command name="setupframedtexts" level="style" file="pack-rul.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name-list-optional"/>
+            <cd:assignments list="yes">
+                <cd:inherit name="setupframedtext"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
 
-    <cd:command name="framedtext" generated="yes" variant="example" file="pack-rul.mkiv">
+    <cd:command name="framedtext" generated="yes" variant="instance" level="document" file="pack-rul.mkiv">
         <cd:sequence>
-            <cd:variable value="framedtext"/>
+            <cd:instance value="framedtext"/>
         </cd:sequence>
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
@@ -497,13 +498,13 @@
             <cd:content/>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="framedtext"/>
+            <cd:resolve name="instance-framedtext"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="framedtext" type="environment" generated="yes" variant="example" file="pack-rul.mkiv">
+    <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" file="pack-rul.mkiv">
         <cd:sequence>
-            <cd:variable value="framedtext"/>
+            <cd:instance value="framedtext"/>
         </cd:sequence>
         <cd:arguments>
             <cd:keywords optional="yes">
@@ -517,34 +518,38 @@
             </cd:assignments>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="framedtext"/>
+            <cd:resolve name="instance-framedtext"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="framedtext" file="pack-rul.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupframedtext"/>
-            </cd:assignments>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+    <!--
 
-    <cd:command name="framedtext" type="environment" file="pack-rul.mkiv">
-        <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="left"/>
-                <cd:constant type="right"/>
-                <cd:constant type="middle"/>
-                <cd:constant type="none"/>
-            </cd:keywords>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupframedtext"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="framedtext" file="pack-rul.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupframedtext"/>
+                </cd:assignments>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="framedtext" type="environment" file="pack-rul.mkiv">
+            <cd:arguments>
+                <cd:keywords optional="yes">
+                    <cd:constant type="left"/>
+                    <cd:constant type="right"/>
+                    <cd:constant type="middle"/>
+                    <cd:constant type="none"/>
+                </cd:keywords>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupframedtext"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+    -->
 
-    <cd:command name="defineframedcontent" file="pack-rul.mkiv">
+    <cd:command name="defineframedcontent" level="style" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -554,7 +559,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframedcontent" file="pack-rul.mkiv">
+    <cd:command name="setupframedcontent" level="style" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -594,28 +599,28 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installleftframerenderer" file="pack-fen.mkiv">
+    <cd:command name="installleftframerenderer" level="system" file="pack-fen.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installrightframerenderer" file="pack-fen.mkiv">
+    <cd:command name="installrightframerenderer" level="system" file="pack-fen.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installtopframerenderer" file="pack-fen.mkiv">
+    <cd:command name="installtopframerenderer" level="system" file="pack-fen.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installbottomframerenderer" file="pack-fen.mkiv">
+    <cd:command name="installbottomframerenderer" level="system" file="pack-fen.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>