context beta/cont-tmf.zip (Apr 16 12:55)

git-svn-id: svn://tug.org/texlive/trunk@43931 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 122 insertions, 112 deletions

diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml
index 7026d2b10d8..b23f57efe9d 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml
@@ -75,9 +75,9 @@
                 </cd:parameter>
             </cd:assignments>
         </cd:arguments>
-    </cd:command>        
+    </cd:command>
 
-    <cd:command name="type" variant="1" file="buff-ver.mkiv">
+    <cd:command name="type" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuptype"/>
@@ -86,7 +86,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="type" variant="2" file="buff-ver.mkiv">
+    <cd:command name="type" variant="angles" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuptype"/>
@@ -95,7 +95,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typ" variant="1" file="buff-ver.mkiv">
+    <cd:command name="typ" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuptype"/>
@@ -104,7 +104,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typ" variant="2" file="buff-ver.mkiv">
+    <cd:command name="typ" variant="angles" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuptype"/>
@@ -113,7 +113,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="type" generated="yes" variant="generated:1" file="buff-ver.mkiv">
+    <cd:command name="type" generated="yes" variant="example" file="buff-ver.mkiv">
         <cd:sequence>
             <cd:variable value="type"/>
         </cd:sequence>
@@ -125,7 +125,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="type" generated="yes" variant="generated:2" file="buff-ver.mkiv">
+    <cd:command name="type" generated="yes" variant="example:angles" file="buff-ver.mkiv">
         <cd:sequence>
             <cd:variable value="type"/>
         </cd:sequence>
@@ -149,7 +149,7 @@
 
     <cd:command name="setuptyping" file="buff-ver.mkiv">
         <cd:arguments>
-            <cd:resolve name="keyword-name-optional-list"/>
+            <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
                 <cd:parameter name="oddmargin">
                     <cd:constant type="cd:dimension"/>
@@ -251,42 +251,32 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typing" type="environment" variant="1" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuptyping"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="typing" type="environment" variant="2" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:constant type="continue"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="typing" type="environment" generated="yes" variant="generated:1" file="buff-ver.mkiv">
+    <cd:command name="typing" type="environment" generated="yes" variant="instance" file="buff-ver.mkiv">
         <cd:sequence>
-            <cd:variable value="typing"/>
+            <cd:instance value="typing"/>
         </cd:sequence>
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuptyping"/>
             </cd:assignments>
         </cd:arguments>
+        <cd:instances>
+            <cd:resolve name="instance-typing"/>
+        </cd:instances>
     </cd:command>
 
-    <cd:command name="typing" type="environment" generated="yes" variant="generated:2" file="buff-ver.mkiv">
+    <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" file="buff-ver.mkiv">
         <cd:sequence>
-            <cd:variable value="typing"/>
+            <cd:instance value="typing"/>
         </cd:sequence>
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="continue"/>
             </cd:keywords>
         </cd:arguments>
+        <cd:instances>
+            <cd:resolve name="instance-typing"/>
+        </cd:instances>
     </cd:command>
 
     <cd:command name="tex" file="buff-ver.mkiv">
@@ -363,87 +353,107 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="LUA" type="environment" variant="1" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuptyping"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="LUA" type="environment" variant="2" file="buff-ver.mkiv">
-        <cd:sequence>
-            <cd:variable value="lua"/>
-        </cd:sequence>
-        <cd:arguments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:constant type="continue"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="MP" type="environment" variant="1" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuptyping"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="MP" type="environment" variant="2" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:constant type="continue"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="XML" type="environment" variant="1" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuptyping"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="XML" type="environment" variant="2" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:constant type="continue"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="PARSEDXML" type="environment" variant="1" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuptyping"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="PARSEDXML" type="environment" variant="2" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:constant type="continue"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="TEX" type="environment" variant="1" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuptyping"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="TEX" type="environment" variant="2" file="buff-ver.mkiv">
-        <cd:arguments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:constant type="continue"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
-
-</cd:interface>
\ No newline at end of file
+    <!--
+
+        <cd:command name="typing" type="environment" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setuptyping"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="typing" type="environment" variant="argument" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:constant type="continue"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="LUA" type="environment" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setuptyping"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="LUA" type="environment" variant="argument" file="buff-ver.mkiv">
+            <cd:sequence>
+                <cd:variable value="lua"/>
+            </cd:sequence>
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:constant type="continue"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="MP" type="environment" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setuptyping"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="MP" type="environment" variant="argument" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:constant type="continue"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="XML" type="environment" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setuptyping"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="XML" type="environment" variant="argument" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:constant type="continue"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="PARSEDXML" type="environment" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setuptyping"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="PARSEDXML" type="environment" variant="argument" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:constant type="continue"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="TEX" type="environment" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setuptyping"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="TEX" type="environment" variant="argument" file="buff-ver.mkiv">
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:constant type="continue"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+    -->
+
+</cd:interface>