2019-07-31 18:13:00

1 files changed, 74 insertions, 257 deletions

diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml
index f0f515fbc..f13d88021 100644
--- a/tex/context/interface/mkiv/i-texts.xml
+++ b/tex/context/interface/mkiv/i-texts.xml
@@ -4,97 +4,68 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <!--
-
-        <cd:command name="definelayoutelement" level="system" category="layout" file="page-txt.mkvi">
-            <cd:arguments>
-                <cd:resolve name="keyword-name"/>
-                <cd:resolve name="keyword-name-optional"/>
-                <cd:assignments list="yes" optional="yes">
-                    <cd:inherit name="setuplayoutelement"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-        <cd:command name="setuplayoutelement" level="system" category="layout" file="page-txt.mkvi">
-            <cd:arguments>
-                <cd:resolve name="keyword-name-list-optional"/>
-                <cd:assignments list="yes">
-                    <cd:parameter name="state">
-                        <cd:constant type="start"/>
-                        <cd:constant type="stop"/>
-                        <cd:constant type="empty"/>
-                        <cd:constant type="high"/>
-                        <cd:constant type="none"/>
-                        <cd:constant type="normal" default="yes"/>
-                        <cd:constant type="nomarking"/>
-                        <cd:constant type="cd:name"/>
-                    </cd:parameter>
-                    <cd:parameter name="style">
-                        <cd:resolve name="value-style"/>
-                    </cd:parameter>
-                    <cd:parameter name="color">
-                        <cd:constant type="cd:color"/>
-                    </cd:parameter>
-                    <cd:parameter name="strut">
-                        <cd:constant type="yes" default="yes"/>
-                        <cd:constant type="no"/>
-                    </cd:parameter>
-                    <cd:parameter name="n">
-                        <cd:constant type="cd:number"/>
-                    </cd:parameter>
-                    <cd:parameter name="before">
-                        <cd:constant type="cd:command"/>
-                    </cd:parameter>
-                    <cd:parameter name="after">
-                        <cd:constant type="cd:command"/>
-                    </cd:parameter>
-                    <cd:parameter name="leftstyle">
-                        <cd:resolve name="value-style"/>
-                    </cd:parameter>
-                    <cd:parameter name="rightstyle">
-                        <cd:resolve name="value-style"/>
-                    </cd:parameter>
-                    <cd:parameter name="leftcolor">
-                        <cd:constant type="cd:color"/>
-                    </cd:parameter>
-                    <cd:parameter name="rightcolor">
-                        <cd:constant type="cd:color"/>
-                    </cd:parameter>
-                    <cd:parameter name="width">
-                        <cd:constant type="cd:dimension"/>
-                    </cd:parameter>
-                    <cd:parameter name="leftwidth">
-                        <cd:constant type="cd:dimension"/>
-                    </cd:parameter>
-                    <cd:parameter name="rightwidth">
-                        <cd:constant type="cd:dimension"/>
-                    </cd:parameter>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-        <cd:command name="setuplayouttext" level="system" category="layout" file="page-txt.mkvi">
-            <cd:arguments>
-                <cd:keywords>
-                    <cd:constant type="top"/>
-                    <cd:constant type="header"/>
-                    <cd:constant type="text"/>
-                    <cd:constant type="footer"/>
-                    <cd:constant type="bottom"/>
-                </cd:keywords>
-                <cd:keywords optional="yes">
-                    <cd:constant type="text"/>
-                    <cd:constant type="margin"/>
-                    <cd:constant type="edge"/>
-                </cd:keywords>
-                <cd:assignments list="yes">
-                    <cd:inherit name="setuplayoutelement"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-    -->
+    <cd:define name="keyword-setuplayouttext">
+        <cd:keywords optional="yes">
+            <cd:constant type="text"/>
+            <cd:constant type="margin"/>
+            <cd:constant type="edge"/>
+        </cd:keywords>
+    </cd:define>
+
+    <cd:define name="assignment-setuplayouttext">
+        <cd:assignments list="yes">
+            <cd:parameter name="state">
+                <cd:constant type="start"/>
+                <cd:constant type="stop"/>
+                <cd:constant type="empty"/>
+                <cd:constant type="high"/>
+                <cd:constant type="none"/>
+                <cd:constant type="normal" default="yes"/>
+                <cd:constant type="nomarking"/>
+                <cd:constant type="cd:name"/>
+            </cd:parameter>
+            <cd:parameter name="style">
+                <cd:resolve name="value-style"/>
+            </cd:parameter>
+            <cd:parameter name="color">
+                <cd:constant type="cd:color"/>
+            </cd:parameter>
+            <cd:parameter name="strut">
+                <cd:constant type="yes" default="yes"/>
+                <cd:constant type="no"/>
+            </cd:parameter>
+            <cd:parameter name="n">
+                <cd:constant type="cd:number"/>
+            </cd:parameter>
+            <cd:parameter name="before">
+                <cd:constant type="cd:command"/>
+            </cd:parameter>
+            <cd:parameter name="after">
+                <cd:constant type="cd:command"/>
+            </cd:parameter>
+            <cd:parameter name="leftstyle">
+                <cd:resolve name="value-style"/>
+            </cd:parameter>
+            <cd:parameter name="rightstyle">
+                <cd:resolve name="value-style"/>
+            </cd:parameter>
+            <cd:parameter name="leftcolor">
+                <cd:constant type="cd:color"/>
+            </cd:parameter>
+            <cd:parameter name="rightcolor">
+                <cd:constant type="cd:color"/>
+            </cd:parameter>
+            <cd:parameter name="width">
+                <cd:constant type="cd:dimension"/>
+            </cd:parameter>
+            <cd:parameter name="leftwidth">
+                <cd:constant type="cd:dimension"/>
+            </cd:parameter>
+            <cd:parameter name="rightwidth">
+                <cd:constant type="cd:dimension"/>
+            </cd:parameter>
+        </cd:assignments>
+    </cd:define>
 
     <cd:command name="setuplayouttext" level="style" category="layout" file="page-txt.mkvi">
         <cd:arguments>
@@ -105,197 +76,43 @@
                 <cd:constant type="footer"/>
                 <cd:constant type="bottom"/>
             </cd:keywords>
-            <cd:keywords optional="yes">
-                <cd:constant type="text"/>
-                <cd:constant type="margin"/>
-                <cd:constant type="edge"/>
-            </cd:keywords>
-            <cd:assignments list="yes">
-                <cd:parameter name="state">
-                    <cd:constant type="start"/>
-                    <cd:constant type="stop"/>
-                    <cd:constant type="empty"/>
-                    <cd:constant type="high"/>
-                    <cd:constant type="none"/>
-                    <cd:constant type="normal" default="yes"/>
-                    <cd:constant type="nomarking"/>
-                    <cd:constant type="cd:name"/>
-                </cd:parameter>
-                <cd:parameter name="style">
-                    <cd:resolve name="value-style"/>
-                </cd:parameter>
-                <cd:parameter name="color">
-                    <cd:constant type="cd:color"/>
-                </cd:parameter>
-                <cd:parameter name="strut">
-                    <cd:constant type="yes" default="yes"/>
-                    <cd:constant type="no"/>
-                </cd:parameter>
-                <cd:parameter name="n">
-                    <cd:constant type="cd:number"/>
-                </cd:parameter>
-                <cd:parameter name="before">
-                    <cd:constant type="cd:command"/>
-                </cd:parameter>
-                <cd:parameter name="after">
-                    <cd:constant type="cd:command"/>
-                </cd:parameter>
-                <cd:parameter name="leftstyle">
-                    <cd:resolve name="value-style"/>
-                </cd:parameter>
-                <cd:parameter name="rightstyle">
-                    <cd:resolve name="value-style"/>
-                </cd:parameter>
-                <cd:parameter name="leftcolor">
-                    <cd:constant type="cd:color"/>
-                </cd:parameter>
-                <cd:parameter name="rightcolor">
-                    <cd:constant type="cd:color"/>
-                </cd:parameter>
-                <cd:parameter name="width">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="leftwidth">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="rightwidth">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-            </cd:assignments>
+            <cd:resolve name="keyword-setuplayouttext"/>
+            <cd:resolve name="assignment-setuplayouttext"/>
         </cd:arguments>
     </cd:command>
 
-    <!--
-
-        <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi">
-            <cd:arguments>
-                <cd:keywords optional="yes">
-                    <cd:constant type="text"/>
-                    <cd:constant type="margin"/>
-                    <cd:constant type="edge"/>
-                </cd:keywords>
-                <cd:assignments list="yes">
-                    <cd:inherit name="setuplayoutelement"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-        <cd:command name="setupheader" level="style" category="layout" file="page-txt.mkvi">
-            <cd:arguments>
-                <cd:keywords optional="yes">
-                    <cd:constant type="text"/>
-                    <cd:constant type="margin"/>
-                    <cd:constant type="edge"/>
-                </cd:keywords>
-                <cd:assignments list="yes">
-                    <cd:inherit name="setuplayoutelement"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-        <cd:command name="setuptext" level="style" category="layout" file="page-txt.mkvi">
-            <cd:arguments>
-                <cd:keywords optional="yes">
-                    <cd:constant type="text"/>
-                    <cd:constant type="margin"/>
-                    <cd:constant type="edge"/>
-                </cd:keywords>
-                <cd:assignments list="yes">
-                    <cd:inherit name="setuplayoutelement"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-        <cd:command name="setupfooter" level="style" category="layout" file="page-txt.mkvi">
-            <cd:arguments>
-                <cd:keywords optional="yes">
-                    <cd:constant type="text"/>
-                    <cd:constant type="margin"/>
-                    <cd:constant type="edge"/>
-                </cd:keywords>
-                <cd:assignments list="yes">
-                    <cd:inherit name="setuplayoutelement"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-        <cd:command name="setupbottom" level="style" category="layout" file="page-txt.mkvi">
-            <cd:arguments>
-                <cd:keywords optional="yes">
-                    <cd:constant type="text"/>
-                    <cd:constant type="margin"/>
-                    <cd:constant type="edge"/>
-                </cd:keywords>
-                <cd:assignments list="yes">
-                    <cd:inherit name="setuplayoutelement"/>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-    -->
-
     <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi">
         <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="text"/>
-                <cd:constant type="margin"/>
-                <cd:constant type="edge"/>
-            </cd:keywords>
-            <cd:assignments list="yes">
-                <cd:inherit name="setuplayouttext"/>
-            </cd:assignments>
+            <cd:resolve name="keyword-setuplayouttext"/>
+            <cd:resolve name="assignment-setuplayouttext"/>
         </cd:arguments>
     </cd:command>
 
     <cd:command name="setupheader" level="style" category="layout" file="page-txt.mkvi">
         <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="text"/>
-                <cd:constant type="margin"/>
-                <cd:constant type="edge"/>
-            </cd:keywords>
-            <cd:assignments list="yes">
-                <cd:inherit name="setuplayouttext"/>
-            </cd:assignments>
+            <cd:resolve name="keyword-setuplayouttext"/>
+            <cd:resolve name="assignment-setuplayouttext"/>
         </cd:arguments>
     </cd:command>
 
     <cd:command name="setuptext" level="style" category="layout" file="page-txt.mkvi">
         <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="text"/>
-                <cd:constant type="margin"/>
-                <cd:constant type="edge"/>
-            </cd:keywords>
-            <cd:assignments list="yes">
-                <cd:inherit name="setuplayouttext"/>
-            </cd:assignments>
+            <cd:resolve name="keyword-setuplayouttext"/>
+            <cd:resolve name="assignment-setuplayouttext"/>
         </cd:arguments>
     </cd:command>
 
     <cd:command name="setupfooter" level="style" category="layout" file="page-txt.mkvi">
         <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="text"/>
-                <cd:constant type="margin"/>
-                <cd:constant type="edge"/>
-            </cd:keywords>
-            <cd:assignments list="yes">
-                <cd:inherit name="setuplayouttext"/>
-            </cd:assignments>
+            <cd:resolve name="keyword-setuplayouttext"/>
+            <cd:resolve name="assignment-setuplayouttext"/>
         </cd:arguments>
     </cd:command>
 
     <cd:command name="setupbottom" level="style" category="layout" file="page-txt.mkvi">
         <cd:arguments>
-            <cd:keywords optional="yes">
-                <cd:constant type="text"/>
-                <cd:constant type="margin"/>
-                <cd:constant type="edge"/>
-            </cd:keywords>
-            <cd:assignments list="yes">
-                <cd:inherit name="setuplayouttext"/>
-            </cd:assignments>
+            <cd:resolve name="keyword-setuplayouttext"/>
+            <cd:resolve name="assignment-setuplayouttext"/>
         </cd:arguments>
     </cd:command>