2017-05-25 12:56:00

1 files changed, 86 insertions, 90 deletions

diff --git a/tex/context/interface/mkiv/i-delimitedtext.xml b/tex/context/interface/mkiv/i-delimitedtext.xml
index d75fb957e..e64693210 100644
--- a/tex/context/interface/mkiv/i-delimitedtext.xml
+++ b/tex/context/interface/mkiv/i-delimitedtext.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definedelimitedtext" file="typo-del.mkiv">
+    <cd:command name="definedelimitedtext" category="language" level="style" file="typo-del.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="setupdelimitedtext" file="typo-del.mkiv">
+    <cd:command name="setupdelimitedtext" category="language" level="style" file="typo-del.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -90,26 +90,22 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="delimitedtext" generated="yes" variant="example" file="typo-del.mkiv">
+    <cd:command name="delimitedtext" generated="yes" variant="instance" category="language" level="document" file="typo-del.mkiv">
         <cd:sequence>
-            <cd:variable value="delimitedtext"/>
+            <cd:instance value="delimitedtext"/>
         </cd:sequence>
         <cd:arguments>
             <cd:resolve name="keyword-language-optional"/>
             <cd:content/>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="quotation"/>
-            <cd:constant value="quote"/>
-            <cd:constant value="blockquote"/>
-            <cd:constant value="speech"/>
-            <cd:constant value="aside"/>
+            <cd:resolve name="instance-delimitedtext"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="delimitedtext" type="environment" generated="yes" variant="example" file="typo-del.mkiv">
+    <cd:command name="delimitedtext" type="environment" generated="yes" variant="instance" category="language" level="document" file="typo-del.mkiv">
         <cd:sequence>
-            <cd:variable value="delimitedtext"/>
+            <cd:instance value="delimitedtext"/>
         </cd:sequence>
         <cd:arguments>
             <cd:resolve name="keyword-language-optional"/>
@@ -118,15 +114,11 @@
             </cd:keywords>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="quotation"/>
-            <cd:constant value="quote"/>
-            <cd:constant value="blockquote"/>
-            <cd:constant value="speech"/>
-            <cd:constant value="aside"/>
+            <cd:resolve name="instance-delimitedtext"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="delimitedtext" file="typo-del.mkiv">
+    <cd:command name="delimitedtext" category="language" level="document" file="typo-del.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-language-optional"/>
@@ -134,7 +126,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="delimitedtext" type="environment" file="typo-del.mkiv">
+    <cd:command name="delimitedtext" type="environment" category="language" level="document" file="typo-del.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-language-optional"/>
@@ -144,7 +136,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="delimited" file="typo-del.mkiv">
+    <cd:command name="delimited" category="language" level="document" file="typo-del.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-language-optional"/>
@@ -152,7 +144,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="delimited" type="environment" file="typo-del.mkiv">
+    <cd:command name="delimited" type="environment" category="language" level="document" file="typo-del.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-language-optional"/>
@@ -162,83 +154,87 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="quotation" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+    <!--
 
-    <cd:command name="quotation" type="environment" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-            <cd:keywords list="yes" optional="yes">
-                <cd:inherit name="startnarrower"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="quotation" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="quote" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="quotation" type="environment" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:inherit name="startnarrower"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="quote" type="environment" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="quote" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="blockquote" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="quote" type="environment" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="blockquote" type="environment" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-            <cd:keywords list="yes" optional="yes">
-                <cd:inherit name="startnarrower"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="blockquote" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="speech" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="blockquote" type="environment" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:inherit name="startnarrower"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="aside" type="environment" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-            <cd:keywords list="yes" optional="yes">
-                <cd:inherit name="startnarrower"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="speech" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="aside" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-language-optional"/>
-            <cd:content/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="aside" type="environment" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:inherit name="startnarrower"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="speech" type="environment" file="typo-del.mkiv">
-        <cd:arguments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:inherit name="startnarrower"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="aside" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-language-optional"/>
+                <cd:content/>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="speech" type="environment" file="typo-del.mkiv">
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:inherit name="startnarrower"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+    -->
 
-    <cd:command name="setupquotation" file="typo-del.mkiv">
+    <cd:command name="setupquotation" category="language" level="style" file="typo-del.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupdelimitedtext"/>
@@ -246,7 +242,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupquote" file="typo-del.mkiv">
+    <cd:command name="setupquote" category="language" level="style" file="typo-del.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupdelimitedtext"/>
@@ -254,12 +250,12 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="subsentence" file="typo-del.mkiv">
+    <cd:command name="subsentence" category="language" level="document" file="typo-del.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="subsentence" type="environment" file="typo-del.mkiv"/>
+    <cd:command name="subsentence" type="environment" category="language" level="document" file="typo-del.mkiv"/>
 
 </cd:interface>