1 files changed, 28 insertions, 25 deletions
diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml
index 29816601f..8c2003568 100644
--- a/tex/context/interface/mkiv/i-fittingpage.xml
+++ b/tex/context/interface/mkiv/i-fittingpage.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definefittingpage" file="page-app.mkiv">
+    <cd:command name="definefittingpage" level="style" category="background layout" file="page-app.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfittingpage" file="page-app.mkiv">
+    <cd:command name="setupfittingpage" level="style" category="background layout" file="page-app.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -33,7 +33,7 @@
                 </cd:parameter>
                 <cd:parameter name="paper">
                     <cd:constant type="auto"/>
-                    <cd:constant type="defaut" default="yes"/>
+                    <cd:constant type="default" default="yes"/>
                     <cd:constant type="cd:name"/>
                 </cd:parameter>
                 <cd:inherit name="setupframed"/>
@@ -41,7 +41,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fittingpage" type="environment" file="page-app.mkiv">
+    <cd:command name="fittingpage" type="environment" level="document" category="background layout" file="page-app.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -50,9 +50,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fittingpage" type="environment" generated="yes" variant="example" file="page-app.mkiv">
+    <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" category="background layout" file="page-app.mkiv">
         <cd:sequence>
-            <cd:variable value="fittingpage"/>
+            <cd:instance value="fittingpage"/>
         </cd:sequence>
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
@@ -60,36 +60,39 @@
             </cd:assignments>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="TEXpage"/>
-            <cd:constant value="MPpage"/>
+            <cd:resolve name="instance-fittingpage"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="TEXpage" type="environment" file="page-app.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupfittingpage"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+    <!--
 
-    <cd:command name="setupTEXpage" file="page-app.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes">
-                <cd:inherit name="setupfittingpage"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="TEXpage" type="environment" level="document" category="background layout" file="page-app.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupfittingpage"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="MPpage" type="environment" file="meta-fig.mkiv">
+        <cd:command name="MPpage" type="environment" level="document" category="background layout metapost" file="meta-fig.mkiv">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupfittingpage"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+    -->
+
+    <cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv">
         <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
+            <cd:assignments list="yes">
                 <cd:inherit name="setupfittingpage"/>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupMPpage" file="meta-fig.mkiv">
+    <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupfittingpage"/>