diff options
Diffstat (limited to 'tex/context/interface')
33 files changed, 3263 insertions, 1263 deletions
diff --git a/tex/context/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml index c852ae515..ac2816578 100644 --- a/tex/context/interface/mkii/keys-it.xml +++ b/tex/context/interface/mkii/keys-it.xml @@ -150,6 +150,7 @@ <cd:variable name='comment' value='commento'/> <cd:variable name='component' value='componente'/> <cd:variable name='compressseparator' value='compressseparator'/> + <cd:variable name='compressstopper' value='compressstopper'/> <cd:variable name='concept' value='concetto'/> <cd:variable name='construction' value='construction'/> <cd:variable name='content' value='indice'/> @@ -480,6 +481,7 @@ <cd:variable name='sectionnumber' value='numerosezione'/> <cd:variable name='see' value='vedi'/> <cd:variable name='selectfont' value='selectfont'/> + <cd:variable name='separator' value='separator'/> <cd:variable name='september' value='settembre'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serifbold' value='serifbold'/> @@ -641,6 +643,7 @@ <cd:constant name='aligntitle' value='allineatitolo'/> <cd:constant name='alternative' value='alternativa'/> <cd:constant name='anchor' value='anchor'/> + <cd:constant name='anchoring' value='anchoring'/> <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arguments' value='arguments'/> @@ -738,7 +741,9 @@ <cd:constant name='compoundhyphen' value='compoundhyphen'/> <cd:constant name='compress' value='compress'/> <cd:constant name='compressdistance' value='compressdistance'/> + <cd:constant name='compressmethod' value='compressmethod'/> <cd:constant name='compressseparator' value='compressseparator'/> + <cd:constant name='compressstopper' value='compressstopper'/> <cd:constant name='concerns' value='concerns'/> <cd:constant name='connector' value='connector'/> <cd:constant name='continue' value='continua'/> diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index 9b1c7f57b..e90ec342e 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -652,6 +652,9 @@ <cd:parameter name="buffer"> <cd:constant type="cd:buffer"/> </cd:parameter> + <cd:parameter name="type"> + <cd:constant type="cd:name"/> + </cd:parameter> <cd:parameter name="state"> <cd:constant default="yes" type="start"/> <cd:constant type="stop"/> @@ -2432,7 +2435,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="naturalhbox"> + <cd:command file="supp-dir.mkiv" level="system" name="naturalhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2440,7 +2443,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="naturalvbox"> + <cd:command file="supp-dir.mkiv" level="system" name="naturalvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2448,7 +2451,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="naturalvtop"> + <cd:command file="supp-dir.mkiv" level="system" name="naturalvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2464,7 +2467,31 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="naturalhpack"> + <cd:command file="supp-dir.mkiv" level="system" name="naturalhpack"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command file="supp-dir.mkiv" level="system" name="naturalvpack"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command file="supp-dir.mkiv" level="system" name="naturaltpack"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command file="supp-dir.mkiv" level="system" name="reversehbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2472,7 +2499,39 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="naturalvpack"> + <cd:command file="supp-dir.mkiv" level="system" name="reversevbox"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command file="supp-dir.mkiv" level="system" name="reversevtop"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command file="supp-dir.mkiv" level="system" name="reversehpack"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command file="supp-dir.mkiv" level="system" name="reversevpack"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command file="supp-dir.mkiv" level="system" name="reversetpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2711,6 +2770,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlhbox"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> @@ -2719,6 +2786,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrhbox"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> @@ -2727,6 +2802,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlvbox"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> @@ -2735,6 +2818,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrvbox"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> @@ -2743,6 +2834,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlvtop"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> @@ -2751,6 +2850,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrvtop"> + <cd:arguments> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> @@ -3574,6 +3681,13 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="cap"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="mixedcaps"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -3595,6 +3709,20 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="capital"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="smallcaps"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="uppercased"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -5190,106 +5318,6 @@ </cd:arguments> </cd:command> </cd:interface> - <cd:interface file="i-columns.xml"> - <cd:command category="columns" file="page-mul.mkiv" level="style" name="setupcolumns"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <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 default="yes" type="right"/> - </cd:parameter> - <cd:parameter name="balance"> - <cd:constant default="yes" type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="align"> - <cd:inherit type="setupalign"/> - </cd:parameter> - <cd:parameter name="tolerance"> - <cd:inherit type="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 default="yes" type="off"/> - <cd:constant type="cd:command"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="columns" file="page-mul.mkiv" level="document" name="columns" type="environment"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcolumns"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="columns" file="page-mul.mkiv" level="style" name="setupcolumnspan"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:inherit name="setupframed"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="columns" file="page-mul.mkiv" level="document" name="columnspan" type="environment"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcolumnspan"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="columns" file="page-mul.mkiv" level="system" name="setsimplecolumnhsize"> - <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 category="columns" file="page-mul.mkiv" level="system" name="simplecolumns" type="environment"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setsimplecolumnhsize"/> - </cd:assignments> - </cd:arguments> - </cd:command> - </cd:interface> <cd:interface file="i-combination.xml"> <cd:command category="tables" file="pack-com.mkiv" level="style" name="definecombination"> <cd:arguments> @@ -6336,7 +6364,7 @@ </cd:command> <cd:command category="counter language" file="core-con.mkiv" level="document" name="date"> <cd:arguments> - <cd:assignments list="yes" optional="yes"> + <cd:assignments list="yes"> <cd:parameter name="d"> <cd:constant type="cd:number"/> </cd:parameter> @@ -6493,6 +6521,7 @@ <cd:constant type="set␣2"/> <cd:constant type="set␣3"/> <cd:constant type="continued"/> + <cd:constant type="zero"/> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords delimiters="braces"> @@ -6673,6 +6702,13 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="counter" file="core-con.mkiv" level="style" name="zeronumberconversion"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-counter.xml"> <cd:command category="counter" file="strc-num.mkiv" level="system" name="definecounter"> @@ -7857,22 +7893,6 @@ </cd:command> <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="resetdirection"/> <cd:command category="alignment" file="supp-dir.mkiv" level="document" name="showdirsinmargin"/> - <cd:command category="alignment" file="supp-dir.mkiv" level="system" name="istltdir"> - <cd:arguments> - <cd:keywords delimiters="none"> - <cd:constant type="TLT"/> - <cd:constant type="TRT"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="alignment" file="supp-dir.mkiv" level="system" name="istrtdir"> - <cd:arguments> - <cd:keywords delimiters="none"> - <cd:constant type="TLT"/> - <cd:constant type="TRT"/> - </cd:keywords> - </cd:arguments> - </cd:command> </cd:interface> <cd:interface file="i-document.xml"> <cd:command category="structure" file="file-job.mkvi" level="document" name="text" type="environment"/> @@ -10068,14 +10088,50 @@ <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupTEXpage"> <cd:arguments> <cd:assignments list="yes"> - <cd:inherit name="setupfittingpage"/> + <cd:parameter name="pagestate"> + <cd:constant type="start"/> + <cd:constant default="yes" type="stop"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:constant type="page"/> + </cd:parameter> + <cd:parameter name="scale"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="paper"> + <cd:constant type="auto"/> + <cd:constant default="yes" type="default"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> <cd:command category="background layout metapost" file="meta-fig.mkiv" level="style" name="setupMPpage"> <cd:arguments> <cd:assignments list="yes"> - <cd:inherit name="setupfittingpage"/> + <cd:parameter name="pagestate"> + <cd:constant type="start"/> + <cd:constant default="yes" type="stop"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:constant type="page"/> + </cd:parameter> + <cd:parameter name="scale"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="paper"> + <cd:constant type="auto"/> + <cd:constant default="yes" type="default"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> @@ -10542,6 +10598,17 @@ <cd:constant type="effective"/> <cd:constant type="header"/> <cd:constant type="footer"/> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -10620,6 +10687,17 @@ <cd:constant type="effective"/> <cd:constant type="header"/> <cd:constant type="footer"/> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -10705,6 +10783,17 @@ <cd:constant type="effective"/> <cd:constant type="header"/> <cd:constant type="footer"/> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> </cd:parameter> <cd:parameter name="reference"> <cd:constant type="cd:reference"/> @@ -10798,6 +10887,17 @@ <cd:constant type="effective"/> <cd:constant type="header"/> <cd:constant type="footer"/> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> </cd:parameter> <cd:parameter name="reference"> <cd:constant type="cd:reference"/> @@ -10872,6 +10972,17 @@ <cd:constant type="effective"/> <cd:constant type="header"/> <cd:constant type="footer"/> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -11130,6 +11241,17 @@ <cd:constant type="effective"/> <cd:constant type="header"/> <cd:constant type="footer"/> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -14622,7 +14744,7 @@ <cd:constant type="frame"/> <cd:constant type="empty"/> </cd:parameter> - <cd:parameter name="forgroundcolor"> + <cd:parameter name="foregroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="reset"> @@ -16825,6 +16947,8 @@ <cd:constant type="attachment"/> <cd:constant type="layer"/> <cd:constant type="title"/> + <cd:constant type="lefttoright"/> + <cd:constant type="righttoleft"/> <cd:constant type="nomenubar"/> </cd:parameter> <cd:parameter name="copies"> @@ -17808,6 +17932,18 @@ <cd:constant type="standard"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="leftmargindistance"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargindistance"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="align"> <cd:inherit name="setupalign"/> </cd:parameter> @@ -17915,7 +18051,214 @@ <cd:constant method="range" prefix="cd:name" type="cd:number"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setupitemgroup"/> + <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="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="beforehead"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="afterhead"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="left"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="right"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="step"> + <cd:constant type="cd:dimension"/> + </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="option"> + <cd:constant type="intro"/> + <cd:constant type="random"/> + <cd:constant type="continue"/> + <cd:constant type="packed"/> + <cd:constant type="autointro"/> + <cd:constant type="broad"/> + <cd:constant type="text"/> + <cd:constant type="before"/> + <cd:constant type="after"/> + <cd:constant type="nowhite"/> + <cd:constant type="margin"/> + <cd:constant type="inmargin"/> + <cd:constant type="atmargin"/> + <cd:constant type="intext"/> + <cd:constant type="loose"/> + <cd:constant type="fit"/> + <cd:constant type="nofit"/> + <cd:constant type="paragraph"/> + <cd:constant type="joinedup"/> + <cd:constant type="serried"/> + <cd:constant type="stopper"/> + <cd:constant type="unpacked"/> + <cd:constant type="repeat"/> + <cd:constant type="norepeat"/> + <cd:constant type="reverse"/> + <cd:constant type="columns"/> + <cd:constant type="one"/> + <cd:constant type="two"/> + <cd:constant type="three"/> + <cd:constant type="four"/> + <cd:constant type="five"/> + <cd:constant type="six"/> + <cd:constant type="seven"/> + <cd:constant type="eight"/> + <cd:constant type="nine"/> + <cd:constant type="standard"/> + <cd:constant method="factor" prefix="cd:number" type="broad"/> + <cd:constant method="factor" prefix="cd:number" type="serried"/> + <cd:constant type="horizontal"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="leftmargin"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargin"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="leftmargindistance"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargindistance"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="indenting"> + <cd:inherit name="setupindenting"/> + </cd:parameter> + <cd:parameter name="start"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="symalign"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="flushleft"/> + <cd:constant type="center"/> + <cd:constant type="flushright"/> + </cd:parameter> + <cd:parameter name="symbol"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="indentnext"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="inner"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:csname"/> + </cd:parameter> + <cd:parameter name="items"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="itemalign"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + </cd:parameter> + <cd:parameter name="alignsymbol"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="textdistance"> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant type="big"/> + <cd:constant type="none"/> + <cd:constant default="yes" type="space"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="placestopper"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="headstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="marstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="marcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="symstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="symcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> @@ -17930,10 +18273,215 @@ <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> + <cd:constant type="intro"/> + <cd:constant type="random"/> + <cd:constant type="continue"/> + <cd:constant type="packed"/> + <cd:constant type="autointro"/> + <cd:constant type="broad"/> + <cd:constant type="text"/> + <cd:constant type="before"/> + <cd:constant type="after"/> + <cd:constant type="nowhite"/> + <cd:constant type="margin"/> + <cd:constant type="inmargin"/> + <cd:constant type="atmargin"/> + <cd:constant type="intext"/> + <cd:constant type="loose"/> + <cd:constant type="fit"/> + <cd:constant type="nofit"/> + <cd:constant type="paragraph"/> + <cd:constant type="joinedup"/> + <cd:constant type="serried"/> + <cd:constant type="stopper"/> + <cd:constant type="nostopper"/> + <cd:constant type="unpacked"/> + <cd:constant type="repeat"/> + <cd:constant type="norepeat"/> + <cd:constant type="reverse"/> + <cd:constant type="columns"/> + <cd:constant type="one"/> + <cd:constant type="two"/> + <cd:constant type="three"/> + <cd:constant type="four"/> + <cd:constant type="five"/> + <cd:constant type="six"/> + <cd:constant type="seven"/> + <cd:constant type="eight"/> + <cd:constant type="nine"/> + <cd:constant type="standard"/> + <cd:constant method="factor" prefix="cd:number" type="broad"/> + <cd:constant method="factor" prefix="cd:number" type="serried"/> + <cd:constant type="horizontal"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> + <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="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="beforehead"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="afterhead"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="left"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="right"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="step"> + <cd:constant type="cd:dimension"/> + </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="margin"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="leftmargin"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargin"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="leftmargindistance"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargindistance"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="indenting"> + <cd:inherit name="setupindenting"/> + </cd:parameter> + <cd:parameter name="start"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="symalign"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="flushleft"/> + <cd:constant type="center"/> + <cd:constant type="flushright"/> + </cd:parameter> + <cd:parameter name="symbol"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="indentnext"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="inner"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:csname"/> + </cd:parameter> + <cd:parameter name="items"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="itemalign"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + </cd:parameter> + <cd:parameter name="alignsymbol"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="textdistance"> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant type="big"/> + <cd:constant type="none"/> + <cd:constant default="yes" type="space"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="placestopper"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="headstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="marstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="marcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="symstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="symcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -22304,6 +22852,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathematics" variant="assignment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathematics"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="math"> <cd:arguments> <cd:keywords optional="yes"> @@ -22312,6 +22868,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="math" variant="assignment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathematics"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="m"> <cd:arguments> <cd:keywords optional="yes"> @@ -22320,6 +22884,14 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="m" variant="assignment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathematics"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="definemathcommand"> <cd:arguments> <cd:keywords> @@ -22715,6 +23287,8 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="stackscripts"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="unstackscripts"/> </cd:interface> <cd:interface file="i-mathalignment.xml"> <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathalignment"> @@ -22922,6 +23496,38 @@ <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="fenced"> <cd:arguments> <cd:keywords> + <cd:constant type="parenthesis"/> + <cd:constant type="bracket"/> + <cd:constant type="brace"/> + <cd:constant type="bar"/> + <cd:constant type="doublebar"/> + <cd:constant type="triplebar"/> + <cd:constant type="angle"/> + <cd:constant type="doubleangle"/> + <cd:constant type="solidus"/> + <cd:constant type="ceiling"/> + <cd:constant type="floor"/> + <cd:constant type="moustache"/> + <cd:constant type="uppercorner"/> + <cd:constant type="lowercorner"/> + <cd:constant type="group"/> + <cd:constant type="openbracket"/> + <cd:constant type="mirroredparenthesis"/> + <cd:constant type="mirroredbracket"/> + <cd:constant type="mirroredbrace"/> + <cd:constant type="mirroredbar"/> + <cd:constant type="mirroreddoublebar"/> + <cd:constant type="mirroredtriplebar"/> + <cd:constant type="mirroredangle"/> + <cd:constant type="mirroreddoubleangle"/> + <cd:constant type="mirroredsolidus"/> + <cd:constant type="mirroredceiling"/> + <cd:constant type="mirroredfloor"/> + <cd:constant type="mirroredmoustache"/> + <cd:constant type="mirroreduppercorner"/> + <cd:constant type="mirroredlowercorner"/> + <cd:constant type="mirroredgroup"/> + <cd:constant type="mirroredopenbracket"/> <cd:constant type="cd:name"/> </cd:keywords> <cd:content/> @@ -22931,6 +23537,56 @@ <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="left"> <cd:arguments> <cd:keywords delimiters="none"> + <cd:constant type="\\\\\\\\bgroup"/> + <cd:constant type="\\\\\\\\egroup"/> + <cd:constant type="\\\\\\\\letteropenbrace"/> + <cd:constant type="["/> + <cd:constant type="]"/> + <cd:constant type="("/> + <cd:constant type=")"/> + <cd:constant type="<"/> + <cd:constant type=">"/> + <cd:constant type="/"/> + <cd:constant type="|"/> + <cd:constant type="⌊"/> + <cd:constant type="⌋"/> + <cd:constant type="⌈"/> + <cd:constant type="⌉"/> + <cd:constant type="⟨"/> + <cd:constant type="⟩"/> + <cd:constant type="⟪"/> + <cd:constant type="⟫"/> + <cd:constant type="‖"/> + <cd:constant type="⦀"/> + <cd:constant type="⦗"/> + <cd:constant type="\\\\\\\\lbrace"/> + <cd:constant type="\\\\\\\\lbracket"/> + <cd:constant type="\\\\\\\\lbrack"/> + <cd:constant type="\\\\\\\\lparenthesis"/> + <cd:constant type="\\\\\\\\lparent"/> + <cd:constant type="\\\\\\\\lparen"/> + <cd:constant type="\\\\\\\\langle"/> + <cd:constant type="\\\\\\\\llangle"/> + <cd:constant type="\\\\\\\\lVert"/> + <cd:constant type="\\\\\\\\vert"/> + <cd:constant type="\\\\\\\\solidus"/> + <cd:constant type="\\\\\\\\lfloor"/> + <cd:constant type="\\\\\\\\lceiling"/> + <cd:constant type="\\\\\\\\lceil"/> + <cd:constant type="\\\\\\\\ulcorner"/> + <cd:constant type="\\\\\\\\llcorner"/> + <cd:constant type="\\\\\\\\lmoustache"/> + <cd:constant type="\\\\\\\\llbracket"/> + <cd:constant type="\\\\\\\\lgroup"/> + <cd:constant type="\\\\\\\\linterval"/> + <cd:constant type="\\\\\\\\lointerval"/> + <cd:constant type="\\\\\\\\llointerval"/> + <cd:constant type="\\\\\\\\lrointerval"/> + <cd:constant type="\\\\\\\\{"/> + <cd:constant type="\\\\\\\\["/> + <cd:constant type="\\\\\\\\("/> + <cd:constant type="\\\\\\\\<"/> + <cd:constant type="\\\\\\\\|"/> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> @@ -22945,6 +23601,56 @@ <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="right"> <cd:arguments> <cd:keywords delimiters="none"> + <cd:constant type="\\\\\\\\egroup"/> + <cd:constant type="\\\\\\\\bgroup"/> + <cd:constant type="\\\\\\\\letterclosebrace"/> + <cd:constant type="]"/> + <cd:constant type="["/> + <cd:constant type=")"/> + <cd:constant type="("/> + <cd:constant type=">"/> + <cd:constant type="<"/> + <cd:constant type="/"/> + <cd:constant type="|"/> + <cd:constant type="⌋"/> + <cd:constant type="⌊"/> + <cd:constant type="⌉"/> + <cd:constant type="⌈"/> + <cd:constant type="⟩"/> + <cd:constant type="⟨"/> + <cd:constant type="⟫"/> + <cd:constant type="⟪"/> + <cd:constant type="‖"/> + <cd:constant type="⦀"/> + <cd:constant type="⦘"/> + <cd:constant type="\\\\\\\\rbrace"/> + <cd:constant type="\\\\\\\\rbracket"/> + <cd:constant type="\\\\\\\\rbracket"/> + <cd:constant type="\\\\\\\\rparenthesis"/> + <cd:constant type="\\\\\\\\rparent"/> + <cd:constant type="\\\\\\\\rparen"/> + <cd:constant type="\\\\\\\\rangle"/> + <cd:constant type="\\\\\\\\rrangle"/> + <cd:constant type="\\\\\\\\rVert"/> + <cd:constant type="\\\\\\\\vert"/> + <cd:constant type="\\\\\\\\solidus"/> + <cd:constant type="\\\\\\\\rfloor"/> + <cd:constant type="\\\\\\\\rceiling"/> + <cd:constant type="\\\\\\\\rceil"/> + <cd:constant type="\\\\\\\\urcorner"/> + <cd:constant type="\\\\\\\\lrcorner"/> + <cd:constant type="\\\\\\\\rmoustache"/> + <cd:constant type="\\\\\\\\rrbracket"/> + <cd:constant type="\\\\\\\\rgroup"/> + <cd:constant type="\\\\\\\\rinterval"/> + <cd:constant type="\\\\\\\\rointerval"/> + <cd:constant type="\\\\\\\\rlointerval"/> + <cd:constant type="\\\\\\\\rrointerval"/> + <cd:constant type="\\\\\\\\}"/> + <cd:constant type="\\\\\\\\]"/> + <cd:constant type="\\\\\\\\)"/> + <cd:constant type="\\\\\\\\>"/> + <cd:constant type="\\\\\\\\|"/> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> @@ -23064,6 +23770,56 @@ <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="lfence"> <cd:arguments> <cd:keywords delimiters="braces"> + <cd:constant type="\\\\\\\\bgroup"/> + <cd:constant type="\\\\\\\\egroup"/> + <cd:constant type="\\\\\\\\letteropenbrace"/> + <cd:constant type="["/> + <cd:constant type="]"/> + <cd:constant type="("/> + <cd:constant type=")"/> + <cd:constant type="<"/> + <cd:constant type=">"/> + <cd:constant type="/"/> + <cd:constant type="|"/> + <cd:constant type="⌊"/> + <cd:constant type="⌋"/> + <cd:constant type="⌈"/> + <cd:constant type="⌉"/> + <cd:constant type="⟨"/> + <cd:constant type="⟩"/> + <cd:constant type="⟪"/> + <cd:constant type="⟫"/> + <cd:constant type="‖"/> + <cd:constant type="⦀"/> + <cd:constant type="⦗"/> + <cd:constant type="\\\\\\\\lbrace"/> + <cd:constant type="\\\\\\\\lbracket"/> + <cd:constant type="\\\\\\\\lbrack"/> + <cd:constant type="\\\\\\\\lparenthesis"/> + <cd:constant type="\\\\\\\\lparent"/> + <cd:constant type="\\\\\\\\lparen"/> + <cd:constant type="\\\\\\\\langle"/> + <cd:constant type="\\\\\\\\llangle"/> + <cd:constant type="\\\\\\\\lVert"/> + <cd:constant type="\\\\\\\\vert"/> + <cd:constant type="\\\\\\\\solidus"/> + <cd:constant type="\\\\\\\\lfloor"/> + <cd:constant type="\\\\\\\\lceiling"/> + <cd:constant type="\\\\\\\\lceil"/> + <cd:constant type="\\\\\\\\ulcorner"/> + <cd:constant type="\\\\\\\\llcorner"/> + <cd:constant type="\\\\\\\\lmoustache"/> + <cd:constant type="\\\\\\\\llbracket"/> + <cd:constant type="\\\\\\\\lgroup"/> + <cd:constant type="\\\\\\\\linterval"/> + <cd:constant type="\\\\\\\\lointerval"/> + <cd:constant type="\\\\\\\\llointerval"/> + <cd:constant type="\\\\\\\\lrointerval"/> + <cd:constant type="\\\\\\\\{"/> + <cd:constant type="\\\\\\\\["/> + <cd:constant type="\\\\\\\\("/> + <cd:constant type="\\\\\\\\<"/> + <cd:constant type="\\\\\\\\|"/> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> @@ -23078,6 +23834,56 @@ <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="rfence"> <cd:arguments> <cd:keywords delimiters="braces"> + <cd:constant type="\\\\\\\\egroup"/> + <cd:constant type="\\\\\\\\bgroup"/> + <cd:constant type="\\\\\\\\letterclosebrace"/> + <cd:constant type="]"/> + <cd:constant type="["/> + <cd:constant type=")"/> + <cd:constant type="("/> + <cd:constant type=">"/> + <cd:constant type="<"/> + <cd:constant type="/"/> + <cd:constant type="|"/> + <cd:constant type="⌋"/> + <cd:constant type="⌊"/> + <cd:constant type="⌉"/> + <cd:constant type="⌈"/> + <cd:constant type="⟩"/> + <cd:constant type="⟨"/> + <cd:constant type="⟫"/> + <cd:constant type="⟪"/> + <cd:constant type="‖"/> + <cd:constant type="⦀"/> + <cd:constant type="⦘"/> + <cd:constant type="\\\\\\\\rbrace"/> + <cd:constant type="\\\\\\\\rbracket"/> + <cd:constant type="\\\\\\\\rbracket"/> + <cd:constant type="\\\\\\\\rparenthesis"/> + <cd:constant type="\\\\\\\\rparent"/> + <cd:constant type="\\\\\\\\rparen"/> + <cd:constant type="\\\\\\\\rangle"/> + <cd:constant type="\\\\\\\\rrangle"/> + <cd:constant type="\\\\\\\\rVert"/> + <cd:constant type="\\\\\\\\vert"/> + <cd:constant type="\\\\\\\\solidus"/> + <cd:constant type="\\\\\\\\rfloor"/> + <cd:constant type="\\\\\\\\rceiling"/> + <cd:constant type="\\\\\\\\rceil"/> + <cd:constant type="\\\\\\\\urcorner"/> + <cd:constant type="\\\\\\\\lrcorner"/> + <cd:constant type="\\\\\\\\rmoustache"/> + <cd:constant type="\\\\\\\\rrbracket"/> + <cd:constant type="\\\\\\\\rgroup"/> + <cd:constant type="\\\\\\\\rinterval"/> + <cd:constant type="\\\\\\\\rointerval"/> + <cd:constant type="\\\\\\\\rlointerval"/> + <cd:constant type="\\\\\\\\rrointerval"/> + <cd:constant type="\\\\\\\\}"/> + <cd:constant type="\\\\\\\\]"/> + <cd:constant type="\\\\\\\\)"/> + <cd:constant type="\\\\\\\\>"/> + <cd:constant type="\\\\\\\\|"/> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> @@ -24446,8 +25252,16 @@ <cd:instances> <cd:constant value="itemgroupcolumns"/> <cd:constant value="boxedcolumns"/> + <cd:constant value="columns"/> </cd:instances> </cd:command> + <cd:command category="structure layout" file="page-smp.mkiv" level="style" name="setupcolumns"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupmixedcolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-modes.xml"> <cd:command category="structure" file="core-env.mkiv" level="system" name="newmode"> @@ -25678,6 +26492,13 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupfootnotes"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupnote"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote"> <cd:arguments> <cd:keywords> @@ -25974,6 +26795,54 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="structure notes" file="strc-tnt.mkiv" level="style" name="definetextnote"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptextnote"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure notes" file="strc-tnt.mkiv" level="style" name="setuptextnote"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="rule"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="note"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="*"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="empty"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="none"/> + <cd:constant type="number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure notes" file="strc-tnt.mkiv" generated="yes" level="document" name="textnote"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptextnote"/> + </cd:assignments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-object.xml"> <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="ifinobject"> @@ -26925,7 +27794,29 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcolumnsetspan"/> + <cd:parameter name="c"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="r"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> + </cd:parameter> + <cd:parameter name="option"> + <cd:constant default="yes" type="none"/> + <cd:constant type="wide"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -27201,7 +28092,17 @@ <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumber"> <cd:arguments> <cd:assignments list="yes"> - <cd:inherit name="setupuserpagenumber"/> + <cd:parameter name="viewerprefix"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="state"> + <cd:constant type="start"/> + <cd:constant type="stop"/> + <cd:constant type="none"/> + <cd:constant type="keep"/> + <cd:constant type="empty"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> @@ -28164,6 +29065,7 @@ <cd:command category="tables" file="tabl-mis.mkiv" level="style" name="setupparagraphs" variant="assignment"> <cd:arguments> <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> <cd:constant method="range" prefix="cd:name" type="cd:number"/> </cd:keywords> <cd:assignments list="yes"> @@ -33560,6 +34462,7 @@ <cd:constant default="yes" type="no"/> <cd:constant type="all"/> <cd:constant type="packed"/> + <cd:constant type="text"/> </cd:parameter> <cd:parameter name="check"> <cd:constant default="yes" type="yes"/> @@ -33774,6 +34677,8 @@ <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> <cd:constant type="all"/> + <cd:constant type="packed"/> + <cd:constant type="text"/> </cd:parameter> <cd:parameter name="check"> <cd:constant default="yes" type="yes"/> @@ -33950,7 +34855,212 @@ <cd:constant type="cd:number"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setupregister"/> + <cd:parameter name="referencemethod"> + <cd:constant type="forward"/> + </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="ownnumber"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant type="b"/> + <cd:constant type="A"/> + <cd:constant type="B"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="default"/> + <cd:constant type="before"/> + <cd:constant type="after"/> + <cd:constant type="first"/> + <cd:constant type="last"/> + <cd:constant type="ch"/> + <cd:constant type="mm"/> + <cd:constant type="zm"/> + <cd:constant type="pm"/> + <cd:constant type="mc"/> + <cd:constant type="zc"/> + <cd:constant type="pc"/> + <cd:constant type="uc"/> + </cd:parameter> + <cd:parameter name="compress"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="all"/> + <cd:constant type="packed"/> + <cd:constant type="text"/> + </cd:parameter> + <cd:parameter name="check"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="local"/> + <cd:constant type="text"/> + <cd:constant type="current"/> + <cd:constant type="previous"/> + <cd:constant default="yes" type="all"/> + <cd:constant type="cd:section"/> + </cd:parameter> + <cd:parameter name="pageprefixseparatorset"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixconversionset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageprefixstarter"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixstopper"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageprefixsegments"> + <cd:constant type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="*"/> + <cd:constant method="range" prefix="cd:number" type="all"/> + <cd:constant type="cd:section"/> + <cd:constant method="range" prefix="cd:section" type="cd:section"/> + <cd:constant method="range" prefix="cd:section" type="*"/> + <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> + </cd:parameter> + <cd:parameter name="pageprefixconnector"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefix"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="pageseparatorset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageconversionset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pagestarter"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagestopper"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagesegments"> + <cd:constant type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="*"/> + <cd:constant method="range" prefix="cd:number" type="all"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="indicator"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </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="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="textcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="pagecommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="interaction"> + <cd:constant type="text"/> + <cd:constant default="yes" type="pagenumber"/> + </cd:parameter> + <cd:parameter name="pagenumber"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="symbol"> + <cd:constant type="a"/> + <cd:constant default="yes" type="n"/> + <cd:constant type="none"/> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="language"> + <cd:constant type="default"/> + <cd:constant type="DIN␣5007-1"/> + <cd:constant type="DIN␣5007-2"/> + <cd:constant type="Duden"/> + <cd:constant type="de-DE"/> + <cd:constant type="de-CH"/> + <cd:constant type="de-AT"/> + <cd:constant type="ru-iso9"/> + <cd:constant type="ocs-scn"/> + <cd:constant type="cd:language"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="textstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="textcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="pagestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="balance"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="numberorder"> + <cd:constant default="yes" type="numbers"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -33961,7 +35071,212 @@ <cd:constant method="range" prefix="cd:name" type="cd:number"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setupregister"/> + <cd:parameter name="referencemethod"> + <cd:constant type="forward"/> + </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="ownnumber"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant type="b"/> + <cd:constant type="A"/> + <cd:constant type="B"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="default"/> + <cd:constant type="before"/> + <cd:constant type="after"/> + <cd:constant type="first"/> + <cd:constant type="last"/> + <cd:constant type="ch"/> + <cd:constant type="mm"/> + <cd:constant type="zm"/> + <cd:constant type="pm"/> + <cd:constant type="mc"/> + <cd:constant type="zc"/> + <cd:constant type="pc"/> + <cd:constant type="uc"/> + </cd:parameter> + <cd:parameter name="compress"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="all"/> + <cd:constant type="packed"/> + <cd:constant type="text"/> + </cd:parameter> + <cd:parameter name="check"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="local"/> + <cd:constant type="text"/> + <cd:constant type="current"/> + <cd:constant type="previous"/> + <cd:constant default="yes" type="all"/> + <cd:constant type="cd:section"/> + </cd:parameter> + <cd:parameter name="pageprefixseparatorset"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixconversionset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageprefixstarter"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixstopper"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageprefixsegments"> + <cd:constant type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="*"/> + <cd:constant method="range" prefix="cd:number" type="all"/> + <cd:constant type="cd:section"/> + <cd:constant method="range" prefix="cd:section" type="cd:section"/> + <cd:constant method="range" prefix="cd:section" type="*"/> + <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> + </cd:parameter> + <cd:parameter name="pageprefixconnector"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefix"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="pageseparatorset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageconversionset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pagestarter"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagestopper"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagesegments"> + <cd:constant type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="*"/> + <cd:constant method="range" prefix="cd:number" type="all"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="indicator"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </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="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="textcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="pagecommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="interaction"> + <cd:constant type="text"/> + <cd:constant default="yes" type="pagenumber"/> + </cd:parameter> + <cd:parameter name="pagenumber"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="symbol"> + <cd:constant type="a"/> + <cd:constant default="yes" type="n"/> + <cd:constant type="none"/> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="language"> + <cd:constant type="default"/> + <cd:constant type="DIN␣5007-1"/> + <cd:constant type="DIN␣5007-2"/> + <cd:constant type="Duden"/> + <cd:constant type="de-DE"/> + <cd:constant type="de-CH"/> + <cd:constant type="de-AT"/> + <cd:constant type="ru-iso9"/> + <cd:constant type="ocs-scn"/> + <cd:constant type="cd:language"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="textstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="textcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="pagestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="balance"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="numberorder"> + <cd:constant default="yes" type="numbers"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -34056,7 +35371,212 @@ <cd:constant type="cd:number"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setupregister"/> + <cd:parameter name="referencemethod"> + <cd:constant type="forward"/> + </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="ownnumber"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant type="b"/> + <cd:constant type="A"/> + <cd:constant type="B"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="default"/> + <cd:constant type="before"/> + <cd:constant type="after"/> + <cd:constant type="first"/> + <cd:constant type="last"/> + <cd:constant type="ch"/> + <cd:constant type="mm"/> + <cd:constant type="zm"/> + <cd:constant type="pm"/> + <cd:constant type="mc"/> + <cd:constant type="zc"/> + <cd:constant type="pc"/> + <cd:constant type="uc"/> + </cd:parameter> + <cd:parameter name="compress"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="all"/> + <cd:constant type="packed"/> + <cd:constant type="text"/> + </cd:parameter> + <cd:parameter name="check"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="local"/> + <cd:constant type="text"/> + <cd:constant type="current"/> + <cd:constant type="previous"/> + <cd:constant default="yes" type="all"/> + <cd:constant type="cd:section"/> + </cd:parameter> + <cd:parameter name="pageprefixseparatorset"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixconversionset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageprefixstarter"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixstopper"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageprefixsegments"> + <cd:constant type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="*"/> + <cd:constant method="range" prefix="cd:number" type="all"/> + <cd:constant type="cd:section"/> + <cd:constant method="range" prefix="cd:section" type="cd:section"/> + <cd:constant method="range" prefix="cd:section" type="*"/> + <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> + </cd:parameter> + <cd:parameter name="pageprefixconnector"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefix"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="pageseparatorset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageconversionset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pagestarter"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagestopper"> + <cd:constant type="cd:command"/> + <cd:constant method="apply" prefix="cd:processor" type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagesegments"> + <cd:constant type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="cd:number"/> + <cd:constant method="range" prefix="cd:number" type="*"/> + <cd:constant method="range" prefix="cd:number" type="all"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="indicator"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </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="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="textcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="pagecommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="interaction"> + <cd:constant type="text"/> + <cd:constant default="yes" type="pagenumber"/> + </cd:parameter> + <cd:parameter name="pagenumber"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="symbol"> + <cd:constant type="a"/> + <cd:constant default="yes" type="n"/> + <cd:constant type="none"/> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="language"> + <cd:constant type="default"/> + <cd:constant type="DIN␣5007-1"/> + <cd:constant type="DIN␣5007-2"/> + <cd:constant type="Duden"/> + <cd:constant type="de-DE"/> + <cd:constant type="de-CH"/> + <cd:constant type="de-AT"/> + <cd:constant type="ru-iso9"/> + <cd:constant type="ocs-scn"/> + <cd:constant type="cd:language"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="textstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="textcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="pagestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pagecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="balance"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="numberorder"> + <cd:constant default="yes" type="numbers"/> + </cd:parameter> </cd:assignments> </cd:arguments> <cd:instances> @@ -34079,10 +35599,10 @@ <cd:constant method="apply" prefix="cd:processor" type="cd:text"/> </cd:keywords> <cd:index list="yes"/> - </cd:arguments> - </cd:command> - <cd:command category="structure" file="strc-reg.mkiv" level="document" name="stopregister"> - <cd:arguments> + <cd:keywords delimiters="none"> + <cd:constant type="cd:content"/> + </cd:keywords> + <cd:delimiter name="stopregister"/> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> @@ -34258,10 +35778,10 @@ <cd:constant type="cd:value"/> </cd:parameter> </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="structure" file="strc-reg.mkiv" level="document" name="stopstructurepageregister"> - <cd:arguments> + <cd:keywords delimiters="none"> + <cd:constant type="cd:content"/> + </cd:keywords> + <cd:delimiter name="stopstructurepageregister"/> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> @@ -35128,6 +36648,10 @@ <cd:constant type="positive"/> <cd:constant type="all"/> </cd:parameter> + <cd:parameter name="hidenumber"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -35321,6 +36845,34 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placerawheaddata"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:section"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placerawheadtext"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:section"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placerawheadnumber"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:section"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-sec.mkiv" level="document" name="repeathead"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:section"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="structure" file="strc-sec.mkiv" level="system" name="definesection"> <cd:arguments> <cd:keywords> @@ -36162,6 +37714,33 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-simplecolumns.xml"> + <cd:command category="structure layout" file="page-smp.mkiv" level="system" name="setsimplecolumnshsize"> + <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 category="structure layout" file="page-smp.mkiv" level="system" name="simplecolumns" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setsimplecolumnshsize"/> + </cd:assignments> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-smash.xml"> <cd:command file="supp-box.mkiv" level="system" name="smashbox"> <cd:arguments> @@ -36986,6 +38565,16 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="setupsymbols"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="stylealternative"> + <cd:constant default="yes" type="text"/> + <cd:constant type="math"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-synctex.xml"> <cd:command category="pdf" file="cont-run.mkiv" level="system" name="synctexsetfilename"> @@ -43051,7 +44640,59 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayouttext"/> + <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 default="yes" type="normal"/> + <cd:constant type="nomarking"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="strut"> + <cd:constant default="yes" type="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:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="rightstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </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> @@ -43063,7 +44704,59 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayouttext"/> + <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 default="yes" type="normal"/> + <cd:constant type="nomarking"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="strut"> + <cd:constant default="yes" type="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:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="rightstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </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> @@ -43075,7 +44768,59 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayouttext"/> + <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 default="yes" type="normal"/> + <cd:constant type="nomarking"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="strut"> + <cd:constant default="yes" type="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:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="rightstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </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> @@ -43087,7 +44832,59 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayouttext"/> + <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 default="yes" type="normal"/> + <cd:constant type="nomarking"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="strut"> + <cd:constant default="yes" type="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:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="rightstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </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> @@ -43099,7 +44896,59 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayouttext"/> + <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 default="yes" type="normal"/> + <cd:constant type="nomarking"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="strut"> + <cd:constant default="yes" type="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:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="rightstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </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> @@ -45822,6 +47671,9 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="whitespace" file="typo-wrp.mkiv" level="document" name="crlf"/> + <cd:command category="whitespace" file="typo-wrp.mkiv" level="document" name="settestcrlf"/> + <cd:command category="whitespace" file="typo-wrp.mkiv" level="document" name="crlfplaceholder"/> </cd:interface> <cd:interface file="i-whitespace.xml"> <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupwhitespace"> diff --git a/tex/context/interface/mkiv/i-attachment.xml b/tex/context/interface/mkiv/i-attachment.xml index 85cf8843b..550cc57ce 100644 --- a/tex/context/interface/mkiv/i-attachment.xml +++ b/tex/context/interface/mkiv/i-attachment.xml @@ -36,6 +36,9 @@ <cd:parameter name="buffer"> <cd:constant type="cd:buffer"/> </cd:parameter> + <cd:parameter name="type"> + <cd:constant type="cd:name"/> + </cd:parameter> <cd:parameter name="state"> <cd:constant type="start" default="yes"/> <cd:constant type="stop"/> diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml index e89be4fd0..39034e32b 100644 --- a/tex/context/interface/mkiv/i-boxes.xml +++ b/tex/context/interface/mkiv/i-boxes.xml @@ -725,21 +725,21 @@ </cd:arguments> </cd:command> - <cd:command name="naturalhbox" level="system" file="supp-box.mkiv"> + <cd:command name="naturalhbox" level="system" file="supp-dir.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvbox" level="system" file="supp-box.mkiv"> + <cd:command name="naturalvbox" level="system" file="supp-dir.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvtop" level="system" file="supp-box.mkiv"> + <cd:command name="naturalvtop" level="system" file="supp-dir.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> @@ -753,14 +753,63 @@ </cd:arguments> </cd:command> - <cd:command name="naturalhpack" level="system" file="supp-box.mkiv"> + <cd:command name="naturalhpack" level="system" file="supp-dir.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvpack" level="system" file="supp-box.mkiv"> + <cd:command name="naturalvpack" level="system" file="supp-dir.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="naturaltpack" level="system" file="supp-dir.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="reversehbox" level="system" file="supp-dir.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="reversevbox" level="system" file="supp-dir.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="reversevtop" level="system" file="supp-dir.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="reversehpack" level="system" file="supp-dir.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="reversevpack" level="system" file="supp-dir.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="reversetpack" level="system" file="supp-dir.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> @@ -950,6 +999,13 @@ </cd:arguments> </cd:command> + <cd:command name="rtlhbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="lefttorighthbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> @@ -957,6 +1013,13 @@ </cd:arguments> </cd:command> + <cd:command name="ltrhbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="righttoleftvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> @@ -964,6 +1027,13 @@ </cd:arguments> </cd:command> + <cd:command name="rtlvbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="lefttorightvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> @@ -971,6 +1041,13 @@ </cd:arguments> </cd:command> + <cd:command name="ltrvbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="righttoleftvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> @@ -978,6 +1055,13 @@ </cd:arguments> </cd:command> + <cd:command name="rtlvtop" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="lefttorightvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> @@ -985,6 +1069,13 @@ </cd:arguments> </cd:command> + <cd:command name="ltrvtop" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="autodirhbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> diff --git a/tex/context/interface/mkiv/i-capitals.xml b/tex/context/interface/mkiv/i-capitals.xml index 4cfb4a080..6115b1519 100644 --- a/tex/context/interface/mkiv/i-capitals.xml +++ b/tex/context/interface/mkiv/i-capitals.xml @@ -167,6 +167,12 @@ </cd:arguments> </cd:command> + <cd:command name="cap" level="style" category="fonts" file="typo-cap.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + <cd:command name="mixedcaps" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> @@ -185,6 +191,18 @@ </cd:arguments> </cd:command> + <cd:command name="capital" level="style" category="fonts" file="typo-cap.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="smallcaps" level="style" category="fonts" file="typo-cap.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + <cd:command name="uppercased" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> diff --git a/tex/context/interface/mkiv/i-chart.xml b/tex/context/interface/mkiv/i-chart.xml index 7f0a51393..43672efa0 100644 --- a/tex/context/interface/mkiv/i-chart.xml +++ b/tex/context/interface/mkiv/i-chart.xml @@ -541,4 +541,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml index bbc022ac6..aa290a0a9 100644 --- a/tex/context/interface/mkiv/i-columns.xml +++ b/tex/context/interface/mkiv/i-columns.xml @@ -34,10 +34,10 @@ <cd:constant type="no"/> </cd:parameter> <cd:parameter name="align"> - <cd:inherit type="setupalign"/> + <cd:inherit name="setupalign"/> </cd:parameter> <cd:parameter name="tolerance"> - <cd:inherit type="setuptolerance"/> + <cd:inherit name="setuptolerance"/> </cd:parameter> <cd:parameter name="blank"> <cd:inherit name="blank"/> @@ -81,7 +81,7 @@ </cd:arguments> </cd:command> - <cd:command name="setsimplecolumnhsize" level="system" category="columns" file="page-mul.mkiv"> + <cd:command name="setsimplecolumnshsize" level="system" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -103,9 +103,9 @@ <cd:command name="simplecolumns" type="environment" level="system" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setsimplecolumnhsize"/> + <cd:inherit name="setsimplecolumnshsize"/> </cd:assignments> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml index de000148b..da821c516 100644 --- a/tex/context/interface/mkiv/i-common-argument.xml +++ b/tex/context/interface/mkiv/i-common-argument.xml @@ -524,7 +524,7 @@ <!-- * --> <!-- \... {...} --> <!-- --> - <!-- * TOCHAR --> + <!-- * TOCHAR --> <cd:define name="argument-tochar"> <cd:keywords delimiters="braces"> @@ -532,4 +532,26 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... {...} --> + <!-- --> + <!-- * LEFTFENCE --> + + <cd:define name="argument-leftfence"> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-leftfence"/> + </cd:keywords> + </cd:define> + + <!-- * --> + <!-- \... {...} --> + <!-- --> + <!-- * RIGHTFENCE --> + + <cd:define name="argument-rightfence"> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-rightfence"/> + </cd:keywords> + </cd:define> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-instance.xml b/tex/context/interface/mkiv/i-common-instance.xml index dc8cead79..3d4864de7 100644 --- a/tex/context/interface/mkiv/i-common-instance.xml +++ b/tex/context/interface/mkiv/i-common-instance.xml @@ -187,6 +187,7 @@ <cd:define name="instance-mixedcolumns"> <cd:constant value="itemgroupcolumns"/> <cd:constant value="boxedcolumns"/> + <cd:constant value="columns"/> </cd:define> <cd:define name="instance-note"> diff --git a/tex/context/interface/mkiv/i-common-string.xml b/tex/context/interface/mkiv/i-common-string.xml index 5ef1fc71a..0c0bb2ef3 100644 --- a/tex/context/interface/mkiv/i-common-string.xml +++ b/tex/context/interface/mkiv/i-common-string.xml @@ -169,4 +169,26 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... ... --> + <!-- --> + <!-- * LEFTFENCE --> + + <cd:define name="string-leftfence"> + <cd:keywords delimiters="none"> + <cd:resolve name="value-leftfence"/> + </cd:keywords> + </cd:define> + + <!-- * --> + <!-- \... ... --> + <!-- --> + <!-- * RIGHTFENCE --> + + <cd:define name="string-rightfence"> + <cd:keywords delimiters="none"> + <cd:resolve name="value-rightfence"/> + </cd:keywords> + </cd:define> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml index a6884185f..253a03ccf 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -301,6 +301,17 @@ <cd:constant type="effective"/> <cd:constant type="header"/> <cd:constant type="footer"/> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> </cd:define> <!-- sortorder = ... --> @@ -770,4 +781,120 @@ <cd:constant type="cd:name"/> </cd:define> + <cd:define name="value-leftfence"> + <!-- + <cd:constant type="||"/> + <cd:constant type="|||"/> + --> + <cd:constant type="\bgroup"/> + <cd:constant type="\egroup"/> + <cd:constant type="\letteropenbrace"/> + <cd:constant type="["/> + <cd:constant type="]"/> + <cd:constant type="("/> + <cd:constant type=")"/> + <cd:constant type="<"/> + <cd:constant type=">"/> + <cd:constant type="/"/> + <cd:constant type="|"/> + <cd:constant type="⌊"/> + <cd:constant type="⌋"/> + <cd:constant type="⌈"/> + <cd:constant type="⌉"/> + <cd:constant type="⟨"/> + <cd:constant type="⟩"/> + <cd:constant type="⟪"/> + <cd:constant type="⟫"/> + <cd:constant type="‖"/> + <cd:constant type="⦀"/> + <cd:constant type="⦗"/> + <cd:constant type="\lbrace"/> + <cd:constant type="\lbracket"/> + <cd:constant type="\lbrack"/> + <cd:constant type="\lparenthesis"/> + <cd:constant type="\lparent"/> + <cd:constant type="\lparen"/> + <cd:constant type="\langle"/> + <cd:constant type="\llangle"/> + <cd:constant type="\lVert"/> + <cd:constant type="\vert"/> + <cd:constant type="\solidus"/> + <cd:constant type="\lfloor"/> + <cd:constant type="\lceiling"/> + <cd:constant type="\lceil"/> + <cd:constant type="\ulcorner"/> + <cd:constant type="\llcorner"/> + <cd:constant type="\lmoustache"/> + <cd:constant type="\llbracket"/> + <cd:constant type="\lgroup"/> + <cd:constant type="\linterval"/> + <cd:constant type="\lointerval"/> + <cd:constant type="\llointerval"/> + <cd:constant type="\lrointerval"/> + <cd:constant type="\{"/> + <cd:constant type="\["/> + <cd:constant type="\("/> + <cd:constant type="\<"/> + <cd:constant type="\|"/> + <cd:constant type="cd:character"/> + </cd:define> + + <cd:define name="value-rightfence"> + <!-- + <cd:constant type="||"/> + <cd:constant type="|||"/> + --> + <cd:constant type="\egroup"/> + <cd:constant type="\bgroup"/> + <cd:constant type="\letterclosebrace"/> + <cd:constant type="]"/> + <cd:constant type="["/> + <cd:constant type=")"/> + <cd:constant type="("/> + <cd:constant type=">"/> + <cd:constant type="<"/> + <cd:constant type="/"/> + <cd:constant type="|"/> + <cd:constant type="⌋"/> + <cd:constant type="⌊"/> + <cd:constant type="⌉"/> + <cd:constant type="⌈"/> + <cd:constant type="⟩"/> + <cd:constant type="⟨"/> + <cd:constant type="⟫"/> + <cd:constant type="⟪"/> + <cd:constant type="‖"/> + <cd:constant type="⦀"/> + <cd:constant type="⦘"/> + <cd:constant type="\rbrace"/> + <cd:constant type="\rbracket"/> + <cd:constant type="\rbracket"/> + <cd:constant type="\rparenthesis"/> + <cd:constant type="\rparent"/> + <cd:constant type="\rparen"/> + <cd:constant type="\rangle"/> + <cd:constant type="\rrangle"/> + <cd:constant type="\rVert"/> + <cd:constant type="\vert"/> + <cd:constant type="\solidus"/> + <cd:constant type="\rfloor"/> + <cd:constant type="\rceiling"/> + <cd:constant type="\rceil"/> + <cd:constant type="\urcorner"/> + <cd:constant type="\lrcorner"/> + <cd:constant type="\rmoustache"/> + <cd:constant type="\rrbracket"/> + <cd:constant type="\rgroup"/> + <cd:constant type="\rinterval"/> + <cd:constant type="\rointerval"/> + <cd:constant type="\rlointerval"/> + <cd:constant type="\rrointerval"/> + <cd:constant type="\}"/> + <cd:constant type="\]"/> + <cd:constant type="\)"/> + <cd:constant type="\>"/> + <cd:constant type="\|"/> + <cd:constant type="cd:character"/> + </cd:define> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 237b4ec2b..e1c0e85ae 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml index 01adac436..53741ad55 100644 --- a/tex/context/interface/mkiv/i-context.xml +++ b/tex/context/interface/mkiv/i-context.xml @@ -53,7 +53,6 @@ <cd:interfacefile filename="i-clipping.xml"/> <cd:interfacefile filename="i-collector.xml"/> <cd:interfacefile filename="i-color.xml"/> - <cd:interfacefile filename="i-columns.xml"/> <cd:interfacefile filename="i-combination.xml"/> <cd:interfacefile filename="i-commandhandler.xml"/> <cd:interfacefile filename="i-comment.xml"/> @@ -198,6 +197,7 @@ <cd:interfacefile filename="i-setups.xml"/> <cd:interfacefile filename="i-shift.xml"/> <cd:interfacefile filename="i-sidebar.xml"/> + <cd:interfacefile filename="i-simplecolumns.xml"/> <cd:interfacefile filename="i-smash.xml"/> <cd:interfacefile filename="i-sort.xml"/> <cd:interfacefile filename="i-soundtrack.xml"/> diff --git a/tex/context/interface/mkiv/i-conversion.xml b/tex/context/interface/mkiv/i-conversion.xml index a2e975368..9226693a2 100644 --- a/tex/context/interface/mkiv/i-conversion.xml +++ b/tex/context/interface/mkiv/i-conversion.xml @@ -360,7 +360,7 @@ <cd:command name="date" level="document" category="counter language" file="core-con.mkiv"> <cd:arguments> - <cd:assignments list="yes" optional="yes"> + <cd:assignments list="yes"> <cd:parameter name="d"> <cd:constant type="cd:number"/> </cd:parameter> @@ -502,6 +502,7 @@ <cd:constant type="set␣2"/> <cd:constant type="set␣3"/> <cd:constant type="continued"/> + <cd:constant type="zero"/> <cd:constant type="cd:name"/> </cd:keywords> <cd:resolve name="argument-number"/> @@ -642,4 +643,10 @@ </cd:arguments> </cd:command> + <cd:command name="zeronumberconversion" level="style" category="counter" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-direction.xml b/tex/context/interface/mkiv/i-direction.xml index 3b2d937a4..87e64e457 100644 --- a/tex/context/interface/mkiv/i-direction.xml +++ b/tex/context/interface/mkiv/i-direction.xml @@ -52,22 +52,4 @@ <cd:command name="showdirsinmargin" level="document" category="alignment" file="supp-dir.mkiv"/> - <cd:command name="istltdir" level="system" category="alignment" file="supp-dir.mkiv"> - <cd:arguments> - <cd:keywords delimiters="none"> - <cd:constant type="TLT"/> - <cd:constant type="TRT"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="istrtdir" level="system" category="alignment" file="supp-dir.mkiv"> - <cd:arguments> - <cd:keywords delimiters="none"> - <cd:constant type="TLT"/> - <cd:constant type="TRT"/> - </cd:keywords> - </cd:arguments> - </cd:command> - </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml index 7fc3a6cff..f5daafcf1 100644 --- a/tex/context/interface/mkiv/i-fittingpage.xml +++ b/tex/context/interface/mkiv/i-fittingpage.xml @@ -4,6 +4,30 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + <cd:define name="assignment-setupfittingpage"> + <cd:assignments list="yes"> + <cd:parameter name="pagestate"> + <cd:constant type="start"/> + <cd:constant type="stop" default="yes"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:constant type="page"/> + </cd:parameter> + <cd:parameter name="scale"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="paper"> + <cd:constant type="auto"/> + <cd:constant type="default" default="yes"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:define> + <cd:command name="definefittingpage" level="style" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> @@ -17,27 +41,7 @@ <cd:command name="setupfittingpage" level="style" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:parameter name="pagestate"> - <cd:constant type="start"/> - <cd:constant type="stop" default="yes"/> - </cd:parameter> - <cd:parameter name="command"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="margin"> - <cd:constant type="page"/> - </cd:parameter> - <cd:parameter name="scale"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="paper"> - <cd:constant type="auto"/> - <cd:constant type="default" default="yes"/> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:inherit name="setupframed"/> - </cd:assignments> + <cd:resolve name="assignment-setupfittingpage"/> </cd:arguments> </cd:command> @@ -66,17 +70,17 @@ <!-- - <cd:command name="TEXpage" type="environment" level="document" category="background layout" file="page-app.mkiv"> + <cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv"> <cd:arguments> - <cd:assignments list="yes" optional="yes"> + <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="MPpage" type="environment" level="document" category="background layout metapost" file="meta-fig.mkiv"> + <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv"> <cd:arguments> - <cd:assignments list="yes" optional="yes"> + <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> </cd:assignments> </cd:arguments> @@ -86,17 +90,13 @@ <cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv"> <cd:arguments> - <cd:assignments list="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> + <cd:resolve name="assignment-setupfittingpage"/> </cd:arguments> </cd:command> <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv"> <cd:arguments> - <cd:assignments list="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> + <cd:resolve name="assignment-setupfittingpage"/> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml index a71291a2a..924616474 100644 --- a/tex/context/interface/mkiv/i-graphics.xml +++ b/tex/context/interface/mkiv/i-graphics.xml @@ -159,7 +159,7 @@ <cd:constant type="frame"/> <cd:constant type="empty"/> </cd:parameter> - <cd:parameter name="forgroundcolor"> + <cd:parameter name="foregroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="reset"> diff --git a/tex/context/interface/mkiv/i-interactionscreen.xml b/tex/context/interface/mkiv/i-interactionscreen.xml index 3f23999a3..2f2d550e9 100644 --- a/tex/context/interface/mkiv/i-interactionscreen.xml +++ b/tex/context/interface/mkiv/i-interactionscreen.xml @@ -48,6 +48,8 @@ <cd:constant type="attachment"/> <cd:constant type="layer"/> <cd:constant type="title"/> + <cd:constant type="lefttoright"/> + <cd:constant type="righttoleft"/> <cd:constant type="nomenubar"/> </cd:parameter> <cd:parameter name="copies"> diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml index c27c729f7..416cf1ccd 100644 --- a/tex/context/interface/mkiv/i-itemgroup.xml +++ b/tex/context/interface/mkiv/i-itemgroup.xml @@ -4,24 +4,238 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineitemgroup" level="style" category="structure" file="strc-itm.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name"/> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="setupitemgroup" level="style" category="structure counter" file="strc-itm.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="each"/> + <cd:define name="keyword-setupitemgroup"> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="intro"/> + <cd:constant type="random"/> + <cd:constant type="continue"/> + <cd:constant type="packed"/> + <cd:constant type="autointro"/> + <cd:constant type="broad"/> + <cd:constant type="text"/> + <cd:constant type="before"/> + <cd:constant type="after"/> + <cd:constant type="nowhite"/> + <cd:constant type="margin"/> + <cd:constant type="inmargin"/> + <cd:constant type="atmargin"/> + <cd:constant type="intext"/> + <cd:constant type="loose"/> + <cd:constant type="fit"/> + <cd:constant type="nofit"/> + <cd:constant type="paragraph"/> + <cd:constant type="joinedup"/> + <cd:constant type="serried"/> + <cd:constant type="stopper"/> + <cd:constant type="nostopper"/> + <cd:constant type="unpacked"/> + <cd:constant type="repeat"/> + <cd:constant type="norepeat"/> + <cd:constant type="reverse"/> + <cd:constant type="columns"/> + <cd:constant type="one"/> + <cd:constant type="two"/> + <cd:constant type="three"/> + <cd:constant type="four"/> + <cd:constant type="five"/> + <cd:constant type="six"/> + <cd:constant type="seven"/> + <cd:constant type="eight"/> + <cd:constant type="nine"/> + <cd:constant type="standard"/> + <cd:constant type="broad" prefix="cd:number" method="factor"/> + <cd:constant type="serried" prefix="cd:number" method="factor"/> + <cd:constant type="horizontal"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:define> + + <cd:define name="assignment-setupitemgroup"> + <cd:assignments list="yes" optional="yes"> + <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="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="beforehead"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="afterhead"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="left"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="right"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="factor"> <cd:constant type="cd:number"/> - </cd:keywords> - <cd:keywords list="yes" optional="yes"> + </cd:parameter> + <cd:parameter name="step"> + <cd:constant type="cd:dimension"/> + </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="margin"> + <cd:resolve name="value-leftskip"/> + </cd:parameter> + <cd:parameter name="leftmargin"> + <cd:resolve name="value-leftskip"/> + </cd:parameter> + <cd:parameter name="rightmargin"> + <cd:resolve name="value-rightskip"/> + </cd:parameter> + <cd:parameter name="leftmargindistance"> + <cd:resolve name="value-leftskip"/> + </cd:parameter> + <cd:parameter name="rightmargindistance"> + <cd:resolve name="value-rightskip"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="indenting"> + <cd:inherit name="setupindenting"/> + </cd:parameter> + <cd:parameter name="start"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="symalign"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="flushleft"/> + <cd:constant type="center"/> + <cd:constant type="flushright"/> + </cd:parameter> + <cd:parameter name="symbol"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="indentnext"> + <cd:resolve name="value-indentnext"/> + </cd:parameter> + <cd:parameter name="inner"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:csname"/> + </cd:parameter> + <cd:parameter name="items"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="itemalign"> + <cd:resolve name="value-alignsimple"/> + </cd:parameter> + <cd:parameter name="alignsymbol"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="textdistance"> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant type="big"/> + <cd:constant type="none"/> + <cd:constant type="space" default="yes"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="placestopper"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </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="headstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="marstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="marcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="symstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="symcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> + </cd:assignments> + </cd:define> + + <cd:define name="mixed-setupitemgroup"> + <cd:assignments list="yes"> + <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="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="beforehead"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="afterhead"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="left"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="right"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="step"> + <cd:constant type="cd:dimension"/> + </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="option"> <cd:constant type="intro"/> <cd:constant type="random"/> <cd:constant type="continue"/> @@ -43,7 +257,6 @@ <cd:constant type="joinedup"/> <cd:constant type="serried"/> <cd:constant type="stopper"/> - <cd:constant type="nostopper"/> <cd:constant type="unpacked"/> <cd:constant type="repeat"/> <cd:constant type="norepeat"/> @@ -63,334 +276,139 @@ <cd:constant type="serried" prefix="cd:number" method="factor"/> <cd:constant type="horizontal"/> <cd:constant type="cd:name"/> - </cd:keywords> + </cd:parameter> + <cd:parameter name="margin"> + <cd:resolve name="value-leftskip"/> + </cd:parameter> + <cd:parameter name="leftmargin"> + <cd:resolve name="value-leftskip"/> + </cd:parameter> + <cd:parameter name="rightmargin"> + <cd:resolve name="value-rightskip"/> + </cd:parameter> + <cd:parameter name="leftmargindistance"> + <cd:resolve name="value-leftskip"/> + </cd:parameter> + <cd:parameter name="rightmargindistance"> + <cd:resolve name="value-rightskip"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="indenting"> + <cd:inherit name="setupindenting"/> + </cd:parameter> + <cd:parameter name="start"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="symalign"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="flushleft"/> + <cd:constant type="center"/> + <cd:constant type="flushright"/> + </cd:parameter> + <cd:parameter name="symbol"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="indentnext"> + <cd:resolve name="value-indentnext"/> + </cd:parameter> + <cd:parameter name="inner"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:csname"/> + </cd:parameter> + <cd:parameter name="items"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="itemalign"> + <cd:resolve name="value-alignsimple"/> + </cd:parameter> + <cd:parameter name="alignsymbol"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="textdistance"> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant type="big"/> + <cd:constant type="none"/> + <cd:constant type="space" default="yes"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="placestopper"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </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="headstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="marstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="marcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="symstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="symcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> + </cd:assignments> + </cd:define> + + <cd:command name="defineitemgroup" level="style" category="structure" file="strc-itm.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <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="inbetween"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="beforehead"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="afterhead"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="lefttext"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="righttext"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="left"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="right"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="factor"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="step"> - <cd:constant type="cd:dimension"/> - </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="margin"> - <cd:resolve name="value-leftskip"/> - </cd:parameter> - <cd:parameter name="leftmargin"> - <cd:resolve name="value-leftskip"/> - </cd:parameter> - <cd:parameter name="rightmargin"> - <cd:resolve name="value-rightskip"/> - </cd:parameter> - <cd:parameter name="leftmargindistance"> - <cd:resolve name="value-leftskip"/> - </cd:parameter> - <cd:parameter name="rightmargindistance"> - <cd:resolve name="value-rightskip"/> - </cd:parameter> - <cd:parameter name="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> - <cd:parameter name="indenting"> - <cd:inherit name="setupindenting"/> - </cd:parameter> - <cd:parameter name="start"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="symalign"> - <cd:constant type="left"/> - <cd:constant type="middle"/> - <cd:constant type="right"/> - <cd:constant type="flushleft"/> - <cd:constant type="center"/> - <cd:constant type="flushright"/> - </cd:parameter> - <cd:parameter name="symbol"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="indentnext"> - <cd:resolve name="value-indentnext"/> - </cd:parameter> - <cd:parameter name="inner"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="command"> - <cd:constant type="cd:csname"/> - </cd:parameter> - <cd:parameter name="items"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="maxwidth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="itemalign"> - <cd:resolve name="value-alignsimple"/> - </cd:parameter> - <cd:parameter name="alignsymbol"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - </cd:parameter> - <cd:parameter name="textdistance"> - <cd:constant type="small"/> - <cd:constant type="medium"/> - <cd:constant type="big"/> - <cd:constant type="none"/> - <cd:constant type="space" default="yes"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="placestopper"> - <cd:constant type="yes" default="yes"/> - <cd:constant type="no"/> - </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="headstyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="headcolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="marstyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="marcolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="symstyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="symcolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="grid"> - <cd:inherit name="definegridsnapping"/> - </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:inherit name="setupitemgroup"/> </cd:assignments> </cd:arguments> </cd:command> + <cd:command name="setupitemgroup" level="style" category="structure counter" file="strc-itm.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="each"/> + <cd:constant type="cd:number"/> + </cd:keywords> + <cd:resolve name="keyword-setupitemgroup"/> + <cd:resolve name="assignment-setupitemgroup"/> + </cd:arguments> + </cd:command> + <cd:command name="setupitemgroup" variant="assignment" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> <cd:constant type="cd:number" prefix="cd:name" method="range"/> </cd:keywords> - <cd:assignments list="yes"> - <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="inbetween"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="beforehead"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="afterhead"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="lefttext"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="righttext"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="left"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="right"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="factor"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="step"> - <cd:constant type="cd:dimension"/> - </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="option"> - <cd:constant type="intro"/> - <cd:constant type="random"/> - <cd:constant type="continue"/> - <cd:constant type="packed"/> - <cd:constant type="autointro"/> - <cd:constant type="broad"/> - <cd:constant type="text"/> - <cd:constant type="before"/> - <cd:constant type="after"/> - <cd:constant type="nowhite"/> - <cd:constant type="margin"/> - <cd:constant type="inmargin"/> - <cd:constant type="atmargin"/> - <cd:constant type="intext"/> - <cd:constant type="loose"/> - <cd:constant type="fit"/> - <cd:constant type="nofit"/> - <cd:constant type="paragraph"/> - <cd:constant type="joinedup"/> - <cd:constant type="serried"/> - <cd:constant type="stopper"/> - <cd:constant type="unpacked"/> - <cd:constant type="repeat"/> - <cd:constant type="norepeat"/> - <cd:constant type="reverse"/> - <cd:constant type="columns"/> - <cd:constant type="one"/> - <cd:constant type="two"/> - <cd:constant type="three"/> - <cd:constant type="four"/> - <cd:constant type="five"/> - <cd:constant type="six"/> - <cd:constant type="seven"/> - <cd:constant type="eight"/> - <cd:constant type="nine"/> - <cd:constant type="standard"/> - <cd:constant type="broad" prefix="cd:number" method="factor"/> - <cd:constant type="serried" prefix="cd:number" method="factor"/> - <cd:constant type="horizontal"/> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="margin"> - <cd:resolve name="value-leftskip"/> - </cd:parameter> - <cd:parameter name="leftmargin"> - <cd:resolve name="value-leftskip"/> - </cd:parameter> - <cd:parameter name="rightmargin"> - <cd:resolve name="value-rightskip"/> - </cd:parameter> - <cd:parameter name="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> - <cd:parameter name="indenting"> - <cd:inherit name="setupindenting"/> - </cd:parameter> - <cd:parameter name="start"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="symalign"> - <cd:constant type="left"/> - <cd:constant type="middle"/> - <cd:constant type="right"/> - <cd:constant type="flushleft"/> - <cd:constant type="center"/> - <cd:constant type="flushright"/> - </cd:parameter> - <cd:parameter name="symbol"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="indentnext"> - <cd:resolve name="value-indentnext"/> - </cd:parameter> - <cd:parameter name="inner"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="command"> - <cd:constant type="cd:csname"/> - </cd:parameter> - <cd:parameter name="items"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="maxwidth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="itemalign"> - <cd:resolve name="value-alignsimple"/> - </cd:parameter> - <cd:parameter name="alignsymbol"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - </cd:parameter> - <cd:parameter name="textdistance"> - <cd:constant type="small"/> - <cd:constant type="medium"/> - <cd:constant type="big"/> - <cd:constant type="none"/> - <cd:constant type="space" default="yes"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="placestopper"> - <cd:constant type="yes" default="yes"/> - <cd:constant type="no"/> - </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="headstyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="headcolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="marstyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="marcolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="symstyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="symcolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="grid"> - <cd:inherit name="definegridsnapping"/> - </cd:parameter> - <cd:inherit name="setupcounter"/> - </cd:assignments> + <cd:resolve name="mixed-setupitemgroup"/> </cd:arguments> </cd:command> @@ -400,9 +418,7 @@ <cd:constant type="cd:name"/> <cd:constant type="cd:number" prefix="cd:name" method="range"/> </cd:keywords> - <cd:assignments list="yes"> - <cd:inherit name="setupitemgroup"/> - </cd:assignments> + <cd:resolve name="mixed-setupitemgroup"/> </cd:arguments> </cd:command> @@ -416,12 +432,8 @@ <cd:constant type="each"/> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> - </cd:assignments> + <cd:resolve name="keyword-setupitemgroup"/> + <cd:resolve name="assignment-setupitemgroup"/> </cd:arguments> <cd:instances> <cd:resolve name="instance-itemgroup"/> @@ -576,34 +588,4 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="itemize" type="environment" level="document" category="structure" file="strc-itm.mkvi"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="setupitemize" level="style" category="structure" file="strc-itm.mkvi"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="each"/> - <cd:constant type="cd:number"/> - </cd:keywords> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupitemgroup"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - </cd:interface> diff --git a/tex/context/interface/mkiv/i-math.xml b/tex/context/interface/mkiv/i-math.xml index ae8fa1c3e..888d2bac5 100644 --- a/tex/context/interface/mkiv/i-math.xml +++ b/tex/context/interface/mkiv/i-math.xml @@ -139,6 +139,15 @@ </cd:arguments> </cd:command> + <cd:command name="mathematics" variant="assignment" level="document" category="mathematics" file="math-ini.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathematics"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="math" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> @@ -146,6 +155,15 @@ </cd:arguments> </cd:command> + <cd:command name="math" variant="assignment" level="document" category="mathematics" file="math-ini.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathematics"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="m" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> @@ -153,6 +171,15 @@ </cd:arguments> </cd:command> + <cd:command name="m" variant="assignment" level="document" category="mathematics" file="math-ini.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathematics"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="definemathcommand" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> @@ -310,6 +337,31 @@ </cd:arguments> </cd:command> + <!-- + + <cd:command name="text" level="document" category="mathematics" file="math-ini.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="t" level="document" category="mathematics" file="math-ini.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="w" level="document" category="mathematics" file="math-ini.mkiv"> + <cd:arguments> + <cd:resolve name="string-boxoptions"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + --> + <cd:command name="mathtexttf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> @@ -511,4 +563,8 @@ </cd:arguments> </cd:command> + <cd:command name="stackscripts" level="document" category="mathematics" file="math-ini.mkiv"/> + + <cd:command name="unstackscripts" level="document" category="mathematics" file="math-ini.mkiv"/> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathfence.xml b/tex/context/interface/mkiv/i-mathfence.xml index 5e1abec2b..a214c3bfd 100644 --- a/tex/context/interface/mkiv/i-mathfence.xml +++ b/tex/context/interface/mkiv/i-mathfence.xml @@ -69,7 +69,48 @@ <cd:command name="fenced" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> - <cd:resolve name="keyword-name"/> + <cd:keywords> + <cd:constant type="parenthesis"/> + <cd:constant type="bracket"/> + <cd:constant type="brace"/> + <cd:constant type="bar"/> + <cd:constant type="doublebar"/> + <cd:constant type="triplebar"/> + <cd:constant type="angle"/> + <cd:constant type="doubleangle"/> + <cd:constant type="solidus"/> + <cd:constant type="ceiling"/> + <cd:constant type="floor"/> + <cd:constant type="moustache"/> + <cd:constant type="uppercorner"/> + <cd:constant type="lowercorner"/> + <cd:constant type="group"/> + <cd:constant type="openbracket"/> + <!-- + <cd:constant type="nothing"/> + <cd:constant type="mirrored"/> + --> + <cd:constant type="mirroredparenthesis"/> + <cd:constant type="mirroredbracket"/> + <cd:constant type="mirroredbrace"/> + <cd:constant type="mirroredbar"/> + <cd:constant type="mirroreddoublebar"/> + <cd:constant type="mirroredtriplebar"/> + <cd:constant type="mirroredangle"/> + <cd:constant type="mirroreddoubleangle"/> + <cd:constant type="mirroredsolidus"/> + <cd:constant type="mirroredceiling"/> + <cd:constant type="mirroredfloor"/> + <cd:constant type="mirroredmoustache"/> + <cd:constant type="mirroreduppercorner"/> + <cd:constant type="mirroredlowercorner"/> + <cd:constant type="mirroredgroup"/> + <cd:constant type="mirroredopenbracket"/> + <!-- + <cd:constant type="mirrorednothing"/> + --> + <cd:constant type="cd:name"/> + </cd:keywords> <cd:content/> </cd:arguments> </cd:command> @@ -78,7 +119,7 @@ <cd:command name="left" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> - <cd:resolve name="string-character"/> + <cd:resolve name="string-leftfence"/> </cd:arguments> </cd:command> @@ -90,7 +131,7 @@ <cd:command name="right" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> - <cd:resolve name="string-character"/> + <cd:resolve name="string-rightfence"/> </cd:arguments> </cd:command> @@ -192,7 +233,7 @@ <cd:command name="lfence" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> - <cd:resolve name="argument-character"/> + <cd:resolve name="argument-leftfence"/> </cd:arguments> </cd:command> @@ -204,7 +245,7 @@ <cd:command name="rfence" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> - <cd:resolve name="argument-character"/> + <cd:resolve name="argument-rightfence"/> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-mixedcolumns.xml b/tex/context/interface/mkiv/i-mixedcolumns.xml index 4e1ab9625..701375237 100644 --- a/tex/context/interface/mkiv/i-mixedcolumns.xml +++ b/tex/context/interface/mkiv/i-mixedcolumns.xml @@ -131,4 +131,12 @@ --> -</cd:interface>
\ No newline at end of file + <cd:command name="setupcolumns" level="style" category="structure layout" file="page-smp.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupmixedcolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml index 03e53a0e3..ee1ac5a31 100644 --- a/tex/context/interface/mkiv/i-note.xml +++ b/tex/context/interface/mkiv/i-note.xml @@ -413,6 +413,14 @@ </cd:arguments> </cd:command> + <cd:command name="setupfootnotes" level="style" category="structure notes" file="strc-not.mkvi"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupnote"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command name="setnote" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> @@ -708,4 +716,47 @@ --> + <cd:command name="definetextnote" level="style" category="structure notes" file="strc-tnt.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptextnote"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuptextnote" level="style" category="structure notes" file="strc-tnt.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="rule"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="note"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="*"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="empty"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="none"/> + <cd:constant type="number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="textnote" generated="yes" level="document" category="structure notes" file="strc-tnt.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptextnote"/> + </cd:assignments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml index f25e72f72..8b2cd86b9 100644 --- a/tex/context/interface/mkiv/i-pagegrid.xml +++ b/tex/context/interface/mkiv/i-pagegrid.xml @@ -277,7 +277,29 @@ <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcolumnsetspan"/> + <cd:parameter name="c"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="r"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="tblr"/> + <cd:constant type="lrtb"/> + <cd:constant type="tbrl"/> + <cd:constant type="rltb"/> + <cd:constant type="fxtb"/> + <cd:constant type="btlr"/> + <cd:constant type="lrbt"/> + <cd:constant type="btrl"/> + <cd:constant type="rlbt"/> + <cd:constant type="fxbt"/> + <cd:constant type="fixd"/> + </cd:parameter> + <cd:parameter name="option"> + <cd:constant type="none" default="yes"/> + <cd:constant type="wide"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-pagenumber.xml b/tex/context/interface/mkiv/i-pagenumber.xml index 4c262db4b..91c0d8f59 100644 --- a/tex/context/interface/mkiv/i-pagenumber.xml +++ b/tex/context/interface/mkiv/i-pagenumber.xml @@ -4,6 +4,22 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + <cd:define name="assignment-setupuserpagenumber"> + <cd:assignments list="yes"> + <cd:parameter name="viewerprefix"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="state"> + <cd:constant type="start"/> + <cd:constant type="stop"/> + <cd:constant type="none"/> + <cd:constant type="keep"/> + <cd:constant type="empty"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> + </cd:assignments> + </cd:define> + <cd:command name="setuprealpagenumber" level="system" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> @@ -14,19 +30,7 @@ <cd:command name="setupuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="viewerprefix"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="state"> - <cd:constant type="start"/> - <cd:constant type="stop"/> - <cd:constant type="none"/> - <cd:constant type="keep"/> - <cd:constant type="empty"/> - </cd:parameter> - <cd:inherit name="setupcounter"/> - </cd:assignments> + <cd:resolve name="assignment-setupuserpagenumber"/> </cd:arguments> </cd:command> @@ -40,9 +44,7 @@ <cd:command name="setuppagenumber" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> - <cd:assignments list="yes"> - <cd:inherit name="setupuserpagenumber"/> - </cd:assignments> + <cd:resolve name="assignment-setupuserpagenumber"/> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-paragraphs.xml b/tex/context/interface/mkiv/i-paragraphs.xml index 0d8ae3d2e..e2fc9116e 100644 --- a/tex/context/interface/mkiv/i-paragraphs.xml +++ b/tex/context/interface/mkiv/i-paragraphs.xml @@ -79,6 +79,7 @@ <cd:command name="setupparagraphs" variant="assignment" level="style" category="tables" file="tabl-mis.mkiv"> <cd:arguments> <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> <cd:constant type="cd:number" prefix="cd:name" method="range"/> </cd:keywords> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 3822e876e..9fa13268b 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml index 7ba3a0f7c..e5ddfd821 100644 --- a/tex/context/interface/mkiv/i-register.xml +++ b/tex/context/interface/mkiv/i-register.xml @@ -4,6 +4,178 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + <cd:define name="assignment-setupregister"> + <cd:assignments list="yes"> + <cd:parameter name="referencemethod"> + <cd:constant type="forward"/> + </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="ownnumber"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant type="b"/> + <cd:constant type="A"/> + <cd:constant type="B"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:resolve name="value-sortmethod"/> + </cd:parameter> + <cd:parameter name="compress"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="all"/> + <cd:constant type="packed"/> + <cd:constant type="text"/> + </cd:parameter> + <cd:parameter name="check"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="local"/> + <cd:constant type="text"/> + <cd:constant type="current"/> + <cd:constant type="previous"/> + <cd:constant type="all" default="yes"/> + <cd:constant type="cd:section"/> + </cd:parameter> + <cd:parameter name="pageprefixseparatorset"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefixconversionset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageprefixstarter"> + <cd:resolve name="value-starter"/> + </cd:parameter> + <cd:parameter name="pageprefixstopper"> + <cd:resolve name="value-stopper"/> + </cd:parameter> + <cd:parameter name="pageprefixset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageprefixsegments"> + <cd:resolve name="value-prefixsegments"/> + </cd:parameter> + <cd:parameter name="pageprefixconnector"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageprefix"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="pageseparatorset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pageconversionset"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="pagestarter"> + <cd:resolve name="value-starter"/> + </cd:parameter> + <cd:parameter name="pagestopper"> + <cd:resolve name="value-stopper"/> + </cd:parameter> + <cd:parameter name="pagesegments"> + <cd:resolve name="value-numbersegments"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="indicator"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </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="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="textcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="pagecommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="interaction"> + <cd:constant type="text"/> + <cd:constant type="pagenumber" default="yes"/> + </cd:parameter> + <cd:parameter name="pagenumber"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="symbol"> + <cd:constant type="a"/> + <cd:constant type="n" default="yes"/> + <cd:constant type="none"/> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="language"> + <cd:resolve name="value-sortorder"/> + </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="textstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="textcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="pagestyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="pagecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </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="numberorder"> + <cd:constant type="numbers" default="yes"/> + </cd:parameter> + </cd:assignments> + </cd:define> + <cd:command name="defineregister" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> @@ -18,174 +190,7 @@ <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-number-list-optional"/> - <cd:assignments list="yes"> - <cd:parameter name="referencemethod"> - <cd:constant type="forward"/> - </cd:parameter> - <cd:parameter name="expansion"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - <cd:constant type="xml"/> - </cd:parameter> - <cd:parameter name="ownnumber"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - </cd:parameter> - <cd:parameter name="xmlsetup"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="alternative"> - <cd:constant type="a"/> - <cd:constant type="b"/> - <cd:constant type="A"/> - <cd:constant type="B"/> - </cd:parameter> - <cd:parameter name="method"> - <cd:resolve name="value-sortmethod"/> - </cd:parameter> - <cd:parameter name="compress"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - <cd:constant type="all"/> - <cd:constant type="packed"/> - </cd:parameter> - <cd:parameter name="check"> - <cd:constant type="yes" default="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="criterium"> - <cd:constant type="local"/> - <cd:constant type="text"/> - <cd:constant type="current"/> - <cd:constant type="previous"/> - <cd:constant type="all" default="yes"/> - <cd:constant type="cd:section"/> - </cd:parameter> - <cd:parameter name="pageprefixseparatorset"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="pageprefixconversionset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="pageprefixstarter"> - <cd:resolve name="value-starter"/> - </cd:parameter> - <cd:parameter name="pageprefixstopper"> - <cd:resolve name="value-stopper"/> - </cd:parameter> - <cd:parameter name="pageprefixset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="pageprefixsegments"> - <cd:resolve name="value-prefixsegments"/> - </cd:parameter> - <cd:parameter name="pageprefixconnector"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="pageprefix"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="pageseparatorset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="pageconversionset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="pagestarter"> - <cd:resolve name="value-starter"/> - </cd:parameter> - <cd:parameter name="pagestopper"> - <cd:resolve name="value-stopper"/> - </cd:parameter> - <cd:parameter name="pagesegments"> - <cd:resolve name="value-numbersegments"/> - </cd:parameter> - <cd:parameter name="maxwidth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="indicator"> - <cd:constant type="yes" default="yes"/> - <cd:constant type="no"/> - </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="command"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="textcommand"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="deeptextcommand"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="pagecommand"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="interaction"> - <cd:constant type="text"/> - <cd:constant type="pagenumber" default="yes"/> - </cd:parameter> - <cd:parameter name="pagenumber"> - <cd:constant type="yes" default="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="symbol"> - <cd:constant type="a"/> - <cd:constant type="n" default="yes"/> - <cd:constant type="none"/> - <cd:constant type="1"/> - <cd:constant type="2"/> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="language"> - <cd:resolve name="value-sortorder"/> - </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="textstyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="textcolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="pagestyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="pagecolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="pageleft"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="pageright"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </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="numberorder"> - <cd:constant type="numbers" default="yes"/> - </cd:parameter> - </cd:assignments> + <cd:resolve name="assignment-setupregister"/> </cd:arguments> </cd:command> @@ -195,173 +200,7 @@ <cd:constant type="cd:name"/> <cd:constant type="cd:number" prefix="cd:name" method="range"/> </cd:keywords> - <cd:assignments list="yes"> - <cd:parameter name="referencemethod"> - <cd:constant type="forward"/> - </cd:parameter> - <cd:parameter name="expansion"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - <cd:constant type="xml"/> - </cd:parameter> - <cd:parameter name="ownnumber"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - </cd:parameter> - <cd:parameter name="xmlsetup"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="alternative"> - <cd:constant type="a"/> - <cd:constant type="b"/> - <cd:constant type="A"/> - <cd:constant type="B"/> - </cd:parameter> - <cd:parameter name="method"> - <cd:resolve name="value-sortmethod"/> - </cd:parameter> - <cd:parameter name="compress"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - <cd:constant type="all"/> - </cd:parameter> - <cd:parameter name="check"> - <cd:constant type="yes" default="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="criterium"> - <cd:constant type="local"/> - <cd:constant type="text"/> - <cd:constant type="current"/> - <cd:constant type="previous"/> - <cd:constant type="all" default="yes"/> - <cd:constant type="cd:section"/> - </cd:parameter> - <cd:parameter name="pageprefixseparatorset"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="pageprefixconversionset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="pageprefixstarter"> - <cd:resolve name="value-starter"/> - </cd:parameter> - <cd:parameter name="pageprefixstopper"> - <cd:resolve name="value-stopper"/> - </cd:parameter> - <cd:parameter name="pageprefixset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="pageprefixsegments"> - <cd:resolve name="value-prefixsegments"/> - </cd:parameter> - <cd:parameter name="pageprefixconnector"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="pageprefix"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="pageseparatorset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="pageconversionset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="pagestarter"> - <cd:resolve name="value-starter"/> - </cd:parameter> - <cd:parameter name="pagestopper"> - <cd:resolve name="value-stopper"/> - </cd:parameter> - <cd:parameter name="pagesegments"> - <cd:resolve name="value-numbersegments"/> - </cd:parameter> - <cd:parameter name="maxwidth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="indicator"> - <cd:constant type="yes" default="yes"/> - <cd:constant type="no"/> - </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="command"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="textcommand"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="deeptextcommand"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="pagecommand"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="interaction"> - <cd:constant type="text"/> - <cd:constant type="pagenumber" default="yes"/> - </cd:parameter> - <cd:parameter name="pagenumber"> - <cd:constant type="yes" default="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="symbol"> - <cd:constant type="a"/> - <cd:constant type="n" default="yes"/> - <cd:constant type="none"/> - <cd:constant type="1"/> - <cd:constant type="2"/> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="language"> - <cd:resolve name="value-sortorder"/> - </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="textstyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="textcolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="pagestyle"> - <cd:resolve name="value-style"/> - </cd:parameter> - <cd:parameter name="pagecolor"> - <cd:constant type="cd:color"/> - </cd:parameter> - <cd:parameter name="pageleft"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="pageright"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </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="numberorder"> - <cd:constant type="numbers" default="yes"/> - </cd:parameter> - </cd:assignments> + <cd:resolve name="assignment-setupregister"/> </cd:arguments> </cd:command> @@ -369,9 +208,7 @@ <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-number-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupregister"/> - </cd:assignments> + <cd:resolve name="assignment-setupregister"/> </cd:arguments> </cd:command> @@ -381,9 +218,7 @@ <cd:constant type="cd:name"/> <cd:constant type="cd:number" prefix="cd:name" method="range"/> </cd:keywords> - <cd:assignments list="yes"> - <cd:inherit name="setupregister"/> - </cd:assignments> + <cd:resolve name="assignment-setupregister"/> </cd:arguments> </cd:command> @@ -478,9 +313,7 @@ </cd:sequence> <cd:arguments> <cd:resolve name="keyword-number-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupregister"/> - </cd:assignments> + <cd:resolve name="assignment-setupregister"/> </cd:arguments> <cd:instances> <cd:resolve name="instance-register"/> @@ -489,63 +322,25 @@ <!-- - <cd:command name="index" level="document" category="structure" file="strc-reg.mkiv"> + <cd:command name="startregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> - <cd:constant type="cd:text" prefix="cd:processor" method="apply"/> </cd:keywords> - <cd:index list="yes"/> - </cd:arguments> - </cd:command> - - <cd:command name="index" variant="ownnumber" level="document" category="structure" file="strc-reg.mkiv"> - <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> <cd:constant type="cd:text" prefix="cd:processor" method="apply"/> </cd:keywords> - <cd:resolve name="argument-text"/> <cd:index list="yes"/> </cd:arguments> </cd:command> - <cd:command name="seeindex" level="document" category="structure" file="strc-reg.mkiv"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:text" prefix="cd:processor" method="apply"/> - </cd:keywords> - <cd:index list="yes"/> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:text" prefix="cd:processor" method="apply"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="placeindex" level="document" category="structure" file="strc-reg.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupregister"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completeindex" level="document" category="structure" file="strc-reg.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupregister"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="setupindex" level="style" category="structure" file="strc-reg.mkiv"> + <cd:command name="stopregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> - <cd:resolve name="keyword-number-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupregister"/> - </cd:assignments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> @@ -563,11 +358,8 @@ <cd:constant type="cd:text" prefix="cd:processor" method="apply"/> </cd:keywords> <cd:index list="yes"/> - </cd:arguments> - </cd:command> - - <cd:command name="stopregister" level="document" category="structure" file="strc-reg.mkiv"> - <cd:arguments> + <cd:resolve name="string-content"/> + <cd:delimiter name="stopregister"/> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -612,17 +404,34 @@ </cd:arguments> </cd:command> + <!-- + + <cd:command name="startstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name"/> + <cd:resolve name="assignment-registerdata-list"/> + <cd:resolve name="assignment-userdata-list-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="stopstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + --> + <cd:command name="startstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-registerdata-list"/> <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="stopstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> - <cd:arguments> + <cd:resolve name="string-content"/> + <cd:delimiter name="stopstructurepageregister"/> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-section.xml b/tex/context/interface/mkiv/i-section.xml index b4229d5fd..0ec20a804 100644 --- a/tex/context/interface/mkiv/i-section.xml +++ b/tex/context/interface/mkiv/i-section.xml @@ -246,6 +246,10 @@ <cd:constant type="positive"/> <cd:constant type="all"/> </cd:parameter> + <cd:parameter name="hidenumber"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -319,6 +323,30 @@ </cd:arguments> </cd:command> + <cd:command name="placerawheaddata" level="system" category="structure" file="strc-sec.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-section"/> + </cd:arguments> + </cd:command> + + <cd:command name="placerawheadtext" level="system" category="structure" file="strc-sec.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-section"/> + </cd:arguments> + </cd:command> + + <cd:command name="placerawheadnumber" level="system" category="structure" file="strc-sec.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-section"/> + </cd:arguments> + </cd:command> + + <cd:command name="repeathead" level="document" category="structure" file="strc-sec.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-section"/> + </cd:arguments> + </cd:command> + <cd:command name="definesection" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> diff --git a/tex/context/interface/mkiv/i-simplecolumns.xml b/tex/context/interface/mkiv/i-simplecolumns.xml new file mode 100644 index 000000000..caefa9fbb --- /dev/null +++ b/tex/context/interface/mkiv/i-simplecolumns.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:command name="setsimplecolumnshsize" level="system" category="structure layout" file="page-smp.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="structure layout" file="page-smp.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setsimplecolumnshsize"/> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-symbol.xml b/tex/context/interface/mkiv/i-symbol.xml index 498684cad..64a6f27dd 100644 --- a/tex/context/interface/mkiv/i-symbol.xml +++ b/tex/context/interface/mkiv/i-symbol.xml @@ -147,4 +147,15 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="setupsymbols" level="style" category="symbols" file="symb-ini.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="stylealternative"> + <cd:constant type="text" default="yes"/> + <cd:constant type="math"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface> 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> diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml index 5e970d317..e79e4e736 100644 --- a/tex/context/interface/mkiv/i-vspace.xml +++ b/tex/context/interface/mkiv/i-vspace.xml @@ -140,4 +140,10 @@ </cd:arguments> </cd:command> + <cd:command name="crlf" level="document" category="whitespace" file="typo-wrp.mkiv"/> + + <cd:command name="settestcrlf" level="document" category="whitespace" file="typo-wrp.mkiv"/> + + <cd:command name="crlfplaceholder" level="document" category="whitespace" file="typo-wrp.mkiv"/> + </cd:interface> |