diff options
Diffstat (limited to 'tex/context/interface/mkiv/i-margindata.xml')
| -rw-r--r-- | tex/context/interface/mkiv/i-margindata.xml | 504 |
1 files changed, 234 insertions, 270 deletions
diff --git a/tex/context/interface/mkiv/i-margindata.xml b/tex/context/interface/mkiv/i-margindata.xml index 5a2b014ea..a54362fec 100644 --- a/tex/context/interface/mkiv/i-margindata.xml +++ b/tex/context/interface/mkiv/i-margindata.xml @@ -128,9 +128,9 @@ </cd:arguments> </cd:command> - <cd:command name="margindata" generated="yes" variant="generated" file="typo-mar.mkiv"> + <cd:command name="margindata" generated="yes" variant="instance" file="typo-mar.mkiv"> <cd:sequence> - <cd:variable value="margindata"/> + <cd:instance value="margindata"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -144,6 +144,9 @@ </cd:assignments> <cd:content/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-margindata"/> + </cd:instances> </cd:command> <cd:command name="margindata" file="typo-mar.mkiv"> @@ -162,292 +165,253 @@ </cd:arguments> </cd:command> - <cd:command name="inleftmargin" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="inrightmargin" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inleftmargin" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inoutermargin" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inrightmargin" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="ininnermargin" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inoutermargin" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inleftedge" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="ininnermargin" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inrightedge" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inleftedge" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="ininneredge" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inrightedge" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inouteredge" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="ininneredge" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="atleftmargin" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inouteredge" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="atrightmargin" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="atleftmargin" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inleft" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="atrightmargin" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inright" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inleft" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmarginframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="ininner" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inright" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmarginframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inouter" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="ininner" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmarginframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inmargin" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inouter" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmarginframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="inother" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inmargin" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmarginframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="margintext" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inother" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmarginframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="marginword" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="margintext" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="margintitle" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="marginword" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <!-- + <cd:command name="margintitle" file="typo-mar.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + <cd:inherit name="setupmargindata"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command name="inothermargin" file="typo-mar.mkiv"> <cd:arguments> @@ -466,4 +430,4 @@ --> -</cd:interface>
\ No newline at end of file +</cd:interface> |