2016-10-12 17:32:00

1 files changed, 117 insertions, 59 deletions

diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml
index 69e817efd..eb3412c3d 100644
--- a/tex/context/interface/mkiv/i-itemgroup.xml
+++ b/tex/context/interface/mkiv/i-itemgroup.xml
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupitemgroup" variant="1" file="strc-itm.mkvi">
+    <cd:command name="setupitemgroup" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes" optional="yes">
@@ -116,7 +116,7 @@
                     <cd:inherit name="setupalign"/>
                 </cd:parameter>
                 <cd:parameter name="indenting">
-                    <cd:resolve name="setupindenting"/>
+                    <cd:inherit name="setupindenting"/>
                 </cd:parameter>
                 <cd:parameter name="start">
                     <cd:constant type="cd:number"/>
@@ -198,7 +198,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupitemgroup" variant="2" file="strc-itm.mkvi">
+    <cd:command name="setupitemgroup" variant="assignment" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="cd:name"/>
@@ -299,7 +299,7 @@
                     <cd:inherit name="setupalign"/>
                 </cd:parameter>
                 <cd:parameter name="indenting">
-                    <cd:resolve name="setupindenting"/>
+                    <cd:inherit name="setupindenting"/>
                 </cd:parameter>
                 <cd:parameter name="start">
                     <cd:constant type="cd:number"/>
@@ -381,23 +381,45 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="itemgroup" type="environment" generated="yes" variant="generated" file="strc-itm.mkvi">
+    <cd:command name="setupitemgroups" file="strc-itm.mkvi">
+        <cd:arguments>
+            <cd:keywords list="yes" optional="yes">
+                <cd:constant type="cd:name"/>
+                <cd:constant type="cd:number" prefix="cd:name" method="range"/>
+            </cd:keywords>
+            <cd:assignments list="yes">
+                <cd:inherit name="setupitemgroup"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="setupitemgroup" generated="yes" variant="example" file="strc-itm.mkvi">
         <cd:sequence>
+            <cd:string value="setup"/>
             <cd:variable value="itemgroup"/>
         </cd:sequence>
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
+                <cd:constant type="each"/>
+                <cd:constant type="cd:number"/>
+            </cd:keywords>
+            <cd:keywords list="yes" optional="yes">
                 <cd:inherit name="setupitemgroup"/>
             </cd:keywords>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupitemgroup"/>
             </cd:assignments>
         </cd:arguments>
+        <cd:instances>
+            <cd:constant value="itemize"/>
+        </cd:instances>
     </cd:command>
 
-    <cd:command name="itemgroup" type="environment" file="strc-itm.mkvi">
+    <cd:command name="itemgroup" type="environment" generated="yes" variant="example" file="strc-itm.mkvi">
+        <cd:sequence>
+            <cd:variable value="itemgroup"/>
+        </cd:sequence>
         <cd:arguments>
-            <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes" optional="yes">
                 <cd:inherit name="setupitemgroup"/>
             </cd:keywords>
@@ -405,93 +427,114 @@
                 <cd:inherit name="setupitemgroup"/>
             </cd:assignments>
         </cd:arguments>
+        <cd:instances>
+            <cd:constant value="itemize"/>
+        </cd:instances>
     </cd:command>
 
-    <cd:command name="item" variant="itemgroup" file="strc-itm.mkvi">
+    <cd:command name="itemgroup" type="environment" file="strc-itm.mkvi">
         <cd:arguments>
-            <cd:resolve name="keyword-reference-list-optional"/>
+            <cd:resolve name="keyword-name"/>
+            <cd:keywords list="yes" optional="yes">
+                <cd:inherit name="setupitemgroup"/>
+            </cd:keywords>
+            <cd:assignments list="yes" optional="yes">
+                <cd:inherit name="setupitemgroup"/>
+            </cd:assignments>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="itemtag" variant="itemgroup" file="strc-itm.mkvi">
+    <cd:command name="item" scope="itemgroup" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="itm" variant="itemgroup" file="strc-itm.mkvi">
-        <cd:arguments>
-            <cd:resolve name="keyword-reference-list-optional"/>
-        </cd:arguments>
-    </cd:command>
+    <cd:command name="noitem" scope="itemgroup" file="strc-itm.mkvi"/>
 
-    <cd:command name="but" variant="itemgroup" file="strc-itm.mkvi">
+    <cd:command name="itemtag" scope="itemgroup" file="strc-itm.mkvi">
         <cd:arguments>
-            <cd:resolve name="keyword-reference"/>
             <cd:resolve name="keyword-reference-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="nop" variant="itemgroup" file="strc-itm.mkvi"/>
+    <!--
 
-    <cd:command name="txt" variant="itemgroup" file="strc-itm.mkvi">
-        <cd:arguments>
-            <cd:resolve name="argument-text"/>
-            <cd:resolve name="keyword-reference-list-optional"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="itm" scope="itemgroup" file="strc-itm.mkvi">
+            <cd:arguments>
+                <cd:resolve name="keyword-reference-list-optional"/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="head" variant="itemgroup" file="strc-itm.mkvi">
-        <cd:arguments>
-            <cd:resolve name="string-text"/>
-            <cd:delimiter name="par"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="but" scope="itemgroup" file="strc-itm.mkvi">
+            <cd:arguments>
+                <cd:resolve name="keyword-reference"/>
+                <cd:resolve name="keyword-reference-list-optional"/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="headsym" variant="itemgroup" file="strc-itm.mkvi">
-        <cd:arguments>
-            <cd:resolve name="argument-text"/>
-            <cd:resolve name="keyword-reference-list-optional"/>
-            <cd:resolve name="argument-text-optional"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="nop" scope="itemgroup" file="strc-itm.mkvi"/>
 
-    <cd:command name="sym" variant="itemgroup" file="strc-itm.mkvi">
-        <cd:arguments>
-            <cd:resolve name="argument-text"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="txt" scope="itemgroup" file="strc-itm.mkvi">
+            <cd:arguments>
+                <cd:resolve name="argument-text"/>
+                <cd:resolve name="keyword-reference-list-optional"/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="ran" variant="itemgroup" file="strc-itm.mkvi">
-        <cd:arguments>
-            <cd:resolve name="argument-text"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="head" scope="itemgroup" file="strc-itm.mkvi">
+            <cd:arguments>
+                <cd:resolve name="string-text"/>
+                <cd:delimiter name="par"/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="mar" variant="itemgroup" file="strc-itm.mkvi">
-        <cd:arguments>
-            <cd:resolve name="argument-text"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="headsym" scope="itemgroup" file="strc-itm.mkvi">
+            <cd:arguments>
+                <cd:resolve name="argument-text"/>
+                <cd:resolve name="keyword-reference-list-optional"/>
+                <cd:resolve name="argument-text-optional"/>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="sym" scope="itemgroup" file="strc-itm.mkvi">
+            <cd:arguments>
+                <cd:resolve name="argument-text"/>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="ran" scope="itemgroup" file="strc-itm.mkvi">
+            <cd:arguments>
+                <cd:resolve name="argument-text"/>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="mar" scope="itemgroup" file="strc-itm.mkvi">
+            <cd:arguments>
+                <cd:resolve name="argument-text"/>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="sub" scope="itemgroup" file="strc-itm.mkvi"/>
 
-    <cd:command name="sub" variant="itemgroup" file="strc-itm.mkvi"/>
+        <cd:command name="its" scope="itemgroup" file="strc-itm.mkvi"/>
 
-    <cd:command name="its" variant="itemgroup" file="strc-itm.mkvi"/>
+    -->
 
-    <cd:command name="item" type="environment" file="strc-itm.mkvi">
+    <cd:command name="item" type="environment" scope="itemgroup" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="head" type="environment" file="strc-itm.mkvi">
+    <cd:command name="head" type="environment" scope="itemgroup" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference-list-optional"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="specialitem" type="environment" variant="1" file="strc-itm.mkvi">
+    <cd:command name="specialitem" type="environment" variant="item" scope="itemgroup" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="item" default="yes"/>
@@ -500,7 +543,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="specialitem" type="environment" variant="2" file="strc-itm.mkvi">
+    <cd:command name="specialitem" type="environment" variant="symbol" scope="itemgroup" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="sym"/>
@@ -511,7 +554,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="specialitem" type="environment" variant="3" file="strc-itm.mkvi">
+    <cd:command name="specialitem" type="environment" variant="none" scope="itemgroup" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="sub"/>
@@ -531,4 +574,19 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="setupitemize" file="strc-itm.mkvi">
+        <cd:arguments>
+            <cd:keywords list="yes" optional="yes">
+                <cd:constant type="each"/>
+                <cd:constant type="cd:number"/>
+            </cd:keywords>
+            <cd:keywords list="yes" optional="yes">
+                <cd:inherit name="setupitemgroup"/>
+            </cd:keywords>
+            <cd:assignments list="yes" optional="yes">
+                <cd:inherit name="setupitemgroup"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>