diff options
author | Hans Hagen <pragma@wxs.nl> | 2018-08-11 01:23:08 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2018-08-11 01:23:08 +0200 |
commit | 1ef7a093aaf03b6327b3da94d47f53760c868c60 (patch) | |
tree | 228e6d4a5005598aaea191b3317c2fa21e22de75 /tex/context/interface/mkiv/context-en.xml | |
parent | b61d5dd3555e906b21601ff75b3268c0f359283e (diff) | |
download | context-1ef7a093aaf03b6327b3da94d47f53760c868c60.tar.gz |
2018-08-10 16:58:00
Diffstat (limited to 'tex/context/interface/mkiv/context-en.xml')
-rw-r--r-- | tex/context/interface/mkiv/context-en.xml | 632 |
1 files changed, 544 insertions, 88 deletions
diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index a1e2c4941..1df8eee8b 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -780,6 +780,7 @@ <cd:constant type="global"/> <cd:constant default="yes" type="public"/> <cd:constant type="private"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> @@ -793,6 +794,7 @@ <cd:constant type="global"/> <cd:constant type="public"/> <cd:constant default="yes" type="private"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> @@ -2976,7 +2978,7 @@ <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="strip"> - <cd:constant type="yes"/> + <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> </cd:parameter> </cd:assignments> @@ -2997,7 +2999,7 @@ </cd:command> <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="getbuffer"> <cd:arguments> - <cd:keywords optional="yes"> + <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> @@ -3807,9 +3809,35 @@ </cd:arguments> </cd:command> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="resetcharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="nocharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setcharacteraligndetail"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + <cd:constant method="apply" prefix="number" type="cd:text"/> + <cd:constant method="apply" prefix="text" type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="alignmentcharacter"/> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="characteralign" type="environment"> <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupcharacteralign"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="characteralign" type="environment" variant="argument"> + <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> <cd:constant method="apply" prefix="number" type="cd:text"/> @@ -3822,6 +3850,31 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="style" name="setupcharacteralign"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="leftwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="leftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="rightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="character"> + <cd:constant type="cd:text"/> + <cd:constant method="apply" prefix="number" type="cd:text"/> + <cd:constant method="apply" prefix="text" type="cd:text"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setfirstpasscharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setsecondpasscharacteralign"/> </cd:interface> <cd:interface file="i-characterspacing.xml"> <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="definecharacterspacing"> @@ -7479,6 +7532,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -7562,6 +7616,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -8075,7 +8133,7 @@ <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant type="cd:number"/> + <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="alternative"> <cd:constant default="yes" type="normal"/> @@ -8212,6 +8270,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant default="yes" type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -8295,6 +8354,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -10167,7 +10230,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupfloatcaption"> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -10229,6 +10292,13 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </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="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> @@ -10287,23 +10357,13 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> - </cd:assignments> - </cd:arguments> - </cd:command> <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaptions"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> + <cd:inherit name="setupcaption"/> </cd:assignments> </cd:arguments> </cd:command> @@ -10967,6 +11027,52 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="style" name="definefacingfloat"> + <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="setupfacingfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="style" name="setupfacingfloat"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </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:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="document" name="facingfloat" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-fontfamily.xml"> <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefontfamily"> @@ -13349,6 +13455,9 @@ <cd:constant type="-"/> <cd:constant type="cd:reference"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula" type="environment"> @@ -13387,6 +13496,9 @@ <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placesubformula"> @@ -13396,6 +13508,9 @@ <cd:constant type="-"/> <cd:constant type="cd:reference"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat" level="document" name="formulanumber"> @@ -14419,12 +14534,6 @@ <cd:parameter name="cache"> <cd:constant type="cd:path"/> </cd:parameter> - <cd:parameter name="userpassword"> - <cd:constant type="cd:string"/> - </cd:parameter> - <cd:parameter name="ownerpassword"> - <cd:constant type="cd:string"/> - </cd:parameter> <cd:parameter name="resources"> <cd:constant type="cd:path"/> </cd:parameter> @@ -14442,6 +14551,16 @@ <cd:constant type="no"/> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="transform"> + <cd:constant default="yes" type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="userpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="ownerpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -14760,6 +14879,20 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="overlayimage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="clippedoverlayimage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-grid.xml"> <cd:command category="layout" file="page-grd.mkiv" level="document" name="showgrid"> @@ -15006,6 +15139,12 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="rulecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -17975,6 +18114,40 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="defineperiodkerning"> + <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="setupperiodkerning"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setupperiodkerning"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setperiodkerning"> + <cd:arguments> + <cd:keywords> + <cd:constant type="reset"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="resetperiodkerning"/> </cd:interface> <cd:interface file="i-label.xml"> <cd:command category="structure" file="strc-lab.mkiv" level="style" name="definelabel"> @@ -18079,6 +18252,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant default="yes" type="intext"/> <cd:constant type="cd:name"/> @@ -18163,6 +18337,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -19205,6 +19383,7 @@ </cd:parameter> <cd:parameter name="cropoffset"> <cd:constant type="cd:dimension"/> + <cd:constant type="auto"/> </cd:parameter> <cd:parameter name="trimoffset"> <cd:constant type="cd:dimension"/> @@ -19398,7 +19577,7 @@ </cd:command> <cd:command category="layout" file="page-run.mkiv" level="document" name="showmargins"/> <cd:command category="layout" file="page-spr.mkiv" level="document" name="spread" type="environment"/> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelsetopofpage"> + <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doifelsetopofpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19408,7 +19587,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doiftopofpageelse"> + <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doiftopofpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19420,7 +19599,7 @@ </cd:command> </cd:interface> <cd:interface file="i-linefiller.xml"> - <cd:command file="node-rul.mkiv" name="definelinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19433,7 +19612,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setuplinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19490,9 +19669,33 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="filler"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefillers"> <cd:arguments> - <cd:content/> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="linefiller" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setlinefiller"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> </cd:arguments> </cd:command> </cd:interface> @@ -19987,7 +20190,6 @@ <cd:parameter name="width"> <cd:constant type="fit"/> <cd:constant type="broad"/> - <cd:constant type="auto"/> <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="height"> @@ -20314,7 +20516,7 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -20324,7 +20526,55 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:parameter name="criterium"> + <cd:constant default="yes" type="local"/> + <cd:constant type="intro"/> + <cd:constant type="reference"/> + <cd:constant method="range" prefix="cd:sectionblock" type="reference"/> + <cd:constant type="all"/> + <cd:constant method="range" prefix="cd:sectionblock" type="all"/> + <cd:constant type="text"/> + <cd:constant method="range" prefix="cd:sectionblock" type="text"/> + <cd:constant type="current"/> + <cd:constant method="range" prefix="cd:sectionblock" type="current"/> + <cd:constant type="here"/> + <cd:constant type="previous"/> + <cd:constant method="range" prefix="cd:sectionblock" type="previous"/> + <cd:constant type="component"/> + <cd:constant type="cd:section"/> + <cd:constant method="range" prefix="cd:sectionblock" type="cd:section"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="extras"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="order"> + <cd:constant type="command"/> + <cd:constant type="all"/> + <cd:constant type="title"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant default="yes" type="b"/> + <cd:constant type="c"/> + <cd:constant type="d"/> + <cd:constant type="e"/> + <cd:constant type="f"/> + <cd:constant type="g"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="command"/> + <cd:constant type="none"/> + <cd:constant type="interactive"/> + <cd:constant type="paragraph"/> + <cd:constant type="horizontal"/> + <cd:constant type="vertical"/> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -20334,7 +20584,7 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -20345,7 +20595,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -20359,7 +20609,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -20373,7 +20623,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -21779,6 +22029,7 @@ <cd:parameter name="align"> <cd:constant default="yes" type="l2r"/> <cd:constant type="r2l"/> + <cd:constant type="righttoleft"/> </cd:parameter> <cd:parameter name="bidi"> <cd:constant type="yes"/> @@ -21854,6 +22105,17 @@ <cd:parameter name="ampersand"> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="collapsing"> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant default="yes" type="3"/> + <cd:constant type="none"/> + <cd:constant type="reset"/> + </cd:parameter> + <cd:parameter name="kernpairs"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -22723,6 +22985,14 @@ <cd:constant value="mathmatrix"/> </cd:instances> </cd:command> + <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix"> + <cd:sequence> + <cd:variable value="mathmatrix"/> + </cd:sequence> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="mathematics tables" file="math-ali.mkiv" level="document" name="matrices" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -24972,6 +25242,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -25330,6 +25604,7 @@ </cd:command> <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="postponenotes"/> <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="flushnotes"/> + <cd:command category="structure notes" file="strc-not.mkvi" name="postponingnotes" type="environment"/> <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifelsenoteonsamepage"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -26217,6 +26492,78 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-pagecolumns.xml"> + <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="definepagecolumns"> + <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="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="setuppagecolumns"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="separator"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="direction"> + <cd:constant default="yes" type="normal"/> + <cd:constant type="reverse"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="blank"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment" variant="name"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" generated="yes" level="document" name="pagecolumns" type="environment" variant="instance"> + <cd:sequence> + <cd:instance value="pagecolumns"/> + </cd:sequence> + </cd:command> + </cd:interface> <cd:interface file="i-pagecomment.xml"> <cd:command category="pdf" file="page-com.mkiv" level="style" name="setuppagecomment"> <cd:arguments> @@ -26283,7 +26630,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagegrid.xml"> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26292,11 +26639,11 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnset"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26338,43 +26685,27 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="pagegrid" type="environment" variant="example"> + <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="columnset" type="environment" variant="example"> <cd:sequence> - <cd:variable value="pagegrid"/> + <cd:variable value="columnset"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegrid" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnset" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="setpagegrid"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <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="option"> - <cd:constant default="yes" type="none"/> - </cd:parameter> + <cd:inherit name="setupcolumnset"/> </cd:assignments> - <cd:content/> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetspan"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26383,11 +26714,11 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetspan"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26413,24 +26744,24 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegridspan" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnsetspan" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="pagegridspanwidth"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="columnsetspanwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetarea"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26439,11 +26770,11 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridarea"/> + <cd:inherit name="setupcolumnsetarea"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetarea"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26483,7 +26814,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridareatext"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetareatext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26493,7 +26824,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridlines"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetlines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26509,7 +26840,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridstart"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetstart"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27066,17 +27397,31 @@ </cd:command> </cd:interface> <cd:interface file="i-pagemarks.xml"> - <cd:command file="page-lay.mkiv" level="style" name="markpage"> + <cd:command file="page-ini.mkiv" level="style" name="markpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords optional="yes"> + <cd:keywords list="yes" optional="yes"> <cd:constant method="none" prefix="cd:sign" type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="page-lay.mkiv" level="style" name="doifelsemarkedpage"> + <cd:command file="page-ini.mkiv" level="style" name="markedpages"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="page-ini.mkiv" level="style" name="markpages" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="conditional" file="page-ini.mkiv" level="style" name="doifelsemarkedpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -33140,7 +33485,7 @@ <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="pageleft"> - <cd:resolve name="cd:command"/> + <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="pageright"> <cd:constant type="cd:command"/> @@ -33209,6 +33554,10 @@ <cd:constant default="yes" type="no"/> <cd:constant type="all"/> </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"/> @@ -33348,6 +33697,12 @@ <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> @@ -34043,6 +34398,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -34050,6 +34406,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -34057,6 +34414,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -34182,6 +34540,32 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setlocalscript"> + <cd:arguments> + <cd:keywords> + <cd:constant type="hangul"/> + <cd:constant type="hanzi"/> + <cd:constant type="nihongo"/> + <cd:constant type="ethiopic"/> + <cd:constant type="thai"/> + <cd:constant type="test"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setglobalscript"> + <cd:arguments> + <cd:keywords> + <cd:constant type="hangul"/> + <cd:constant type="hanzi"/> + <cd:constant type="nihongo"/> + <cd:constant type="ethiopic"/> + <cd:constant type="thai"/> + <cd:constant type="test"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="language" file="scrp-ini.mkvi" level="system" name="resetscript"/> <cd:command category="language" file="scrp-ini.mkvi" name="script" type="environment"> <cd:arguments> @@ -35955,10 +36339,7 @@ <cd:variable value="startstop"/> </cd:sequence> </cd:command> - <cd:command category="structure" file="core-sys.mkiv" level="document" name="startstop" type="environment"> - <cd:sequence> - <cd:string value=""/> - </cd:sequence> + <cd:command category="structure" file="core-sys.mkiv" level="document" name="" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -36351,6 +36732,11 @@ <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="font"> + <cd:constant type="cd:font"/> + </cd:parameter> + </cd:assignments> </cd:arguments> </cd:command> <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="setupsymbolset"> @@ -38920,7 +39306,7 @@ </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="increment" variant="argument"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -38933,7 +39319,7 @@ </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="decrement" variant="argument"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -41379,6 +41765,36 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoif"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifnot"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifelse"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command file="syst-lua.mkiv" level="system" name="expdoifelsecommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> @@ -41710,16 +42126,22 @@ <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> - <cd:parameter name="backgroundcolor"> + <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="foregroundcolor"> + <cd:parameter name="background"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="foregroundstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="foregroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="align"> <cd:constant type="left"/> <cd:constant type="middle"/> @@ -41960,7 +42382,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="xml" file="strc-tag.mkiv" level="document" name="ignoretagsinexport"> + <cd:command category="xml" file="strc-tag.mkiv" level="style" name="ignoretagsinexport"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -42379,7 +42801,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42391,7 +42813,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42403,7 +42825,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42415,7 +42837,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42427,7 +42849,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -44992,6 +45414,20 @@ <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="smallskip"/> <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="medskip"/> <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="bigskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="checkedblank"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="prerollblank"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-whitespace.xml"> <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupwhitespace"> @@ -45042,6 +45478,7 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ver.mkiv" level="system" name="forgetparskip"/> </cd:interface> <cd:interface file="i-xml.xml"> <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmain"> @@ -46435,6 +46872,25 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="aligncharacter"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="alignmentleftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentrightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentleftwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentrightwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentcharacter"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> |