2016-11-22 20:10:00

1 files changed, 96 insertions, 96 deletions

diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml
index 564fb1340..e13b009ea 100644
--- a/tex/context/interface/mkiv/i-register.xml
+++ b/tex/context/interface/mkiv/i-register.xml
@@ -344,35 +344,31 @@
         </cd:arguments>
     </cd:command>
 
-    <!--
-
-        <cd:command name="setupregisters" variant="argument" file="strc-reg.mkiv">
-            <cd:arguments>
-                <cd:resolve name="keyword-name-list-optional"/>
-                <cd:resolve name="keyword-number-list-optional"/>
-                <cd:assignments list="yes">
-                    <cd:inherit name="setupregister"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-        <cd:command name="setupregisters" file="strc-reg.mkiv">
-            <cd:arguments>
-                <cd:keywords 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="setupregister"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
+    <cd:command name="setupregisters" variant="argument" file="strc-reg.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name-list-optional"/>
+            <cd:resolve name="keyword-number-list-optional"/>
+            <cd:assignments list="yes">
+                <cd:inherit name="setupregister"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
 
-    -->
+    <cd:command name="setupregisters" file="strc-reg.mkiv">
+        <cd:arguments>
+            <cd:keywords 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="setupregister"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
 
-    <cd:command name="register" generated="yes" variant="example" file="strc-reg.mkiv">
+    <cd:command name="register" generated="yes" variant="instance" file="strc-reg.mkiv">
         <cd:sequence>
-            <cd:variable value="register"/>
+            <cd:instance value="register"/>
         </cd:sequence>
         <cd:arguments>
             <cd:keywords optional="yes">
@@ -382,13 +378,13 @@
             <cd:index list="yes"/>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="index"/>
+            <cd:resolve name="instance-register"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="register" generated="yes" variant="example:ownnumber" file="strc-reg.mkiv">
+    <cd:command name="register" generated="yes" variant="instance:ownnumber" file="strc-reg.mkiv">
         <cd:sequence>
-            <cd:variable value="register"/>
+            <cd:instance value="register"/>
         </cd:sequence>
         <cd:arguments>
             <cd:keywords optional="yes">
@@ -399,14 +395,14 @@
             <cd:index list="yes"/>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="index"/>
+            <cd:resolve name="instance-register"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="seeregister" generated="yes" variant="example" file="strc-reg.mkiv">
+    <cd:command name="seeregister" generated="yes" variant="instance" file="strc-reg.mkiv">
         <cd:sequence>
             <cd:string value="see"/>
-            <cd:variable value="register"/>
+            <cd:instance value="register"/>
         </cd:sequence>
         <cd:arguments>
             <cd:keywords optional="yes">
@@ -420,14 +416,14 @@
             </cd:keywords>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="index"/>
+            <cd:resolve name="instance-register"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="placeregister" generated="yes" variant="example" file="strc-reg.mkiv">
+    <cd:command name="placeregister" generated="yes" variant="instance" file="strc-reg.mkiv">
         <cd:sequence>
             <cd:string value="place"/>
-            <cd:variable value="register"/>
+            <cd:instance value="register"/>
         </cd:sequence>
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
@@ -435,14 +431,14 @@
             </cd:assignments>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="index"/>
+            <cd:resolve name="instance-register"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="completeregister" generated="yes" variant="example" file="strc-reg.mkiv">
+    <cd:command name="completeregister" generated="yes" variant="instance" file="strc-reg.mkiv">
         <cd:sequence>
             <cd:string value="complete"/>
-            <cd:variable value="register"/>
+            <cd:instance value="register"/>
         </cd:sequence>
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
@@ -450,14 +446,14 @@
             </cd:assignments>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="index"/>
+            <cd:resolve name="instance-register"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="setupregister" generated="yes" variant="example" file="strc-reg.mkiv">
+    <cd:command name="setupregister" generated="yes" variant="instance" file="strc-reg.mkiv">
         <cd:sequence>
             <cd:string value="setup"/>
-            <cd:variable value="register"/>
+            <cd:instance value="register"/>
         </cd:sequence>
         <cd:arguments>
             <cd:resolve name="keyword-number-list-optional"/>
@@ -466,69 +462,73 @@
             </cd:assignments>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="index"/>
+            <cd:resolve name="instance-register"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="index" file="strc-reg.mkiv">
-        <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="cd:text"/>
-                <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
-            </cd:keywords>
-            <cd:index list="yes"/>
-        </cd:arguments>
-    </cd:command>
+    <!--
 
-    <cd:command name="index" variant="ownnumber" file="strc-reg.mkiv">
-        <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="cd:text"/>
-                <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
-            </cd:keywords>
-            <cd:resolve name="argument-text"/>
-            <cd:index list="yes"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="index" file="strc-reg.mkiv">
+            <cd:arguments>
+                <cd:keywords optional="yes">
+                    <cd:constant type="cd:text"/>
+                    <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
+                </cd:keywords>
+                <cd:index list="yes"/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="seeindex" file="strc-reg.mkiv">
-        <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="cd:text"/>
-                <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
-            </cd:keywords>
-            <cd:index list="yes"/>
-            <cd:keywords delimiters="braces">
-                <cd:constant type="cd:text"/>
-                <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="index" variant="ownnumber" file="strc-reg.mkiv">
+            <cd:arguments>
+                <cd:keywords optional="yes">
+                    <cd:constant type="cd:text"/>
+                    <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
+                </cd:keywords>
+                <cd:resolve name="argument-text"/>
+                <cd:index list="yes"/>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="placeindex" file="strc-reg.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupregister"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="seeindex" file="strc-reg.mkiv">
+            <cd:arguments>
+                <cd:keywords optional="yes">
+                    <cd:constant type="cd:text"/>
+                    <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
+                </cd:keywords>
+                <cd:index list="yes"/>
+                <cd:keywords delimiters="braces">
+                    <cd:constant type="cd:text"/>
+                    <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="completeindex" file="strc-reg.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupregister"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="placeindex" file="strc-reg.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupregister"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="setupindex" file="strc-reg.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-number-list-optional"/>
-            <cd:assignments list="yes">
-                <cd:inherit name="setupregister"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="completeindex" file="strc-reg.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupregister"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="setupindex" file="strc-reg.mkiv">
+            <cd:arguments>
+                <cd:resolve name="keyword-number-list-optional"/>
+                <cd:assignments list="yes">
+                    <cd:inherit name="setupregister"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+    -->
 
     <cd:command name="startregister" file="strc-reg.mkiv">
         <cd:arguments>