summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml')
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml68
1 files changed, 32 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml
index 2128464ef88..8831a8b0bcc 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml
@@ -113,7 +113,7 @@
</cd:arguments>
</cd:command>
- <cd:command file="page-mak.mkvi" name="makeup" type="environment">
+ <cd:command name="makeup" type="environment" file="page-mak.mkvi">
<cd:arguments>
<cd:resolve name="keyword-name"/>
<cd:assignments list="yes" optional="yes">
@@ -122,9 +122,9 @@
</cd:arguments>
</cd:command>
- <cd:command file="page-mak.mkvi" generated="yes" name="makeup" type="environment" variant="generated">
+ <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,47 +133,43 @@
</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="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="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="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="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: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>
-->