1 files changed, 34 insertions, 24 deletions

diff --git a/tex/context/interface/mkiv/i-tooltip.xml b/tex/context/interface/mkiv/i-tooltip.xml
index 775d0abcf..f46ffb091 100644
--- a/tex/context/interface/mkiv/i-tooltip.xml
+++ b/tex/context/interface/mkiv/i-tooltip.xml
@@ -28,9 +28,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tooltip" generated="yes" variant="generated:1" file="scrn-fld.mkvi">
+    <cd:command name="tooltip" generated="yes" variant="instance" file="scrn-fld.mkvi">
         <cd:sequence>
-            <cd:variable value="tooltip"/>
+            <cd:instance value="tooltip"/>
         </cd:sequence>
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
@@ -39,11 +39,14 @@
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
+        <cd:instances>
+            <cd:resolve name="instance-tooltip"/>
+        </cd:instances>
     </cd:command>
 
-    <cd:command name="tooltip" generated="yes" variant="generated:2" file="scrn-fld.mkvi">
+    <cd:command name="tooltip" generated="yes" variant="instance:argument" file="scrn-fld.mkvi">
         <cd:sequence>
-            <cd:variable value="tooltip"/>
+            <cd:instance value="tooltip"/>
         </cd:sequence>
         <cd:arguments>
             <cd:keywords optional="yes">
@@ -54,28 +57,35 @@
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
+        <cd:instances>
+            <cd:resolve name="instance-tooltip"/>
+        </cd:instances>
     </cd:command>
 
-    <cd:command name="tooltip" variant="1" file="scrn-fld.mkvi">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuptooltip"/>
-            </cd:assignments>
-            <cd:resolve name="argument-text"/>
-            <cd:resolve name="argument-text"/>
-        </cd:arguments>
-    </cd:command>
+    <!--
 
-    <cd:command name="tooltip" variant="2" file="scrn-fld.mkvi">
-        <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="left"/>
-                <cd:constant type="middle"/>
-                <cd:constant type="right"/>
-            </cd:keywords>
-            <cd:resolve name="argument-text"/>
-            <cd:resolve name="argument-text"/>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="tooltip" file="scrn-fld.mkvi">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setuptooltip"/>
+                </cd:assignments>
+                <cd:resolve name="argument-text"/>
+                <cd:resolve name="argument-text"/>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="tooltip" variant="argument" file="scrn-fld.mkvi">
+            <cd:arguments>
+                <cd:keywords optional="yes">
+                    <cd:constant type="left"/>
+                    <cd:constant type="middle"/>
+                    <cd:constant type="right"/>
+                </cd:keywords>
+                <cd:resolve name="argument-text"/>
+                <cd:resolve name="argument-text"/>
+            </cd:arguments>
+        </cd:command>
+
+    -->
 
 </cd:interface>