From f4ff686750ca9405662c7615e9c4b04685b5be5c Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Tue, 22 Nov 2016 20:44:35 +0100
Subject: 2016-11-22 20:10:00

---
 tex/context/interface/mkiv/i-makeup.xml | 69 +++++++++++++++++----------------
 1 file changed, 35 insertions(+), 34 deletions(-)

(limited to 'tex/context/interface/mkiv/i-makeup.xml')

diff --git a/tex/context/interface/mkiv/i-makeup.xml b/tex/context/interface/mkiv/i-makeup.xml
index 4424f9fde..8831a8b0b 100644
--- a/tex/context/interface/mkiv/i-makeup.xml
+++ b/tex/context/interface/mkiv/i-makeup.xml
@@ -122,9 +122,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="makeup" type="environment" generated="yes" variant="example" file="page-mak.mkvi">
+    <cd:command name="makeup" type="environment" generated="yes" variant="instance" file="page-mak.mkvi">
         <cd:sequence>
-            <cd:variable value="makeup"/>
+            <cd:instance value="makeup"/>
             <cd:string value="makeup"/>
         </cd:sequence>
         <cd:arguments>
@@ -133,43 +133,44 @@
             </cd:assignments>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="standard"/>
-            <cd:constant value="page"/>
-            <cd:constant value="text"/>
-            <cd:constant value="middle"/>
+            <cd:resolve name="instance-makeup"/>
         </cd:instances>
     </cd:command>
 
-    <cd:command name="standardmakeup" type="environment" file="page-mak.mkvi">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupmakeup"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+    <!--
 
-    <cd:command name="textmakeup" type="environment" file="page-mak.mkvi">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupmakeup"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="standardmakeup" type="environment" file="page-mak.mkvi">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupmakeup"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="pagemakeup" type="environment" file="page-mak.mkvi">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupmakeup"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="textmakeup" type="environment" file="page-mak.mkvi">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupmakeup"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
 
-    <cd:command name="middlemakeup" type="environment" file="page-mak.mkvi">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupmakeup"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
+        <cd:command name="pagemakeup" type="environment" file="page-mak.mkvi">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupmakeup"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="middlemakeup" type="environment" file="page-mak.mkvi">
+            <cd:arguments>
+                <cd:assignments list="yes" optional="yes">
+                    <cd:inherit name="setupmakeup"/>
+                </cd:assignments>
+            </cd:arguments>
+        </cd:command>
+
+    -->
 
 </cd:interface>
-- 
cgit v1.2.3