diff options
| author | Hans Hagen <pragma@wxs.nl> | 2020-11-23 19:48:34 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2020-11-23 19:48:34 +0100 |
| commit | 18499e46a49b8ccf4346686d1cf626ada33935b8 (patch) | |
| tree | bd0ae7b601b323e20954c10c07598637d9403e00 /tex/context/interface/mkiv/i-columns.xml | |
| parent | 4b089e589d39346a66a27d04f9857fe16e4b7b41 (diff) | |
| download | context-18499e46a49b8ccf4346686d1cf626ada33935b8.tar.gz | |
2020-11-23 18:39:00
Diffstat (limited to 'tex/context/interface/mkiv/i-columns.xml')
| -rw-r--r-- | tex/context/interface/mkiv/i-columns.xml | 108 |
1 files changed, 19 insertions, 89 deletions
diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml index 72260b820..9890ec46f 100644 --- a/tex/context/interface/mkiv/i-columns.xml +++ b/tex/context/interface/mkiv/i-columns.xml @@ -4,8 +4,19 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupcolumns" level="style" category="columns" file="page-mul.mkiv"> + <cd:command name="definemulticolumns" level="style" category="tables" file="page-mcl.mkxl"> <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments optional="yes" list="yes"> + <cd:inherit name="setupmulticolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupmulticolumns" level="style" category="columns" file="page-mcl.mkxl"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="n"> <cd:constant type="cd:number"/> @@ -13,112 +24,31 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> - <cd:parameter name="option"> - <cd:constant type="background"/> - </cd:parameter> - <cd:parameter name="offset"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="command"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="height"> - <cd:constant type="cd:dimension"/> - </cd:parameter> <cd:parameter name="direction"> - <cd:constant type="left"/> <cd:constant type="right" default="yes"/> + <cd:constant type="reverse"/> </cd:parameter> <cd:parameter name="balance"> <cd:constant type="yes" default="yes"/> <cd:constant type="no"/> </cd:parameter> - <cd:parameter name="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> - <cd:parameter name="tolerance"> - <cd:inherit name="setuptolerance"/> - </cd:parameter> <cd:parameter name="blank"> <cd:inherit name="blank"/> </cd:parameter> - <cd:parameter name="ntop"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="rule"> - <cd:constant type="on"/> - <cd:constant type="off" default="yes"/> - <cd:constant type="cd:command"/> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> </cd:parameter> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="columns" type="environment" level="document" category="columns" file="page-mul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcolumns"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="setupcolumnspan" level="style" category="columns" file="page-mul.mkiv"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="n"> + <cd:parameter name="ntop"> <cd:constant type="cd:number"/> </cd:parameter> - <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="columnspan" type="environment" level="document" category="columns" file="page-mul.mkiv"> + <cd:command name="multicolumns" type="environment" level="document" category="tables" file="page-mcl.mkxl"> <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcolumnspan"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <!-- - - <cd:command name="setsimplecolumnshsize" level="system" category="columns" file="page-mul.mkiv"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="width"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="lines"> - <cd:constant type="cd:number"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="simplecolumns" type="environment" level="system" category="columns" file="page-mul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="width"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="lines"> - <cd:constant type="cd:number"/> - </cd:parameter> + <cd:assignments optional="yes" list="yes"> + <cd:inherit name="setupmulticolumns"/> </cd:assignments> </cd:arguments> </cd:command> |