1 files changed, 41 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml
index 1c214322a19..c7633aa912a 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml
@@ -4,8 +4,6 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <?context-directive job ctxfile x-setups.ctx ?>
-
     <cd:command name="defineframed" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
@@ -93,9 +91,7 @@
                     <cd:constant type="none"/>
                 </cd:parameter>
                 <cd:parameter name="background">
-                    <cd:constant type="foreground"/>
-                    <cd:constant type="color"/>
-                    <cd:constant type="cd:name"/>
+                    <cd:resolve name="value-background"/>
                 </cd:parameter>
                 <cd:parameter name="backgroundoffset">
                     <cd:constant type="frame"/>
@@ -142,6 +138,7 @@
                 <cd:parameter name="strut">
                     <cd:constant type="yes" default="yes"/>
                     <cd:constant type="no"/>
+                    <cd:constant type="none"/>
                     <cd:constant type="local"/>
                     <cd:constant type="global"/>
                 </cd:parameter>
@@ -161,6 +158,7 @@
                     <cd:constant type="lohi"/>
                     <cd:constant type="hanging"/>
                     <cd:constant type="keep"/>
+                    <cd:constant type="formula"/>
                     <cd:constant type="mathematics"/>
                     <cd:constant type="normal" default="yes"/>
                 </cd:parameter>
@@ -243,7 +241,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framed" generated="yes" variant="generated" file="pack-rul.mkiv">
+    <cd:command name="framed" generated="yes" variant="example" file="pack-rul.mkiv">
         <cd:sequence>
             <cd:variable value="framed"/>
         </cd:sequence>
@@ -253,6 +251,10 @@
             </cd:assignments>
             <cd:content/>
         </cd:arguments>
+        <cd:instances>
+            <cd:constant value="unframed"/>
+            <cd:constant value="fitfieldframed"/>
+        </cd:instances>
     </cd:command>
 
     <cd:command name="normalframedwithsettings" file="pack-rul.mkiv">
@@ -357,7 +359,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mathframed" generated="yes" variant="generated" file="pack-rul.mkiv">
+    <cd:command name="mathframed" generated="yes" variant="example" file="pack-rul.mkiv">
         <cd:sequence>
             <cd:variable value="mathframed"/>
         </cd:sequence>
@@ -367,6 +369,11 @@
             </cd:assignments>
             <cd:content/>
         </cd:arguments>
+        <cd:instances>
+            <cd:constant value="mframed"/>
+            <cd:constant value="inmframed"/>
+            <cd:constant value="mcframed"/>
+        </cd:instances>
     </cd:command>
 
     <cd:command name="mframed" file="pack-rul.mkiv">
@@ -396,6 +403,25 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="defineformulaframed" file="math-for.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name"/>
+            <cd:resolve name="keyword-name-optional"/>
+            <cd:assignments list="yes" optional="yes">
+                <cd:inherit name="setupformulaframed"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="setupformulaframed" file="math-for.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name-list-optional"/>
+            <cd:assignments list="yes">
+                <cd:inherit name="setupframed"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
     <cd:command name="defineframedtext" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
@@ -460,7 +486,7 @@
 
     -->
 
-    <cd:command name="framedtext" generated="yes" variant="generated" file="pack-rul.mkiv">
+    <cd:command name="framedtext" generated="yes" variant="example" file="pack-rul.mkiv">
         <cd:sequence>
             <cd:variable value="framedtext"/>
         </cd:sequence>
@@ -470,9 +496,12 @@
             </cd:assignments>
             <cd:content/>
         </cd:arguments>
+        <cd:instances>
+            <cd:constant value="framedtext"/>
+        </cd:instances>
     </cd:command>
 
-    <cd:command name="framedtext" type="environment" generated="yes" variant="generated" file="pack-rul.mkiv">
+    <cd:command name="framedtext" type="environment" generated="yes" variant="example" file="pack-rul.mkiv">
         <cd:sequence>
             <cd:variable value="framedtext"/>
         </cd:sequence>
@@ -487,6 +516,9 @@
                 <cd:inherit name="setupframedtext"/>
             </cd:assignments>
         </cd:arguments>
+        <cd:instances>
+            <cd:constant value="framedtext"/>
+        </cd:instances>
     </cd:command>
 
     <cd:command name="framedtext" file="pack-rul.mkiv">