diff options
author | Karl Berry <karl@freefriends.org> | 2021-03-06 21:58:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-03-06 21:58:15 +0000 |
commit | 974640d66e61e81cb197ad96fdff7b08343e4c5a (patch) | |
tree | 2e1f75f32f312b7f24ba82b4590ae230bcd6f399 /Master/texmf-dist/tex/context/interface/mkiv | |
parent | b4fa72e61230aca75f7f6fbf988821f71edfb6b2 (diff) |
context
git-svn-id: svn://tug.org/texlive/trunk@58167 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/interface/mkiv')
233 files changed, 8168 insertions, 7916 deletions
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml b/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml index 0ebeb7d8777..476e8ee62ac 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml @@ -2,7 +2,7 @@ <!-- expanded and compacted i-context.xml --> <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> <cd:interface file="i-accent.xml"> - <cd:command file="enco-ini.mkiv" level="style" name="defineaccent"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="defineaccent"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -15,7 +15,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="definecharacter"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="definecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -25,7 +25,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="definecommand"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="definecommand"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -35,7 +35,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="definemathaccent"> + <cd:command category="mathematics" file="enco-ini.mkiv" level="style" name="definemathaccent"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -45,7 +45,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="buildmathaccent"> + <cd:command category="mathematics" file="enco-ini.mkiv" level="style" name="buildmathaccent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -55,7 +55,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="buildtextaccent"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextaccent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -65,49 +65,49 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="buildtextmacron"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextmacron"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="buildtextbottomdot"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextbottomdot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="buildtextcedilla"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextcedilla"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="buildtextognek"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextognek"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="buildtextbottomcomma"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextbottomcomma"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="d"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="d"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="style" name="buildtextgrave"> + <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextgrave"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -365,7 +365,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="wordright"> + <cd:command category="alignment" file="spac-ali.mkiv" keywords="linebreak" level="document" name="wordright"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="right"/> @@ -374,7 +374,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedbox"> + <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes" level="system" name="simplealignedbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -391,7 +391,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedspreadbox"> + <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes" level="system" name="simplealignedspreadbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -408,7 +408,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedboxplus"> + <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes" level="system" name="simplealignedboxplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -428,7 +428,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplereversealignedbox"> + <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes direction" level="system" name="simplereversealignedbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -445,7 +445,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplereversealignedboxplus"> + <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes direction" level="system" name="simplereversealignedboxplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -465,7 +465,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="pack-box.mkiv" level="system" name="alignedbox"> + <cd:command category="alignment" file="pack-box.mkiv" keywords="boxes" level="system" name="alignedbox"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="left"/> @@ -506,8 +506,8 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="lefttoright"/> - <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="righttoleft"/> + <cd:command category="alignment" file="spac-ali.mkiv" keywords="direction" level="style" name="lefttoright"/> + <cd:command category="alignment" file="spac-ali.mkiv" keywords="direction" level="style" name="righttoleft"/> <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedbottom"/> <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="alignbottom"/> <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="baselinebottom"/> @@ -582,7 +582,7 @@ </cd:command> </cd:interface> <cd:interface file="i-anchor.xml"> - <cd:command file="pack-box.mkiv" level="style" name="defineanchor"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="defineanchor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -599,7 +599,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="document" name="anchor"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="anchor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -616,7 +616,7 @@ </cd:command> </cd:interface> <cd:interface file="i-attachment.xml"> - <cd:command file="scrn-wid.mkvi" level="style" name="defineattachment"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="defineattachment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -629,7 +629,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" level="style" name="setupattachment"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setupattachment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -704,7 +704,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" level="style" name="setupattachments"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setupattachments"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -714,7 +714,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" level="document" name="registerattachment"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="document" name="registerattachment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -724,7 +724,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" variant="instance"> + <cd:command category="pdf" file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" variant="instance"> <cd:sequence> <cd:instance value="attachment"/> </cd:sequence> @@ -740,7 +740,7 @@ <cd:constant value="attachment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" type="environment" variant="instance"> + <cd:command category="pdf" file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" type="environment" variant="instance"> <cd:sequence> <cd:instance value="attachment"/> </cd:sequence> @@ -756,7 +756,7 @@ <cd:constant value="attachment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" level="document" name="placeattachments"/> + <cd:command category="pdf" file="scrn-wid.mkvi" level="document" name="placeattachments"/> </cd:interface> <cd:interface file="i-attribute.xml"> <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="pushattribute"> @@ -856,7 +856,7 @@ <cd:command category="attribute" file="attr-ini.mkiv" level="document" name="showattributes"/> </cd:interface> <cd:interface file="i-backend.xml"> - <cd:command catehory="pdf" file="back-ini.mkiv" level="style" name="setupbackend"> + <cd:command category="pdf" file="back-ini.mkiv" level="style" name="setupbackend"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="export"> @@ -931,6 +931,20 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="pdf" file="back-ini.mkxl" level="style" name="setupoutput"> + <cd:arguments> + <cd:keywords> + <cd:constant type="default"/> + <cd:constant type="pdf"/> + <cd:constant type="lua"/> + <cd:constant type="json"/> + <cd:constant type="js"/> + <cd:constant type="mps"/> + <cd:constant type="none"/> + <cd:constant type="empty"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-background.xml"> <cd:command category="background" file="pack-bck.mkvi" level="style" name="definebackground"> @@ -1014,7 +1028,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background colors" file="pack-bck.mkvi" level="document" name="backgroundline"> + <cd:command category="background" file="pack-bck.mkvi" keywords="colors" level="document" name="backgroundline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -1069,7 +1083,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifelsesomebackground"> + <cd:command category="background" file="page-bck.mkiv" keywords="conditional" level="system" name="doifelsesomebackground"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1082,7 +1096,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifsomebackgroundelse"> + <cd:command category="background" file="page-bck.mkiv" keywords="conditional" level="system" name="doifsomebackgroundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1095,7 +1109,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifsomebackground"> + <cd:command category="background" file="page-bck.mkiv" keywords="conditional" level="system" name="doifsomebackground"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1190,6 +1204,10 @@ <cd:parameter name="right"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="repeat"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -1260,7 +1278,7 @@ <cd:command category="rules" file="node-rul.mkiv" level="style" name="resetbar"/> </cd:interface> <cd:interface file="i-blackrule.xml"> - <cd:command category="rules colors" file="pack-mrl.mkiv" level="style" name="setupblackrules"> + <cd:command category="rules" file="pack-mrl.mkiv" keywords="colors" level="style" name="setupblackrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -1303,14 +1321,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="rules colors" file="pack-mrl.mkiv" level="document" name="blackrule"> + <cd:command category="rules" file="pack-mrl.mkiv" keywords="colors" level="document" name="blackrule"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="rules colors" file="pack-mrl.mkiv" level="document" name="blackrules"> + <cd:command category="rules" file="pack-mrl.mkiv" keywords="colors" level="document" name="blackrules"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> @@ -1364,6 +1382,22 @@ <cd:constant method="none" prefix="type␣" type="cd:text"/> <cd:constant method="none" prefix="data␣" type="cd:text"/> <cd:constant method="none" prefix="name␣" type="cd:text"/> + <cd:constant method="none" prefix="radius␣" type="cd:dimension"/> + <cd:constant method="none" prefix="corner␣" type="cd:text"/> + </cd:keywords> + <cd:delimiter name="relax"/> + </cd:arguments> + </cd:command> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="autorule"> + <cd:arguments> + <cd:keywords delimiters="none" list="yes"> + <cd:constant method="none" prefix="width␣" type="cd:dimension"/> + <cd:constant method="none" prefix="height␣" type="cd:dimension"/> + <cd:constant method="none" prefix="depth␣" type="cd:dimension"/> + <cd:constant method="none" prefix="xoffset␣" type="cd:dimension"/> + <cd:constant method="none" prefix="yoffset␣" type="cd:dimension"/> + <cd:constant method="none" prefix="left␣" type="cd:dimension"/> + <cd:constant method="none" prefix="right␣" type="cd:dimension"/> </cd:keywords> <cd:delimiter name="relax"/> </cd:arguments> @@ -1467,13 +1501,7 @@ <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="align"> - <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:inherit name="setupalign"/> </cd:parameter> <cd:parameter name="style"> <cd:constant type="cd:style"/> @@ -1648,7 +1676,7 @@ </cd:command> </cd:interface> <cd:interface file="i-boxes.xml"> - <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doiftext"> + <cd:command category="strings" file="supp-box.mkiv" keywords="conditional" level="system" name="doiftext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1661,7 +1689,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelsetext"> + <cd:command category="strings" file="supp-box.mkiv" keywords="conditional" level="system" name="doifelsetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1674,7 +1702,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doiftextelse"> + <cd:command category="strings" file="supp-box.mkiv" keywords="conditional" level="system" name="doiftextelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1687,7 +1715,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="dowithnextbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="dowithnextbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1696,21 +1724,21 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcs"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="dowithnextboxcs"> <cd:arguments> <cd:csname/> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="nextboxwd"/> - <cd:command file="supp-box.mkiv" level="system" name="nextboxht"/> - <cd:command file="supp-box.mkiv" level="system" name="nextboxdp"/> - <cd:command file="supp-box.mkiv" level="system" name="nextboxhtdp"/> - <cd:command file="supp-box.mkiv" level="system" name="flushnextbox"/> - <cd:command file="supp-box.mkiv" level="system" name="nextbox"/> - <cd:command file="supp-box.mkiv" level="system" name="nextdepth"/> - <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcontent"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextboxwd"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextboxht"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextboxdp"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextboxhtdp"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="flushnextbox"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextbox"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextdepth"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="dowithnextboxcontent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1722,7 +1750,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcontentcs"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="dowithnextboxcontentcs"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1730,47 +1758,47 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="rlap"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rlap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="llap"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="llap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="clap"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="clap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="tlap"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="tlap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="blap"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="blap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="reshapebox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="reshapebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="beginof" end="endof" file="supp-box.mkiv" level="system" name="shapebox" type="environment"/> - <cd:command file="supp-box.mkiv" level="system" name="flushshapebox"/> - <cd:command file="supp-box.mkiv" level="system" name="innerflushshapebox"/> - <cd:command file="supp-box.mkiv" level="system" name="shapedhbox"> + <cd:command begin="beginof" category="boxes" end="endof" file="supp-box.mkiv" level="system" name="shapebox" type="environment"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="flushshapebox"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="innerflushshapebox"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="shapedhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="processtokens"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="processtokens"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1789,7 +1817,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="doboundtext"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="doboundtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1802,7 +1830,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="limitatetext"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="limitatetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1815,7 +1843,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="limitatetext" variant="list"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="limitatetext" variant="list"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1828,7 +1856,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="limitatefirstline"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="limitatefirstline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1841,7 +1869,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="processisolatedchars"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="processisolatedchars"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1849,7 +1877,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="processisolatedwords"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="processisolatedwords"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1857,7 +1885,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="applytocharacters"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytocharacters"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1865,7 +1893,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="applytowords"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytowords"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1873,7 +1901,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringchar"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringchar"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1881,7 +1909,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringword"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringword"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1889,7 +1917,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringline"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringline"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1897,7 +1925,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringcharspaced"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringcharspaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1905,7 +1933,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringwordspaced"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringwordspaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1913,7 +1941,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringlinespaced"> + <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringlinespaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1921,58 +1949,58 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="sbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="sbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="linebox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="linebox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="shiftbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="shiftbox"> <cd:arguments> <cd:dimension/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="hpackbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hpackbox"> <cd:arguments> <cd:dimension/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="vpackbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vpackbox"> <cd:arguments> <cd:dimension/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="hpackedbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hpackedbox"> <cd:arguments> <cd:dimension/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="vpackedbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vpackedbox"> <cd:arguments> <cd:dimension/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="inlinedbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="inlinedbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="struttedbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="struttedbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="topskippedbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="topskippedbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="centeredbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="centeredbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1980,7 +2008,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="centerednextbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="centerednextbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1988,7 +2016,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="centerbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="centerbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1996,7 +2024,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="setrigidcolumnhsize"> + <cd:command category="columns" file="supp-box.mkiv" level="system" name="setrigidcolumnhsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -2009,7 +2037,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="setrigidcolumnbalance"> + <cd:command category="columns" file="supp-box.mkiv" level="system" name="setrigidcolumnbalance"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2017,11 +2045,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="vboxtohbox" type="environment"/> - <cd:command file="supp-box.mkiv" level="system" name="vboxtohboxseparator" type="environment"/> - <cd:command file="supp-box.mkiv" level="system" name="convertvboxtohbox"/> - <cd:command file="supp-box.mkiv" level="system" name="hboxestohbox" type="environment"/> - <cd:command file="supp-box.mkiv" level="system" name="unhhbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vboxtohbox" type="environment"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vboxtohboxseparator" type="environment"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="convertvboxtohbox"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hboxestohbox" type="environment"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="unhhbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2033,7 +2061,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="hboxofvbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hboxofvbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2041,7 +2069,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="doifcontent"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional" level="system" name="doifcontent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -2056,8 +2084,8 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="overlay" type="environment"/> - <cd:command file="supp-box.mkiv" level="system" name="fakebox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="overlay" type="environment"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="fakebox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2065,7 +2093,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="lbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2073,7 +2101,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="cbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="cbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2081,7 +2109,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="rbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2089,7 +2117,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="ltop"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="ltop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2097,7 +2125,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="ctop"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="ctop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2105,7 +2133,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="rtop"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2113,47 +2141,47 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="tbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="tbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="bbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="bbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="lhbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="mhbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="mhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="rhbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="lefthbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lefthbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="midhbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="midhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="righthbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="righthbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="boxofsize"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="boxofsize"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none" list="yes" optional="yes"> @@ -2162,7 +2190,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="limitatelines"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="limitatelines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -2175,98 +2203,98 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="fittopbaselinegrid"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="fittopbaselinegrid"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="boxcursor"/> - <cd:command file="supp-box.mkiv" level="system" name="placedbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="boxcursor"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="placedbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="rightbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rightbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="leftbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="leftbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="topbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="topbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="bottombox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="bottombox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="lefttopbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lefttopbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="righttopbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="righttopbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="leftbottombox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="leftbottombox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="rightbottombox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rightbottombox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="topleftbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="topleftbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="toprightbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="toprightbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="bottomleftbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="bottomleftbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="bottomrightbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="bottomrightbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="middlebox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="middlebox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="baselinemiddlebox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="baselinemiddlebox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="baselineleftbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="baselineleftbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="baselinerightbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="baselinerightbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="lrtbbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lrtbbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -2283,12 +2311,12 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="toplinebox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="toplinebox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="setstackbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setstackbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2299,14 +2327,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="initializeboxstack"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="initializeboxstack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="savebox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="savebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2317,7 +2345,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="flushbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="flushbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2327,7 +2355,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="restorebox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="restorebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2337,7 +2365,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="foundbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="foundbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2347,7 +2375,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelsebox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional" level="system" name="doifelsebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2363,7 +2391,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifboxelse"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional" level="system" name="doifboxelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2379,7 +2407,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="localpushbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="localpushbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2387,7 +2415,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="localpopbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="localpopbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2395,7 +2423,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="globalpushbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="globalpushbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2403,7 +2431,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="globalpopbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="globalpopbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2411,16 +2439,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="removedepth"/> - <cd:command file="supp-box.mkiv" level="system" name="obeydepth"/> - <cd:command file="supp-box.mkiv" level="system" name="undepthed"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="removedepth"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="obeydepth"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="undepthed"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="removebottomthings"/> - <cd:command file="supp-box.mkiv" level="system" name="removelastskip"/> - <cd:command file="supp-box.mkiv" level="system" name="makestrutofbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="removebottomthings"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="removelastskip"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="makestrutofbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2428,7 +2456,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="raisebox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="raisebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -2437,7 +2465,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="lowerbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lowerbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -2446,17 +2474,17 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="halfwaybox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="halfwaybox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="depthonlybox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="depthonlybox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="naturalhbox"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2464,7 +2492,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="naturalvbox"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2472,7 +2500,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="naturalvtop"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2480,7 +2508,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="naturalvcenter"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="naturalvcenter"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2488,7 +2516,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="naturalhpack"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalhpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2496,7 +2524,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="naturalvpack"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalvpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2504,7 +2532,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="naturaltpack"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturaltpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2512,7 +2540,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="reversehbox"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversehbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2520,7 +2548,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="reversevbox"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversevbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2528,7 +2556,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="reversevtop"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversevtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2536,7 +2564,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="reversehpack"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversehpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2544,7 +2572,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="reversevpack"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversevpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2552,7 +2580,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="reversetpack"> + <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversetpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2560,12 +2588,12 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="frozenhbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="frozenhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="setboxllx"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2576,7 +2604,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="setboxlly"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2587,7 +2615,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="gsetboxllx"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="gsetboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2598,7 +2626,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="gsetboxlly"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="gsetboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2609,7 +2637,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="getboxllx"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="getboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2617,7 +2645,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="getboxlly"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="getboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2625,7 +2653,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="directgetboxllx"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="directgetboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2633,7 +2661,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="directgetboxlly"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="directgetboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2641,13 +2669,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="shownextbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="shownextbox"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="spreadhbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="spreadhbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2655,7 +2683,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="minimalhbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="minimalhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2663,13 +2691,13 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="nodetostring"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nodetostring"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="getnaturaldimensions"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="getnaturaldimensions"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2677,10 +2705,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxwd"/> - <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxht"/> - <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxdp"/> - <cd:command file="supp-box.mkiv" level="system" name="naturalwd"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="lastnaturalboxwd"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="lastnaturalboxht"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="lastnaturalboxdp"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="naturalwd"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2688,7 +2716,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelserighttoleftinbox"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional direction" level="system" name="doifelserighttoleftinbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2702,7 +2730,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifrighttoleftinboxelse"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional direction" level="system" name="doifrighttoleftinboxelse"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2716,15 +2744,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="runninghbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="runninghbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="vbox" type="environment"/> - <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="hbox" type="environment"/> - <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="vtop" type="environment"/> - <cd:command file="supp-box.mkiv" level="system" name="setvboxregister"> + <cd:command begin="begin" category="boxes" end="end" file="supp-box.mkiv" level="system" name="vbox" type="environment"/> + <cd:command begin="begin" category="boxes" end="end" file="supp-box.mkiv" level="system" name="hbox" type="environment"/> + <cd:command begin="begin" category="boxes" end="end" file="supp-box.mkiv" level="system" name="vtop" type="environment"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setvboxregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2733,7 +2761,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="sethboxregister"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="sethboxregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2742,7 +2770,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="setvtopregister"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setvtopregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2751,7 +2779,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="flushboxregister"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="flushboxregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2759,7 +2787,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="vboxregister" type="environment"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vboxregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2767,7 +2795,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="hboxregister" type="environment"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hboxregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2775,7 +2803,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="vtopregister" type="environment"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vtopregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2783,7 +2811,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttolefthbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="righttolefthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2791,7 +2819,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlhbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="rtlhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2799,7 +2827,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorighthbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="lefttorighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2807,7 +2835,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrhbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="ltrhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2815,7 +2843,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="righttoleftvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2823,7 +2851,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlvbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="rtlvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2831,7 +2859,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="lefttorightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2839,7 +2867,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrvbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="ltrvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2847,7 +2875,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvtop"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="righttoleftvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2855,7 +2883,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlvtop"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="rtlvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2863,7 +2891,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvtop"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="lefttorightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2871,7 +2899,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrvtop"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="ltrvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2879,7 +2907,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirhbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="autodirhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2887,7 +2915,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirvbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="autodirvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2895,7 +2923,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirvtop"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="autodirvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2903,7 +2931,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrighthbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="leftorrighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2911,7 +2939,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrightvbox"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="leftorrightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2919,7 +2947,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrightvtop"> + <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="leftorrightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2927,17 +2955,17 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="ibox"> + <cd:command category="boxes" file="spac-ali.mkiv" level="system" name="ibox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="obox"> + <cd:command category="boxes" file="spac-ali.mkiv" level="system" name="obox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="definehbox"> + <cd:command category="boxes" file="spac-ali.mkiv" level="system" name="definehbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2947,7 +2975,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" generated="yes" level="system" name="hbox" variant="example"> + <cd:command category="boxes" file="spac-ali.mkiv" generated="yes" level="system" name="hbox" variant="example"> <cd:sequence> <cd:string value="hbox"/> <cd:variable value="box"/> @@ -2956,8 +2984,8 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="lastlinewidth"/> - <cd:command file="supp-box.mkiv" level="system" name="putboxincache"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="lastlinewidth"/> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="putboxincache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2972,7 +3000,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="getboxfromcache"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="getboxfromcache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2987,7 +3015,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelseboxincache"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional" level="system" name="doifelseboxincache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -3004,7 +3032,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="copyboxfromcache"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="copyboxfromcache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -3019,7 +3047,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="directboxfromcache"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="directboxfromcache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -3030,7 +3058,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="directcopyboxfromcache"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="directcopyboxfromcache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -3041,14 +3069,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="resetboxesincache"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="resetboxesincache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="putnextboxincache"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="putnextboxincache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -3061,9 +3089,17 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="boxes" file="supp-box.lmt" level="system" name="reversevboxcontent"> + <cd:arguments> + <cd:keywords delimiters="none"> + <cd:constant type="cd:csname"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-buffer.xml"> - <cd:command category="buffer conditional" file="buff-ini.mkiv" level="system" name="doifelsebuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" keywords="conditional" level="system" name="doifelsebuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -3076,7 +3112,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="buffer conditional" file="buff-ini.mkiv" level="system" name="doifbufferelse"> + <cd:command category="buffer" file="buff-ini.mkiv" keywords="conditional" level="system" name="doifbufferelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -3242,7 +3278,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="buffer lua" file="buff-ini.mkiv" level="style" name="ctxluabuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" keywords="lua" level="style" name="ctxluabuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> @@ -3263,7 +3299,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="document" name="typebuffer"> + <cd:command category="buffer" file="buff-ver.mkiv" keywords="verbatim" level="document" name="typebuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> @@ -3273,7 +3309,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="buffer verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typebuffer" variant="instance"> + <cd:command category="buffer" file="buff-ver.mkiv" generated="yes" keywords="verbatim" level="document" name="typebuffer" variant="instance"> <cd:sequence> <cd:string value="type"/> <cd:instance value="buffer"/> @@ -3284,7 +3320,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="system" name="typedefinedbuffer"> + <cd:command category="buffer" file="buff-ver.mkiv" keywords="verbatim" level="system" name="typedefinedbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:buffer"/> @@ -3294,7 +3330,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="buffer verbatim" file="lxml-ini.mkiv" level="style" name="prettyprintbuffer"> + <cd:command category="buffer" file="lxml-ini.mkiv" keywords="verbatim" level="style" name="prettyprintbuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -3312,7 +3348,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="buffer verbatim" file="lxml-ini.mkiv" level="style" name="inlineprettyprintbuffer"> + <cd:command category="buffer" file="lxml-ini.mkiv" keywords="verbatim" level="style" name="inlineprettyprintbuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -3330,7 +3366,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="style" name="typeinlinebuffer"> + <cd:command category="buffer" file="buff-ver.mkiv" keywords="verbatim" level="style" name="typeinlinebuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> @@ -3342,7 +3378,7 @@ </cd:command> </cd:interface> <cd:interface file="i-button.xml"> - <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="definebutton"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="definebutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3355,7 +3391,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="setupbutton"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="setupbutton"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3390,7 +3426,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-but.mkvi" generated="yes" level="document" name="button" variant="example"> + <cd:command category="pdf" file="scrn-but.mkvi" generated="yes" level="document" name="button" variant="example"> <cd:sequence> <cd:variable value="button"/> </cd:sequence> @@ -3409,7 +3445,7 @@ <cd:constant value="button"/> </cd:instances> </cd:command> - <cd:command catehory="pdf" file="scrn-but.mkvi" level="document" name="button"> + <cd:command category="pdf" file="scrn-but.mkvi" level="document" name="button"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbutton"/> @@ -3422,28 +3458,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton" variant="direct"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="MPmenubuttons"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="MPmenubuttons"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="overlayrollbutton"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="overlayrollbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -3453,7 +3489,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="definepushbutton"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definepushbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3463,7 +3499,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="pushbutton"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="pushbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3473,7 +3509,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="definepushsymbol"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definepushsymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3485,7 +3521,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="interactionmenu"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="interactionmenu"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -3501,7 +3537,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="button"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="button"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -3768,7 +3804,7 @@ <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="randomized" type="environment"/> </cd:interface> <cd:interface file="i-catcodes.xml"> - <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="texcode" type="environment"/> + <cd:command category="catcode" file="catc-ctx.mkxl" level="system" name="texcode" type="environment"/> <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="contextcode" type="environment"/> <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="contextdefinitioncode" type="environment"/> <cd:command begin="un" category="catcode" end="" file="catc-def.mkiv" level="system" name="protect" type="environment"/> @@ -3879,6 +3915,10 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="catcode" file="math-ini.mkxl" level="document" name="asciimode"/> + <cd:command category="catcode" file="math-ini.mkxl" level="document" name="enableasciimode"/> + <cd:command category="catcode" file="math-ini.mkxl" level="document" name="asciimode" type="environment"/> + <cd:command category="catcode" file="buff-ver.mkiv" level="document" name="literalmode"/> </cd:interface> <cd:interface file="i-character.xml"> <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letteropenbrace"/> @@ -3910,21 +3950,21 @@ <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterleftbrace"/> <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterrightbrace"/> <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterexclamationmark"/> - <cd:command category="characters fonts" file="char-ini.mkiv" level="document" name="utfchar"> + <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="document" name="utfchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="safechar"> + <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="style" name="safechar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="checkedchar"> + <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="style" name="checkedchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3934,14 +3974,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="textormathchar"> + <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="style" name="textormathchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="textormathchars"> + <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="style" name="textormathchars"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -4135,12 +4175,12 @@ </cd:command> </cd:interface> <cd:interface file="i-chemical.xml"> - <cd:command file="chem-ini.mkiv" level="document" name="molecule"> + <cd:command category="symbols" file="chem-ini.mkiv" level="document" name="molecule"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="chem-ini.mkiv" level="document" name="chem"> + <cd:command category="symbols" file="chem-ini.mkiv" level="document" name="chem"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -4357,9 +4397,9 @@ </cd:command> </cd:interface> <cd:interface file="i-cleaning.xml"> - <cd:command begin="push" end="pop" file="typo-chr.mkiv" level="system" name="punctuation" type="environment"/> - <cd:command file="typo-chr.mkiv" level="system" name="removepunctuation"/> - <cd:command file="typo-chr.mkiv" level="system" name="markcontent"> + <cd:command begin="push" category="language" end="pop" file="typo-chr.mkiv" level="system" name="punctuation" type="environment"/> + <cd:command category="language" file="typo-chr.mkiv" level="system" name="removepunctuation"/> + <cd:command category="language" file="typo-chr.mkiv" level="system" name="markcontent"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -4369,7 +4409,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-chr.mkiv" level="system" name="markedcontent" type="environment"> + <cd:command category="language" file="typo-chr.mkiv" level="system" name="markedcontent" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -4378,14 +4418,27 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-chr.mkiv" level="system" name="removemarkedcontent"> + <cd:command category="language" file="typo-chr.mkiv" level="system" name="removemarkedcontent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cln.mkiv" level="system" name="setcharactercleaning"> + <cd:command category="language" file="typo-chr.mkiv" keywords="conditional" level="system" name="doifelsemarkedcontent"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <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 category="language" file="typo-cln.mkiv" level="system" name="setcharactercleaning"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -4668,6 +4721,9 @@ <cd:parameter name="v"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="w"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="x"> <cd:constant type="cd:number"/> </cd:parameter> @@ -5116,7 +5172,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifelsecolor"> + <cd:command category="colors" file="color-ini.mkiv" keywords="conditional" level="system" name="doifelsecolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -5129,7 +5185,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifcolorelse"> + <cd:command category="colors" file="color-ini.mkiv" keywords="conditional" level="system" name="doifcolorelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -5142,7 +5198,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifcolor"> + <cd:command category="colors" file="color-ini.mkiv" keywords="conditional" level="system" name="doifcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -5222,7 +5278,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifelseblack"> + <cd:command category="colors" file="colo-ini.mkiv" keywords="conditional" level="system" name="doifelseblack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -5235,7 +5291,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifblackelse"> + <cd:command category="colors" file="colo-ini.mkiv" keywords="conditional" level="system" name="doifblackelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -5248,7 +5304,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifelsedrawingblack"> + <cd:command category="colors" file="colo-ini.mkiv" keywords="conditional" level="system" name="doifelsedrawingblack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -5258,7 +5314,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifdrawingblackelse"> + <cd:command category="colors" file="colo-ini.mkiv" keywords="conditional" level="system" name="doifdrawingblackelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -5339,6 +5395,60 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-columns.xml"> + <cd:command category="tables" file="page-mcl.mkxl" level="style" name="definemulticolumns"> + <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="setupmulticolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="columns" file="page-mcl.mkxl" level="style" name="setupmulticolumns"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <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="direction"> + <cd:constant default="yes" type="right"/> + <cd:constant type="reverse"/> + </cd:parameter> + <cd:parameter name="balance"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="blank"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="ntop"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="page-mcl.mkxl" level="document" name="multicolumns" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmulticolumns"/> + </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> @@ -5433,7 +5543,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="float tables" file="pack-com.mkiv" level="document" name="floatcombination" type="environment" variant="matrix"> + <cd:command category="tables" file="pack-com.mkiv" keywords="float" level="document" name="floatcombination" type="environment" variant="matrix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:matrix"/> @@ -5441,7 +5551,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="float tables" file="pack-com.mkiv" level="document" name="floatcombination" type="environment"> + <cd:command category="tables" file="pack-com.mkiv" keywords="float" level="document" name="floatcombination" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcombination"/> @@ -5450,7 +5560,7 @@ </cd:command> </cd:interface> <cd:interface file="i-commandhandler.xml"> - <cd:command file="mult-aux.mkiv" level="system" name="installparameterhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5458,7 +5568,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installrootparameterhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installrootparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5466,7 +5576,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installparameterhashhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installparameterhashhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5474,7 +5584,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installparametersethandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installparametersethandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5482,7 +5592,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installstyleandcolorhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installstyleandcolorhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5490,7 +5600,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installdefinehandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdefinehandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5499,7 +5609,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installsetuphandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5507,7 +5617,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installswitchsetuphandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installswitchsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5515,7 +5625,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installautosetuphandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installautosetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5523,7 +5633,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installbasicparameterhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installbasicparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5531,7 +5641,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installbasicautosetuphandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installbasicautosetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5540,7 +5650,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installcommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5549,7 +5659,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installswitchcommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installswitchcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5558,7 +5668,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installautocommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installautocommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5567,7 +5677,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installsimplecommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installsimplecommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5576,7 +5686,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installdirectparameterhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5584,7 +5694,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installdirectsetuphandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5592,7 +5702,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installdirectparametersethandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectparametersethandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5600,7 +5710,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installdirectstyleandcolorhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectstyleandcolorhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5608,7 +5718,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installdirectcommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5616,7 +5726,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installsetuponlycommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installsetuponlycommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5624,7 +5734,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="relateparameterhandlers"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="relateparameterhandlers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5640,28 +5750,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installactionhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installactionhandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installnamespace"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installnamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installcorenamespace"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installcorenamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="definenamespace"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="definenamespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -5699,8 +5809,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="listnamespaces"/> - <cd:command file="mult-aux.mkiv" level="system" name="showparentchain"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="listnamespaces"/> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="showparentchain"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5708,7 +5818,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="doifelsecommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="conditional" level="system" name="doifelsecommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5722,7 +5832,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="doifcommandhandlerelse"> + <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="conditional" level="system" name="doifcommandhandlerelse"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5736,7 +5846,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="doifcommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="conditional" level="system" name="doifcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5747,7 +5857,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="doifnotcommandhandler"> + <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="conditional" level="system" name="doifnotcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5758,7 +5868,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installdefinitionset"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdefinitionset"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5766,7 +5876,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installdefinitionsetmember"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdefinitionsetmember"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5778,7 +5888,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installparentinjector"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installparentinjector"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5786,7 +5896,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="system" name="installframedcommandhandler"> + <cd:command category="commandhandler" file="pack-rul.mkiv" level="system" name="installframedcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5795,7 +5905,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="system" name="installframedautocommandhandler"> + <cd:command category="commandhandler" file="pack-rul.mkiv" level="system" name="installframedautocommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5804,7 +5914,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="system" name="installsimpleframedcommandhandler"> + <cd:command category="commandhandler" file="pack-rul.mkiv" level="system" name="installsimpleframedcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -5813,12 +5923,12 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installmacrostack"> + <cd:command category="system" file="mult-aux.mkiv" level="system" name="installmacrostack"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="installglobalmacrostack"> + <cd:command category="system" file="mult-aux.mkiv" level="system" name="installglobalmacrostack"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -5974,259 +6084,273 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="romannumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="romannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="Romannumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Romannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="abjadnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnodotnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="abjadnodotnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnaivenumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="abjadnaivenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="languagecharacters"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="hebrewnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="languageCharacters"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="yiddishnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="alphabeticnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="languagecharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="Alphabeticnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="languageCharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="thainumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="alphabeticnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="devanagarinumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Alphabeticnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="gurmurkhinumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="thainumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="gujaratinumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="devanagarinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="tibetannumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="gurmurkhinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="greeknumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="gujaratinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="Greeknumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="tibetannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="greeknumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="persiannumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Greeknumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicdecimals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="arabicnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="persiandecimals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="persiannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicexnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="arabicdecimals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="persiandecimals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumeralsp"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="arabicexnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumeralsc"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreanparentnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreannumeralsp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreancirclenumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreannumeralsc"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="chinesenumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreanparentnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="chinesecapnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreancirclenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="chineseallnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="chinesenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="character"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="chinesecapnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="Character"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="chineseallnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="characters"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="character"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="Characters"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Character"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" level="style" name="monthlong"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="characters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" level="style" name="monthshort"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Characters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" level="style" name="convertmonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="month"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" level="style" name="month"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="monthlong"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" level="style" name="monthshort"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" level="style" name="convertmonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6268,6 +6392,34 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="counter" file="core-con.mkiv" level="style" name="daylong"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" level="style" name="dayshort"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" level="style" name="DAYLONG"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" level="style" name="DAYSHORT"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="counter" file="core-con.mkiv" level="style" name="dayoftheweek"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -6294,7 +6446,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="core-con.mkiv" level="style" name="doifelseleapyear"> + <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="style" name="doifelseleapyear"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6307,7 +6459,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="core-con.mkiv" level="style" name="doifleapyearelse"> + <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="style" name="doifleapyearelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6340,50 +6492,238 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="document" name="currentdate"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="definedate"> <cd:arguments> - <cd:keywords list="yes" optional="yes"> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords list="yes"> <cd:constant type="year"/> - <cd:constant type="month"/> - <cd:constant type="day"/> - <cd:constant type="weekday"/> + <cd:constant method="range" prefix="year" type="cd:name"/> <cd:constant type="y"/> + <cd:constant method="range" prefix="y" type="cd:name"/> <cd:constant type="yy"/> <cd:constant type="Y"/> + <cd:constant method="range" prefix="Y" type="cd:name"/> + <cd:constant type="YY"/> + <cd:constant type="month"/> + <cd:constant type="month:mnem"/> + <cd:constant type="month:hebrew"/> + <cd:constant type="month:jalali"/> <cd:constant type="m"/> + <cd:constant type="m:mnem"/> + <cd:constant type="m:hebrew"/> + <cd:constant type="m:jalali"/> + <cd:constant type="MONTH"/> + <cd:constant type="MONTH:mnem"/> + <cd:constant type="MONTH:hebrew"/> + <cd:constant type="MONTH:jalali"/> <cd:constant type="mm"/> <cd:constant type="M"/> + <cd:constant type="day"/> + <cd:constant method="range" prefix="day" type="cd:name"/> + <cd:constant type="day:+"/> + <cd:constant type="day:ord"/> + <cd:constant type="day:++"/> + <cd:constant type="day:highord"/> <cd:constant type="d"/> + <cd:constant method="range" prefix="d" type="cd:name"/> + <cd:constant type="d:+"/> + <cd:constant type="d:ord"/> + <cd:constant type="d:++"/> + <cd:constant type="d:highord"/> <cd:constant type="dd"/> + <cd:constant type="dd:+"/> + <cd:constant type="dd:ord"/> + <cd:constant type="dd:++"/> + <cd:constant type="dd:highord"/> <cd:constant type="D"/> + <cd:constant type="D:+"/> + <cd:constant type="D:ord"/> + <cd:constant type="D:++"/> + <cd:constant type="D:highord"/> + <cd:constant type="weekday"/> + <cd:constant type="weekday:mnem"/> + <cd:constant type="weekday:hebrew"/> + <cd:constant type="weekday:jalali"/> <cd:constant type="w"/> + <cd:constant type="w:mnem"/> + <cd:constant type="w:hebrew"/> + <cd:constant type="w:jalali"/> + <cd:constant type="WEEKDAY"/> + <cd:constant type="WEEKDAY:mnem"/> + <cd:constant type="WEEKDAY:hebrew"/> + <cd:constant type="WEEKDAY:jalali"/> <cd:constant type="W"/> + <cd:constant type="referral"/> <cd:constant type="space"/> <cd:constant type="\\\\\\\\␣"/> + <cd:constant type="cd:text"/> + <cd:constant type="hebrew:to"/> + <cd:constant type="jalali:to"/> + <cd:constant type="jalali:from"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="currentdate"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="year"/> + <cd:constant method="range" prefix="year" type="cd:name"/> + <cd:constant type="y"/> + <cd:constant method="range" prefix="y" type="cd:name"/> + <cd:constant type="yy"/> + <cd:constant type="Y"/> + <cd:constant method="range" prefix="Y" type="cd:name"/> + <cd:constant type="YY"/> + <cd:constant type="month"/> <cd:constant type="month:mnem"/> + <cd:constant type="month:hebrew"/> + <cd:constant type="month:jalali"/> + <cd:constant type="m"/> <cd:constant type="m:mnem"/> - <cd:constant type="d:ord"/> + <cd:constant type="m:hebrew"/> + <cd:constant type="m:jalali"/> + <cd:constant type="MONTH"/> + <cd:constant type="MONTH:mnem"/> + <cd:constant type="MONTH:hebrew"/> + <cd:constant type="MONTH:jalali"/> + <cd:constant type="mm"/> + <cd:constant type="M"/> + <cd:constant type="day"/> + <cd:constant method="range" prefix="day" type="cd:name"/> + <cd:constant type="day:+"/> <cd:constant type="day:ord"/> + <cd:constant type="day:++"/> + <cd:constant type="day:highord"/> + <cd:constant type="d"/> + <cd:constant method="range" prefix="d" type="cd:name"/> + <cd:constant type="d:+"/> + <cd:constant type="d:ord"/> + <cd:constant type="d:++"/> + <cd:constant type="d:highord"/> + <cd:constant type="dd"/> + <cd:constant type="dd:+"/> <cd:constant type="dd:ord"/> + <cd:constant type="dd:++"/> + <cd:constant type="dd:highord"/> + <cd:constant type="D"/> + <cd:constant type="D:+"/> <cd:constant type="D:ord"/> - <cd:constant type="cd:text"/> + <cd:constant type="D:++"/> + <cd:constant type="D:highord"/> + <cd:constant type="weekday"/> + <cd:constant type="weekday:mnem"/> + <cd:constant type="weekday:hebrew"/> + <cd:constant type="weekday:jalali"/> + <cd:constant type="w"/> + <cd:constant type="w:mnem"/> + <cd:constant type="w:hebrew"/> + <cd:constant type="w:jalali"/> + <cd:constant type="WEEKDAY"/> + <cd:constant type="WEEKDAY:mnem"/> + <cd:constant type="WEEKDAY:hebrew"/> + <cd:constant type="WEEKDAY:jalali"/> + <cd:constant type="W"/> <cd:constant type="referral"/> + <cd:constant type="space"/> + <cd:constant type="\\\\\\\\␣"/> + <cd:constant type="cd:text"/> + <cd:constant type="hebrew:to"/> + <cd:constant type="jalali:to"/> + <cd:constant type="jalali:from"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="currentdate" variant="name"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="date"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="d"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="m"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="y"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="year"/> + <cd:constant method="range" prefix="year" type="cd:name"/> + <cd:constant type="y"/> + <cd:constant method="range" prefix="y" type="cd:name"/> + <cd:constant type="yy"/> + <cd:constant type="Y"/> + <cd:constant method="range" prefix="Y" type="cd:name"/> + <cd:constant type="YY"/> + <cd:constant type="month"/> + <cd:constant type="month:mnem"/> + <cd:constant type="month:hebrew"/> + <cd:constant type="month:jalali"/> + <cd:constant type="m"/> + <cd:constant type="m:mnem"/> + <cd:constant type="m:hebrew"/> + <cd:constant type="m:jalali"/> + <cd:constant type="MONTH"/> + <cd:constant type="MONTH:mnem"/> + <cd:constant type="MONTH:hebrew"/> + <cd:constant type="MONTH:jalali"/> + <cd:constant type="mm"/> + <cd:constant type="M"/> + <cd:constant type="day"/> + <cd:constant method="range" prefix="day" type="cd:name"/> <cd:constant type="day:+"/> + <cd:constant type="day:ord"/> <cd:constant type="day:++"/> + <cd:constant type="day:highord"/> + <cd:constant type="d"/> + <cd:constant method="range" prefix="d" type="cd:name"/> <cd:constant type="d:+"/> + <cd:constant type="d:ord"/> <cd:constant type="d:++"/> + <cd:constant type="d:highord"/> + <cd:constant type="dd"/> <cd:constant type="dd:+"/> + <cd:constant type="dd:ord"/> <cd:constant type="dd:++"/> + <cd:constant type="dd:highord"/> + <cd:constant type="D"/> <cd:constant type="D:+"/> + <cd:constant type="D:ord"/> <cd:constant type="D:++"/> - <cd:constant type="month:jalali"/> - <cd:constant type="m:jalali"/> + <cd:constant type="D:highord"/> + <cd:constant type="weekday"/> + <cd:constant type="weekday:mnem"/> + <cd:constant type="weekday:hebrew"/> + <cd:constant type="weekday:jalali"/> + <cd:constant type="w"/> + <cd:constant type="w:mnem"/> + <cd:constant type="w:hebrew"/> + <cd:constant type="w:jalali"/> + <cd:constant type="WEEKDAY"/> + <cd:constant type="WEEKDAY:mnem"/> + <cd:constant type="WEEKDAY:hebrew"/> + <cd:constant type="WEEKDAY:jalali"/> + <cd:constant type="W"/> + <cd:constant type="referral"/> + <cd:constant type="space"/> + <cd:constant type="\\\\\\\\␣"/> + <cd:constant type="cd:text"/> + <cd:constant type="hebrew:to"/> <cd:constant type="jalali:to"/> <cd:constant type="jalali:from"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="document" name="date"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="date" variant="name"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="d"> @@ -6396,8 +6736,8 @@ <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="currentdate"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> @@ -6459,7 +6799,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="defineconversion" variant="list"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="defineconversion" variant="list"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -6508,6 +6848,8 @@ <cd:constant type="abjadnumerals"/> <cd:constant type="abjadnodotnumerals"/> <cd:constant type="abjadnaivenumerals"/> + <cd:constant type="hebrewnumerals"/> + <cd:constant type="yiddishnumerals"/> <cd:constant type="thainumerals"/> <cd:constant type="devanagarinumerals"/> <cd:constant type="gurmurkhinumerals"/> @@ -6536,6 +6878,8 @@ <cd:constant type="slovenianNumerals"/> <cd:constant type="spanishnumerals"/> <cd:constant type="spanishNumerals"/> + <cd:constant type="russiannumerals"/> + <cd:constant type="russianNumerals"/> <cd:constant type="mathgreek"/> <cd:constant type="set␣0"/> <cd:constant type="set␣1"/> @@ -6560,7 +6904,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifelseconversiondefined"> + <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="system" name="doifelseconversiondefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6573,7 +6917,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifconversiondefinedelse"> + <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="system" name="doifconversiondefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6586,7 +6930,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifelseconversionnumber"> + <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="system" name="doifelseconversionnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6602,7 +6946,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifconversionnumberelse"> + <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="system" name="doifconversionnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6681,28 +7025,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="sloveniannumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="sloveniannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="slovenianNumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="slovenianNumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="spanishnumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="spanishnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter language" file="core-con.mkiv" level="style" name="spanishNumerals"> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="spanishNumerals"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="russiannumerals"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="russianNumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6730,9 +7088,65 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="system" file="core-con.mkiv" level="style" name="actualyear"/> - <cd:command category="system" file="core-con.mkiv" level="style" name="actualmonth"/> - <cd:command category="system" file="core-con.mkiv" level="style" name="actualday"/> + <cd:command category="counter" file="core-con.lua" keywords="system" level="style" name="actualyear"/> + <cd:command category="counter" file="core-con.lua" keywords="system" level="style" name="actualmonth"/> + <cd:command category="counter" file="core-con.lua" keywords="system" level="style" name="actualday"/> + <cd:command category="counter" file="syst-con.mkxl" level="style" name="lchexnumber"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="syst-con.mkxl" level="style" name="uchexnumber"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="syst-con.mkxl" level="style" name="lchexnumbers"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="syst-con.mkxl" level="style" name="uchexnumbers"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="syst-con.mkxl" level="style" name="hexnumber"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="syst-con.mkxl" level="style" name="octnumber"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="syst-con.mkxl" level="style" name="hexstringtonumber"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="counter" file="syst-con.mkxl" level="style" name="octstringtonumber"> + <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"> @@ -6757,6 +7171,9 @@ <cd:parameter name="start"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="number"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="counter"> <cd:constant type="cd:name"/> </cd:parameter> @@ -6854,7 +7271,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifelsecounter"> + <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifelsecounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6867,7 +7284,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifcounterelse"> + <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifcounterelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6880,7 +7297,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifcounter"> + <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6890,7 +7307,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifnotcounter"> + <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifnotcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7189,7 +7606,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifelsedefinedcounter"> + <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifelsedefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7202,7 +7619,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifdefinedcounterelse"> + <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifdefinedcounterelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7215,7 +7632,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifdefinedcounter"> + <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifdefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7225,7 +7642,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifundefinedcounter"> + <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifundefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7731,6 +8148,16 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="structure" file="strc-des.mkvi" level="style" name="setupdescriptions"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupdescription"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command category="structure" file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example"> <cd:sequence> <cd:variable value="description"/> @@ -7784,7 +8211,7 @@ </cd:command> </cd:interface> <cd:interface file="i-digits.xml"> - <cd:command file="typo-dig.mkiv" level="system" name="setdigitsmanipulation"> + <cd:command category="symbols" file="typo-dig.mkiv" keywords="fonts" level="system" name="setdigitsmanipulation"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -7792,15 +8219,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-dig.mkiv" level="system" name="resetdigitsmanipulation"/> - <cd:command file="typo-dig.mkiv" level="document" name="equaldigits"> + <cd:command category="symbols" file="typo-dig.mkiv" keywords="fonts" level="system" name="resetdigitsmanipulation"/> + <cd:command category="symbols" file="typo-dig.mkiv" keywords="fonts" level="document" name="equaldigits"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-dig.mkiv" level="document" name="dummydigit"/> + <cd:command category="symbols" file="typo-dig.mkiv" keywords="fonts" level="document" name="dummydigit"/> </cd:interface> <cd:interface file="i-dimension.xml"> <cd:command file="mult-dim.mkvi" level="system" name="assigndimension"> @@ -7883,7 +8310,7 @@ </cd:command> </cd:interface> <cd:interface file="i-direction.xml"> - <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="setupdirections"> + <cd:command category="language" file="typo-dir.mkiv" keywords="alignment" level="style" name="setupdirections"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="bidi"> @@ -7908,15 +8335,15 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="setdirection"> + <cd:command category="language" file="typo-dir.mkiv" keywords="alignment" level="style" name="setdirection"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </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="language" file="typo-dir.mkiv" keywords="alignment" level="style" name="resetdirection"/> + <cd:command category="alignment" file="supp-dir.mkiv" keywords="alignment" level="document" name="showdirsinmargin"/> </cd:interface> <cd:interface file="i-document.xml"> <cd:command category="structure" file="file-job.mkvi" level="document" name="text" type="environment"/> @@ -8076,6 +8503,32 @@ <cd:command category="structure" file="file-job.mkvi" level="system" name="currentcomponent"/> <cd:command category="structure" file="file-job.mkvi" level="document" name="document" type="environment"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupdocument"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="file-job.mkvi" generated="yes" level="document" name="document" type="environment" variant="example"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupdocument"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="file-job.mkvi" level="style" name="definedocument"> + <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="setupdocument"/> </cd:assignments> @@ -8083,6 +8536,9 @@ </cd:command> <cd:command category="structure" file="file-job.mkvi" level="style" name="setupdocument"> <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="before"> <cd:constant type="cd:command"/> @@ -8110,6 +8566,9 @@ </cd:command> <cd:command category="structure" file="file-job.mkvi" level="style" name="presetdocument"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> <cd:assignments list="yes"> <cd:inherit name="setupdocument"/> </cd:assignments> @@ -8177,7 +8636,7 @@ </cd:command> </cd:interface> <cd:interface file="i-dummy.xml"> - <cd:command file="mult-aux.mkiv" level="system" name="getdummyparameters"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="getdummyparameters"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -8186,21 +8645,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="dummyparameter"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="dummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="directdummyparameter"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="directdummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="setdummyparameter"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="setdummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -8210,7 +8669,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="letdummyparameter"> + <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="letdummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -8218,7 +8677,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="mult-aux.mkiv" level="system" name="usedummystyleandcolor"> + <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="fonts colors" level="system" name="usedummystyleandcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -8228,14 +8687,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="mult-aux.mkiv" level="system" name="usedummystyleparameter"> + <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="fonts" level="system" name="usedummystyleparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="mult-aux.mkiv" level="system" name="usedummycolorparameter"> + <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="colors" level="system" name="usedummycolorparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -8765,7 +9224,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doifelsefieldcategory"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="conditional" level="system" name="doifelsefieldcategory"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -8778,7 +9237,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doiffieldcategoryelse"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="conditional" level="system" name="doiffieldcategoryelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -8837,7 +9296,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doifelsefieldbody"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="conditional" level="system" name="doifelsefieldbody"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -8850,7 +9309,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doiffieldbodyelse"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="conditional" level="system" name="doiffieldbodyelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -8927,7 +9386,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf background rules" file="scrn-fld.mkvi" level="document" name="fitfieldframed"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background rules" level="document" name="fitfieldframed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -8945,7 +9404,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldlabelframed"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfieldlabelframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8955,7 +9414,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldcontentframed"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfieldcontentframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8966,7 +9425,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldtotalframed"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfieldtotalframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8995,7 +9454,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfield"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9018,7 +9477,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfields"> + <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfields"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -9142,7 +9601,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffile"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doiffile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9152,7 +9611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifnotfile"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifnotfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9162,7 +9621,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsefile"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelsefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9175,7 +9634,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffileelse"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doiffileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9205,7 +9664,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsepath"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelsepath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -9218,7 +9677,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifpathelse"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifpathelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -9231,7 +9690,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsefileexists"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelsefileexists"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9244,7 +9703,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffileexistselse"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doiffileexistselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9257,7 +9716,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsepathexists"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelsepathexists"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -9270,7 +9729,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifpathexistselse"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifpathexistselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -9283,7 +9742,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelseparentfile"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelseparentfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9296,7 +9755,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifparentfileelse"> + <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifparentfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9323,7 +9782,7 @@ <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitofftype"/> <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffkind"/> <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffroot"/> - <cd:command category="structure conditional" file="file-job.mkvi" level="system" name="doifelseinputfile"> + <cd:command category="structure" file="file-job.mkvi" keywords="conditional" level="system" name="doifelseinputfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9336,7 +9795,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-job.mkvi" level="system" name="doifinputfileelse"> + <cd:command category="structure" file="file-job.mkvi" keywords="conditional" level="system" name="doifinputfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9425,14 +9884,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadluafile"> + <cd:command category="structure" file="file-job.mkvi" keywords="lua" level="system" name="loadluafile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadcldfile"> + <cd:command category="structure" file="file-job.mkvi" keywords="lua" level="system" name="loadcldfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -9453,14 +9912,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadluafileonce"> + <cd:command category="structure" file="file-job.mkvi" keywords="lua" level="system" name="loadluafileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadcldfileonce"> + <cd:command category="structure" file="file-job.mkvi" keywords="lua" level="system" name="loadcldfileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -9488,7 +9947,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readjobfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readjobfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9501,7 +9960,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readlocfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readlocfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9514,7 +9973,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readsysfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readsysfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9527,7 +9986,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readfixfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readfixfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -9543,7 +10002,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readsetfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readsetfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -9559,7 +10018,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9579,7 +10038,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readtexfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readtexfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9592,7 +10051,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional xml" file="file-res.mkvi" level="system" name="readxmlfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional xml" level="system" name="readxmlfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9605,7 +10064,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="doifelselocfile"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="doifelselocfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9618,7 +10077,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="doiflocfileelse"> + <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="doiflocfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9665,6 +10124,13 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="structure" file="font-ini.mklx" keywords="fonts" level="system" name="usefontpath"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="cd:path"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-filler.xml"> <cd:command category="rules" file="spac-flr.mkiv" level="style" name="definefiller"> @@ -9787,104 +10253,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller"> - <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="setuplinefiller"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <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"/> - </cd:keywords> - <cd:assignments list="yes"> - <cd:parameter name="location"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant default="yes" type="both"/> - </cd:parameter> - <cd:parameter name="scope"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant default="yes" type="local"/> - </cd:parameter> - <cd:parameter name="mp"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="height"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="depth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="threshold"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="rulethickness"> - <cd:constant type="cd:dimension"/> - </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="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="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefillers"> - <cd:arguments> - <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:command category="rules" file="spac-flr.mkiv" level="document" name="dotfill"/> </cd:interface> <cd:interface file="i-fillinline.xml"> <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setupfillinlines"> @@ -9990,7 +10359,7 @@ </cd:command> </cd:interface> <cd:interface file="i-firstline.xml"> - <cd:command category="fonts colors" file="typo-fln.mkiv" level="style" name="definefirstline"> + <cd:command category="fonts" file="typo-fln.mkiv" keywords="colors" level="style" name="definefirstline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10003,7 +10372,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="typo-fln.mkiv" level="style" name="setupfirstline"> + <cd:command category="fonts" file="typo-fln.mkiv" keywords="colors" level="style" name="setupfirstline"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -10027,14 +10396,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="typo-fln.mkiv" level="document" name="setfirstline"> + <cd:command category="fonts" file="typo-fln.mkiv" keywords="colors" level="document" name="setfirstline"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="typo-fln.mkiv" level="system" name="applytofirstcharacter"> + <cd:command category="fonts" file="typo-fln.mkiv" keywords="colors" level="system" name="applytofirstcharacter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -10044,7 +10413,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fittingpage.xml"> - <cd:command category="background layout" file="page-app.mkiv" level="style" name="definefittingpage"> + <cd:command category="layout" file="page-app.mkiv" keywords="background" level="style" name="definefittingpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10057,7 +10426,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupfittingpage"> + <cd:command category="layout" file="page-app.mkiv" keywords="background" level="style" name="setupfittingpage"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -10085,7 +10454,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background layout" file="page-app.mkiv" level="document" name="fittingpage" type="environment"> + <cd:command category="layout" file="page-app.mkiv" keywords="background" level="document" name="fittingpage" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10095,7 +10464,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background layout" file="page-app.mkiv" generated="yes" level="document" name="fittingpage" type="environment" variant="instance"> + <cd:command category="layout" file="page-app.mkiv" generated="yes" keywords="background" level="document" name="fittingpage" type="environment" variant="instance"> <cd:sequence> <cd:instance value="fittingpage"/> </cd:sequence> @@ -10109,7 +10478,7 @@ <cd:constant value="MPpage"/> </cd:instances> </cd:command> - <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupTEXpage"> + <cd:command category="layout" file="page-app.mkiv" keywords="background" level="style" name="setupTEXpage"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="pagestate"> @@ -10134,7 +10503,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background layout metapost" file="meta-fig.mkiv" level="style" name="setupMPpage"> + <cd:command category="layout" file="meta-fig.mkiv" keywords="background metapost" level="style" name="setupMPpage"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="pagestate"> @@ -10412,7 +10781,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="fonts counter" level="style" name="setupcaption"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -10484,9 +10853,6 @@ <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> - <cd:parameter name="headcommand"> - <cd:constant type="cd:command"/> - </cd:parameter> <cd:parameter name="inbetween"> <cd:constant type="cd:command"/> </cd:parameter> @@ -10538,12 +10904,16 @@ <cd:parameter name="maxwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaptions"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="fonts counter" level="style" name="setupcaptions"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -10553,7 +10923,36 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure background" file="strc-flt.mkvi" level="style" name="setupfloatframed"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="fonts counter" level="style" name="placefloatcaption"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="title"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="bookmark"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="marking"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="list"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="cd:key"> + <cd:constant type="cd:value"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" keywords="background" level="style" name="setupfloatframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11069,7 +11468,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelserightpagefloat"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifelserightpagefloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11079,7 +11478,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifrightpagefloatelse"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifrightpagefloatelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11089,7 +11488,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelseoddpagefloat"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifelseoddpagefloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11099,7 +11498,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifoddpagefloatelse"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifoddpagefloatelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11109,7 +11508,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelsemainfloatbody"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifelsemainfloatbody"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11119,7 +11518,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifmainfloatbodyelse"> + <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifmainfloatbodyelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11157,7 +11556,7 @@ </cd:arguments> </cd:command> <cd:command category="structure" file="strc-flt.mkvi" level="system" name="forcelocalfloats"/> - <cd:command category="structure counter" file="tabl-tsp.mkiv" level="style" name="setupfloatsplitting"> + <cd:command category="structure" file="tabl-tsp.mkiv" keywords="counter" level="style" name="setupfloatsplitting"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -11190,7 +11589,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="tabl-tsp.mkiv" level="system" name="doifnotinsidesplitfloat"> + <cd:command category="structure" file="tabl-tsp.mkiv" keywords="conditional" level="system" name="doifnotinsidesplitfloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11324,6 +11723,11 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="width"> + <cd:constant default="yes" type="fit"/> + <cd:constant type="frame"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> @@ -11739,6 +12143,7 @@ </cd:parameter> <cd:parameter name="dimensions"> <cd:constant type="cd:number"/> + <cd:constant type="strut"/> </cd:parameter> <cd:parameter name="boundingbox"> <cd:constant type="yes"/> @@ -11820,7 +12225,11 @@ <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> </cd:parameter> - <cd:parameter name="cd:name"> + <cd:parameter name="uppercasing"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="lowercasing"> <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> </cd:parameter> @@ -11831,6 +12240,13 @@ <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> </cd:parameter> + <cd:parameter name="metapost"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="cd:name"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -11963,7 +12379,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifelsecurrentfonthasfeature"> + <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doifelsecurrentfonthasfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -11976,7 +12392,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifcurrentfonthasfeatureelse"> + <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doifcurrentfonthasfeatureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -11989,7 +12405,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifelsefontfeature"> + <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doifelsefontfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12002,7 +12418,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doiffontfeatureelse"> + <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doiffontfeatureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12015,7 +12431,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifunknownfontfeature"> + <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doifunknownfontfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12139,7 +12555,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-fil.mkvi" level="system" name="doifelsefontsynonym"> + <cd:command category="fonts" file="font-fil.mkvi" keywords="conditional" level="system" name="doifelsefontsynonym"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12152,7 +12568,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-fil.mkvi" level="system" name="doiffontsynonymelse"> + <cd:command category="fonts" file="font-fil.mkvi" keywords="conditional" level="system" name="doiffontsynonymelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12366,6 +12782,20 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setupbodyfontenvironment"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords> + <cd:constant type="default"/> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="definebodyfontenvironment"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command category="fonts" file="font-fil.mkvi" level="system" name="processbodyfontenvironmentlist"> <cd:arguments> <cd:csname/> @@ -12722,6 +13152,9 @@ <cd:command category="fonts" file="font-pre.mkiv" level="style" name="setoldstyle"/> <cd:command category="fonts" file="font-pre.mkiv" level="style" name="settabular"/> <cd:command category="fonts" file="font-pre.mkiv" level="style" name="setsuperiors"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="setfractions"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="uppercasing"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="lowercasing"/> <cd:command category="fonts" file="font-pre.mkiv" level="style" name="tinyfont"/> <cd:command category="fonts" file="font-pre.mkiv" level="style" name="infofont"/> <cd:command category="fonts" file="font-pre.mkiv" level="style" name="infofontbold"/> @@ -12732,7 +13165,6 @@ <cd:command category="fonts" file="font-pre.mkiv" level="document" name="normal"/> <cd:command category="fonts" file="font-pre.mkiv" level="document" name="bold"/> <cd:command category="fonts" file="font-pre.mkiv" level="document" name="mono"/> - <cd:command category="fonts" file="font-pre.mkiv" level="document" name="monobold"/> <cd:command category="fonts" file="font-pre.mkiv" level="document" name="slanted"/> <cd:command category="fonts" file="font-pre.mkiv" level="document" name="italic"/> <cd:command category="fonts" file="font-pre.mkiv" level="document" name="boldslanted"/> @@ -12969,7 +13401,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifelseitalic"> + <cd:command category="fonts" file="font-sym.mkvi" keywords="conditional" level="system" name="doifelseitalic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -12979,7 +13411,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifitalicelse"> + <cd:command category="fonts" file="font-sym.mkvi" keywords="conditional" level="system" name="doifitalicelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -13095,7 +13527,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifelsefontchar"> + <cd:command category="fonts" file="font-sym.mkvi" keywords="conditional" level="system" name="doifelsefontchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -13111,7 +13543,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doiffontcharelse"> + <cd:command category="fonts" file="font-sym.mkvi" keywords="conditional" level="system" name="doiffontcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -13135,7 +13567,7 @@ </cd:arguments> </cd:command> <cd:command category="fonts" file="font-tra.mkiv" level="document" name="showfontdata"/> - <cd:command category="fonts conditional" file="font-tra.mkiv" level="system" name="doifelsefontpresent"> + <cd:command category="fonts" file="font-tra.mkiv" keywords="conditional" level="system" name="doifelsefontpresent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -13148,7 +13580,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts conditional" file="font-tra.mkiv" level="system" name="doiffontpresentelse"> + <cd:command category="fonts" file="font-tra.mkiv" keywords="conditional" level="system" name="doiffontpresentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -13385,10 +13817,41 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" level="style" name="addfontpath"> + <cd:command category="fonts" file="hand-ini.mkx" level="style" name="defineexpansion"> <cd:arguments> - <cd:keywords list="yes"> - <cd:constant type="cd:path"/> + <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="setupexpansion"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="fonts" file="hand-ini.mkx" level="style" name="setupexpansion"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="step"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="stretch"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="shrink"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setexpansion"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> @@ -13843,6 +14306,7 @@ <cd:constant type="yes"/> <cd:constant type="no"/> <cd:constant default="yes" type="auto"/> + <cd:constant type="hidden"/> </cd:parameter> <cd:parameter name="left"> <cd:constant type="cd:number"/> @@ -13939,7 +14403,7 @@ </cd:command> </cd:interface> <cd:interface file="i-framed.xml"> - <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="defineframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13952,7 +14416,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="setupframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14045,6 +14509,9 @@ <cd:constant type="frame"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:resolve name="cd:color"/> + </cd:parameter> <cd:parameter name="component"> <cd:constant type="cd:name"/> </cd:parameter> @@ -14154,24 +14621,44 @@ <cd:parameter name="orientation"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="anchoring"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="xanchor"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="yanchor"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="linedirection"> + <cd:constant default="yes" type="normal"/> + <cd:constant type="reverse"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="frameddimension"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="frameddimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="framedparameter"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="framedparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="framed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="document" name="framed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -14179,7 +14666,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framed" variant="instance"> + <cd:command category="rules" file="pack-rul.mkiv" generated="yes" keywords="background" level="document" name="framed" variant="instance"> <cd:sequence> <cd:instance value="framed"/> </cd:sequence> @@ -14194,7 +14681,7 @@ <cd:constant value="fitfieldframed"/> </cd:instances> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="normalframedwithsettings"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="normalframedwithsettings"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupframed"/> @@ -14202,7 +14689,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="framed" type="environment"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="document" name="framed" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14212,7 +14699,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="fastlocalframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="fastlocalframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14223,7 +14710,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="localframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="localframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14234,7 +14721,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="directlocalframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="directlocalframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14242,7 +14729,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="localframedwithsettings"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="localframedwithsettings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14253,7 +14740,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="placeframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="document" name="placeframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14264,7 +14751,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="inframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="document" name="inframed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -14272,7 +14759,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background rules mathematics" file="pack-rul.mkiv" level="style" name="definemathframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background mathematics" level="style" name="definemathframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14285,7 +14772,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules mathematics" file="pack-rul.mkiv" level="style" name="setupmathframed"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background mathematics" level="style" name="setupmathframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14295,7 +14782,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules mathematics" file="pack-rul.mkiv" generated="yes" level="document" name="mathframed" variant="instance"> + <cd:command category="rules" file="pack-rul.mkiv" generated="yes" keywords="background mathematics" level="document" name="mathframed" variant="instance"> <cd:sequence> <cd:instance value="mathframed"/> </cd:sequence> @@ -14311,7 +14798,7 @@ <cd:constant value="mcframed"/> </cd:instances> </cd:command> - <cd:command category="background rules mathematics" file="math-for.mkiv" level="style" name="defineformulaframed"> + <cd:command category="rules" file="math-for.mkiv" keywords="background mathematics" level="style" name="defineformulaframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14324,7 +14811,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules mathematics" file="math-for.mkiv" level="style" name="setupformulaframed"> + <cd:command category="rules" file="math-for.mkiv" keywords="background mathematics" level="style" name="setupformulaframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14334,7 +14821,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframedtext"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="defineframedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14347,7 +14834,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedtext"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="setupframedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14390,7 +14877,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedtexts"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="setupframedtexts"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14400,7 +14887,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" variant="instance"> + <cd:command category="rules" file="pack-rul.mkiv" generated="yes" keywords="background" level="document" name="framedtext" variant="instance"> <cd:sequence> <cd:instance value="framedtext"/> </cd:sequence> @@ -14414,7 +14901,7 @@ <cd:constant value="framedtext"/> </cd:instances> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" type="environment" variant="instance"> + <cd:command category="rules" file="pack-rul.mkiv" generated="yes" keywords="background" level="document" name="framedtext" type="environment" variant="instance"> <cd:sequence> <cd:instance value="framedtext"/> </cd:sequence> @@ -14433,7 +14920,7 @@ <cd:constant value="framedtext"/> </cd:instances> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframedcontent"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="defineframedcontent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14446,7 +14933,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedcontent"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="setupframedcontent"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14478,7 +14965,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="framedcontent" type="environment"> + <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="framedcontent" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14486,7 +14973,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installleftframerenderer"> + <cd:command category="rules" file="pack-fen.mkiv" keywords="background" level="system" name="installleftframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14496,7 +14983,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installrightframerenderer"> + <cd:command category="rules" file="pack-fen.mkiv" keywords="background" level="system" name="installrightframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14506,7 +14993,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installtopframerenderer"> + <cd:command category="rules" file="pack-fen.mkiv" keywords="background" level="system" name="installtopframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14516,7 +15003,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installbottomframerenderer"> + <cd:command category="rules" file="pack-fen.mkiv" keywords="background" level="system" name="installbottomframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14526,7 +15013,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background rules" level="system" name="doifelseframed"> + <cd:command category="rules" file="pack-rul.mkxl" keywords="background conditional" level="system" name="doifelseframed"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -14539,7 +15026,7 @@ </cd:command> </cd:interface> <cd:interface file="i-framedtable.xml"> - <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="defineframedtable"> + <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="style" name="defineframedtable"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14549,7 +15036,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtable"> + <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="style" name="setupframedtable"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14571,7 +15058,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtablerow"> + <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="style" name="setupframedtablerow"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14585,7 +15072,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtablecolumn"> + <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="style" name="setupframedtablecolumn"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14599,7 +15086,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedtable" type="environment"> + <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="document" name="framedtable" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14609,14 +15096,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedrow" type="environment"> + <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="document" name="framedrow" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedcell" type="environment"> + <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="document" name="framedcell" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -14697,6 +15184,11 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="cmyk"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="auto"/> + </cd:parameter> <cd:parameter name="arguments"> <cd:constant type="cd:text"/> </cd:parameter> @@ -14855,6 +15347,16 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="graphics" file="grph-inc.mkvi" level="style" name="setupexternalfigures"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupexternalfigure"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="useexternalfigure"> <cd:arguments> <cd:keywords> @@ -14913,7 +15415,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics conditional" file="grph-inc.mkiv" level="system" name="doifelsefigure"> + <cd:command category="graphics" file="grph-inc.mkiv" keywords="conditional" level="system" name="doifelsefigure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -14926,7 +15428,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics conditional" file="grph-inc.mkiv" level="system" name="doiffigureelse"> + <cd:command category="graphics" file="grph-inc.mkiv" keywords="conditional" level="system" name="doiffigureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -15099,7 +15601,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics buffer" file="grph-fig.mkiv" level="document" name="typesetbuffer"> + <cd:command category="graphics" file="grph-fig.mkiv" keywords="buffer" level="document" name="typesetbuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="*"/> @@ -15110,7 +15612,15 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics structure" file="grph-fig.mkiv" level="style" name="definetypesetting"> + <cd:command category="graphics" file="grph-fig.mkiv" keywords="buffer" level="document" name="typesetbufferonly"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="*"/> + <cd:constant type="cd:buffer"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="graphics" file="grph-fig.mkiv" keywords="structure" level="style" name="definetypesetting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15123,7 +15633,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics structure" file="grph-fig.mkiv" level="document" name="typesetfile"> + <cd:command category="graphics" file="grph-fig.mkiv" keywords="structure" level="document" name="typesetfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15184,6 +15694,30 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="graphics" file="grph-inc.mkiv" level="document" name="includesvgfile"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:file"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="offset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="graphics" file="grph-inc.mkiv" level="document" name="includesvgbuffer"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:buffer"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="offset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-grid.xml"> <cd:command category="layout" file="page-grd.mkiv" level="document" name="showgrid"> @@ -15504,7 +16038,7 @@ <cd:constant value="helptext"/> </cd:instances> </cd:command> - <cd:command category="pdf conditional" file="scrn-hlp.mkvi" level="system" name="doifelsehelp"> + <cd:command category="pdf" file="scrn-hlp.mkvi" keywords="conditional" level="system" name="doifelsehelp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -15514,7 +16048,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="scrn-hlp.mkvi" level="system" name="doifhelpelse"> + <cd:command category="pdf" file="scrn-hlp.mkvi" keywords="conditional" level="system" name="doifhelpelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -15557,7 +16091,7 @@ </cd:command> </cd:interface> <cd:interface file="i-highlight.xml"> - <cd:command category="fonts colors" file="core-sys.mkiv" level="style" name="definehighlight"> + <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="style" name="definehighlight"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15570,7 +16104,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="core-sys.mkiv" level="style" name="setuphighlight"> + <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="style" name="setuphighlight"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15590,7 +16124,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="core-sys.mkiv" generated="yes" level="document" name="highlight" variant="example"> + <cd:command category="fonts" file="core-sys.mkiv" generated="yes" keywords="colors" level="document" name="highlight" variant="example"> <cd:sequence> <cd:variable value="highlight"/> </cd:sequence> @@ -15600,7 +16134,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="highlight"> + <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="document" name="highlight"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15610,14 +16144,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="highlight" type="environment"> + <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="document" name="highlight" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="directhighlight"> + <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="document" name="directhighlight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15700,7 +16234,6 @@ <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="fixedspaces"/> <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="keepunwantedspaces"/> <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="removeunwantedspaces"/> - <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="thinspace"/> <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negthinspace"/> <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="enspace"/> <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negenspace"/> @@ -15716,9 +16249,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="leftskipadaption"/> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="rightskipadaption"/> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="dosetleftskipadaption"> + <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="leftskipadaption"/> + <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="rightskipadaption"/> + <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="dosetleftskipadaption"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -15728,7 +16261,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="dosetrightskipadaption"> + <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="dosetrightskipadaption"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -15738,7 +16271,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="doadaptleftskip"> + <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="doadaptleftskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -15748,7 +16281,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="doadaptrightskip"> + <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="doadaptrightskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -15758,7 +16291,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="activatespacehandler"> + <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="activatespacehandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="on"/> @@ -15768,13 +16301,36 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="quads"> + <cd:command category="whitespace" file="spac-hor.mkxl" level="style" name="quads"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspacebefore"/> + <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspaceafter"/> + <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspacesbefore"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspacesafter"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspaces"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-hyphenation.xml"> <cd:command category="language" file="lang-hyp.mkiv" level="style" name="setuphyphenation"> @@ -15805,7 +16361,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-hyp.mkiv" level="style" name="definehypenationfeatures"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="definehyphenationfeatures"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16051,6 +16607,14 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="language" file="lang-ini.mkxl" level="style" name="dohyphens"/> + <cd:command category="language" file="lang-ini.mkxl" level="style" name="nohyphens"/> + <cd:command category="language" file="lang-ini.mkxl" level="system" name="usehyphensparameter"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command category="language" file="lang-mis.mkxl" level="system" name="compounddiscretionary"/> </cd:interface> <cd:interface file="i-imposition.xml"> <cd:command category="layout" file="page-imp.mkiv" level="system" name="installshipoutmethod"> @@ -16063,7 +16627,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-imp.mkiv" level="system" name="invokepageheandler"> + <cd:command category="layout" file="page-imp.mkiv" level="system" name="invokepagehandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> @@ -16206,6 +16770,16 @@ </cd:command> <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="dorechecknextindentation"/> <cd:command begin="push" category="whitespace" end="pop" file="spac-hor.mkiv" level="system" name="indentation" type="environment"/> + <cd:command category="whitespace" file="supp-box.lua" keywords="conditional" level="system" name="doifelseindented"> + <cd:arguments> + <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:interface> <cd:interface file="i-indentedtext.xml"> <cd:command category="structure" file="strc-ind.mkiv" level="style" name="defineindentedtext"> @@ -16450,7 +17024,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="page-ins.mkiv" level="system" name="doifelseinsertion"> + <cd:command category="structure" file="page-ins.mkiv" keywords="conditional" level="system" name="doifelseinsertion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -16463,7 +17037,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="page-ins.mkiv" level="system" name="doifinsertionelse"> + <cd:command category="structure" file="page-ins.mkiv" keywords="conditional" level="system" name="doifinsertionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -16612,7 +17186,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="scrn-ini.mkvi" level="system" name="doifelselocation"> + <cd:command category="pdf" file="scrn-ini.mkvi" keywords="conditional" level="system" name="doifelselocation"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -16622,7 +17196,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="scrn-ini.mkvi" level="system" name="doiflocationelse"> + <cd:command category="pdf" file="scrn-ini.mkvi" keywords="conditional" level="system" name="doiflocationelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -17000,10 +17574,10 @@ </cd:command> </cd:interface> <cd:interface file="i-interface.xml"> - <cd:command file="mult-ini.mkiv" level="system" name="defaultinterface"/> - <cd:command file="mult-ini.mkiv" level="system" name="currentinterface"/> - <cd:command file="mult-ini.mkiv" level="system" name="currentresponses"/> - <cd:command file="mult-ini.mkiv" level="system" name="interface" type="environment"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="defaultinterface"/> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="currentinterface"/> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="currentresponses"/> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="interface" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="all"/> @@ -17011,7 +17585,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="defineinterfaceconstant"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="defineinterfaceconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17021,7 +17595,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="defineinterfacevariable"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="defineinterfacevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17031,7 +17605,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="defineinterfaceelement"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="defineinterfaceelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17041,7 +17615,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="definefileconstant"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="definefileconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17051,28 +17625,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="definesystemconstant"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="definesystemconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="definemessageconstant"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="definemessageconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="definesystemvariable"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="definesystemvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="setinterfacemessage"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="setinterfacemessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17087,7 +17661,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="setmessagetext"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="setmessagetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17098,8 +17672,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="currentmessagetext"/> - <cd:command file="mult-ini.mkiv" level="system" name="getmessage"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="currentmessagetext"/> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="getmessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17110,7 +17684,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="doifelsemessage"> + <cd:command category="tracker" file="mult-ini.mkiv" keywords="conditional" level="system" name="doifelsemessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17127,7 +17701,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="doifmessageelse"> + <cd:command category="tracker" file="mult-ini.mkiv" keywords="conditional" level="system" name="doifmessageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17144,7 +17718,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="showmessage"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="showmessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17158,7 +17732,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="writestatus"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="writestatus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -17168,28 +17742,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="message"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="message"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="inlinemessage"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="inlinemessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="displaymessage"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="displaymessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="showwarning"> + <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="showwarning"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17203,7 +17777,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="setinterfaceconstant"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="setinterfaceconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17213,7 +17787,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="setinterfacevariable"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="setinterfacevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17223,7 +17797,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="setinterfaceelement"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="setinterfaceelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17233,7 +17807,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" level="system" name="setinterfacecommand"> + <cd:command category="interface" file="mult-ini.mkiv" level="system" name="setinterfacecommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17419,181 +17993,6 @@ </cd:arguments> </cd:command> </cd:interface> - <cd:interface file="i-interlinespace.xml"> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="defineinterlinespace"> - <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="setupinterlinespace"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes"> - <cd:parameter name="line"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="height"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="depth"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="minheight"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="mindepth"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="top"> - <cd:constant type="cd:number"/> - <cd:constant type="height"/> - </cd:parameter> - <cd:parameter name="bottom"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="stretch"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="shrink"> - <cd:constant type="cd:number"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="argument"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="on"/> - <cd:constant type="off"/> - <cd:constant type="reset"/> - <cd:constant type="auto"/> - <cd:constant type="small"/> - <cd:constant type="medium"/> - <cd:constant type="big"/> - <cd:constant type="cd:number"/> - <cd:constant type="cd:dimension"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="name"> - <cd:arguments> - <cd:keywords> - <cd:constant type="cd:name"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes"> - <cd:inherit name="setupinterlinespace"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="argument"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="on"/> - <cd:constant type="off"/> - <cd:constant type="reset"/> - <cd:constant type="auto"/> - <cd:constant type="small"/> - <cd:constant type="medium"/> - <cd:constant type="big"/> - <cd:constant type="cd:number"/> - <cd:constant type="cd:dimension"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="name"> - <cd:arguments> - <cd:keywords> - <cd:constant type="cd:name"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes"> - <cd:inherit name="setupinterlinespace"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace" variant="argument"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="on"/> - <cd:constant type="off"/> - <cd:constant type="reset"/> - <cd:constant type="auto"/> - <cd:constant type="small"/> - <cd:constant type="medium"/> - <cd:constant type="big"/> - <cd:constant type="cd:number"/> - <cd:constant type="cd:dimension"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace" variant="name"> - <cd:arguments> - <cd:keywords> - <cd:constant type="cd:name"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace"> - <cd:arguments> - <cd:assignments delimiters="braces" list="yes"> - <cd:inherit name="setupinterlinespace"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="argument"> - <cd:arguments> - <cd:keywords delimiters="braces" list="yes"> - <cd:constant type="on"/> - <cd:constant type="off"/> - <cd:constant type="reset"/> - <cd:constant type="auto"/> - <cd:constant type="small"/> - <cd:constant type="medium"/> - <cd:constant type="big"/> - <cd:constant type="cd:number"/> - <cd:constant type="cd:dimension"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="name"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:name"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="useinterlinespaceparameter"> - <cd:arguments> - <cd:csname/> - </cd:arguments> - </cd:command> - </cd:interface> <cd:interface file="i-italiccorrection.xml"> <cd:command category="fonts" file="typo-itc.mkvi" level="system" name="setitaliccorrection"> <cd:arguments> @@ -17631,7 +18030,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroup"> + <cd:command category="structure" file="strc-itm.mkvi" keywords="counter" level="style" name="setupitemgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17818,6 +18217,8 @@ <cd:parameter name="placestopper"> <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> + <cd:constant type="display"/> + <cd:constant type="inline"/> </cd:parameter> <cd:parameter name="style"> <cd:constant type="cd:style"/> @@ -17857,7 +18258,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroup" variant="assignment"> + <cd:command category="structure" file="strc-itm.mkvi" keywords="counter" level="style" name="setupitemgroup" variant="assignment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17918,6 +18319,7 @@ <cd:constant type="inmargin"/> <cd:constant type="atmargin"/> <cd:constant type="intext"/> + <cd:constant type="headintext"/> <cd:constant type="loose"/> <cd:constant type="fit"/> <cd:constant type="nofit"/> @@ -18039,6 +18441,8 @@ <cd:parameter name="placestopper"> <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> + <cd:constant type="display"/> + <cd:constant type="inline"/> </cd:parameter> <cd:parameter name="style"> <cd:constant type="cd:style"/> @@ -18071,11 +18475,14 @@ <cd:parameter name="grid"> <cd:inherit name="definegridsnapping"/> </cd:parameter> + <cd:parameter name="packcriterium"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroups"> + <cd:command category="structure" file="strc-itm.mkvi" keywords="counter" level="style" name="setupitemgroups"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18136,6 +18543,7 @@ <cd:constant type="inmargin"/> <cd:constant type="atmargin"/> <cd:constant type="intext"/> + <cd:constant type="headintext"/> <cd:constant type="loose"/> <cd:constant type="fit"/> <cd:constant type="nofit"/> @@ -18257,6 +18665,8 @@ <cd:parameter name="placestopper"> <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> + <cd:constant type="display"/> + <cd:constant type="inline"/> </cd:parameter> <cd:parameter name="style"> <cd:constant type="cd:style"/> @@ -18289,11 +18699,14 @@ <cd:parameter name="grid"> <cd:inherit name="definegridsnapping"/> </cd:parameter> + <cd:parameter name="packcriterium"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure counter" file="strc-itm.mkvi" generated="yes" level="style" name="setupitemgroup" variant="instance"> + <cd:command category="structure" file="strc-itm.mkvi" generated="yes" keywords="counter" level="style" name="setupitemgroup" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="itemgroup"/> @@ -18481,6 +18894,8 @@ <cd:parameter name="placestopper"> <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> + <cd:constant type="display"/> + <cd:constant type="inline"/> </cd:parameter> <cd:parameter name="style"> <cd:constant type="cd:style"/> @@ -18756,7 +19171,7 @@ </cd:command> </cd:interface> <cd:interface file="i-kerning.xml"> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="definecharacterkerning"> + <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="definecharacterkerning"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18769,7 +19184,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setupcharacterkerning"> + <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="setupcharacterkerning"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18795,7 +19210,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setcharacterkerning"> + <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="setcharacterkerning"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -18803,8 +19218,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="resetcharacterkerning"/> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" generated="yes" level="document" name="characterkerning" variant="example"> + <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="resetcharacterkerning"/> + <cd:command category="fonts" file="typo-krn.mkiv" generated="yes" keywords="whitespace" level="document" name="characterkerning" variant="example"> <cd:sequence> <cd:variable value="characterkerning"/> </cd:sequence> @@ -18817,7 +19232,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="kerncharacters"> + <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="document" name="kerncharacters"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -18827,7 +19242,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="letterspacing"> + <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="document" name="letterspacing"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -18837,7 +19252,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="stretched"> + <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="document" name="stretched"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupstretched"/> @@ -18847,14 +19262,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setupstretched"> + <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="setupstretched"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacterkerning"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="defineperiodkerning"> + <cd:command category="fonts" file="typo-pnc.mkic" keywords="whitespace" level="style" name="defineperiodkerning"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18867,7 +19282,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setupperiodkerning"> + <cd:command category="fonts" file="typo-pnc.mkic" keywords="whitespace" level="style" name="setupperiodkerning"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18879,7 +19294,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setperiodkerning"> + <cd:command category="fonts" file="typo-pnc.mkic" keywords="whitespace" level="style" name="setperiodkerning"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -18887,7 +19302,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="resetperiodkerning"/> + <cd:command category="fonts" file="typo-pnc.mkic" keywords="whitespace" level="style" name="resetperiodkerning"/> </cd:interface> <cd:interface file="i-label.xml"> <cd:command category="structure" file="strc-lab.mkiv" level="style" name="definelabel"> @@ -19460,7 +19875,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifelselanguage"> + <cd:command category="language" file="lang-ini.mkiv" keywords="conditional" level="system" name="doifelselanguage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -19473,7 +19888,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doiflanguageelse"> + <cd:command category="language" file="lang-ini.mkiv" keywords="conditional" level="system" name="doiflanguageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -19486,7 +19901,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifelsepatterns"> + <cd:command category="language" file="lang-ini.mkiv" keywords="conditional" level="system" name="doifelsepatterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -19499,7 +19914,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifpatternselse"> + <cd:command category="language" file="lang-ini.mkiv" keywords="conditional" level="system" name="doifpatternselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -19881,7 +20296,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background conditional" file="pack-lyr.mkiv" level="system" name="doifelselayerdata"> + <cd:command category="background" file="pack-lyr.mkiv" keywords="conditional" level="system" name="doifelselayerdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -19894,7 +20309,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background conditional" file="pack-lyr.mkiv" level="system" name="doiflayerdataelse"> + <cd:command category="background" file="pack-lyr.mkiv" keywords="conditional" level="system" name="doiflayerdataelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -19909,7 +20324,7 @@ </cd:command> <cd:command category="background" file="pack-lyr.mkiv" level="system" name="layerwidth"/> <cd:command category="background" file="pack-lyr.mkiv" level="system" name="layerheight"/> - <cd:command category="background metapost" file="pack-lyr.mkiv" level="document" name="setMPlayer"> + <cd:command category="background" file="pack-lyr.mkiv" keywords="metapost" level="document" name="setMPlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19923,7 +20338,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="pack-lyr.mkiv" level="document" name="getMPlayer"> + <cd:command category="background" file="pack-lyr.mkiv" keywords="metapost" level="document" name="getMPlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20160,7 +20575,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelselayoutdefined"> + <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifelselayoutdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -20173,7 +20588,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doiflayoutdefinedelse"> + <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doiflayoutdefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -20209,7 +20624,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelseoddpage"> + <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifelseoddpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -20219,7 +20634,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifoddpageelse"> + <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifoddpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -20229,7 +20644,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifbothsidesoverruled"> + <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifbothsidesoverruled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -20242,7 +20657,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifbothsides"> + <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifbothsides"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -20255,7 +20670,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="rightorleftpageaction"> + <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="rightorleftpageaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -20327,12 +20742,13 @@ <cd:constant type="nc"/> <cd:constant type="sp"/> <cd:constant type="in"/> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </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-ini.mkiv" level="system" name="doifelsetopofpage"> + <cd:command category="layout" file="page-ini.mkiv" keywords="conditional" level="system" name="doifelsetopofpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -20342,7 +20758,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doiftopofpageelse"> + <cd:command category="layout" file="page-ini.mkiv" keywords="conditional" level="system" name="doiftopofpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -20354,7 +20770,7 @@ </cd:command> </cd:interface> <cd:interface file="i-linefiller.xml"> - <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller"> + <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="definelinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20367,7 +20783,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefiller"> + <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setuplinefiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20384,8 +20800,8 @@ <cd:constant default="yes" type="local"/> <cd:constant type="global"/> </cd:parameter> - <cd:parameter name="color"> - <cd:constant type="cd:color"/> + <cd:parameter name="mp"> + <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="height"> <cd:constant type="cd:dimension"/> @@ -20402,6 +20818,15 @@ <cd:parameter name="rulethickness"> <cd:constant type="cd:dimension"/> </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="color"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="textstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> @@ -20412,19 +20837,10 @@ <cd:parameter name="align"> <cd:inherit name="setupalign"/> </cd:parameter> - <cd:parameter name="mp"> - <cd:constant type="cd:name"/> - </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:assignments> </cd:arguments> </cd:command> - <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefillers"> + <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setuplinefillers"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20434,7 +20850,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="linefiller" type="environment"> + <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="linefiller" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -20445,7 +20861,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setlinefiller"> + <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setlinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -20453,6 +20869,39 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="rules" file="node-rul.mkiv" keywords="metapost boxes" level="document" name="linefillerhbox"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="rules" file="node-rul.mkiv" keywords="metapost boxes" level="document" name="linefillervbox"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="rules" file="node-rul.mkiv" keywords="metapost boxes" level="document" name="linefillervtop"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-linenumber.xml"> <cd:command category="structure" file="page-lin.mkvi" level="style" name="definelinenumbering"> @@ -20601,7 +21050,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="page-lin.mkvi" level="system" name="doifelsesamelinereference"> + <cd:command category="structure" file="page-lin.mkvi" keywords="conditional" level="system" name="doifelsesamelinereference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -20614,7 +21063,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="page-lin.mkvi" level="system" name="doifsamelinereferenceelse"> + <cd:command category="structure" file="page-lin.mkvi" keywords="conditional" level="system" name="doifsamelinereferenceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -20646,34 +21095,42 @@ </cd:command> </cd:interface> <cd:interface file="i-lines.xml"> - <cd:command file="supp-box.mkiv" level="system" name="noflines"/> - <cd:command file="supp-box.mkiv" level="system" name="getnoflines"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="noflines"/> + <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="getnoflines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="getroundednoflines"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="getroundednoflines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="getrawnoflines"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="getrawnoflines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="determinenoflines"> + <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="determinenoflines"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" level="style" name="definelines"> + <cd:command category="boxes" file="supp-box.lua" level="system" name="noflinesinbox"> + <cd:arguments> + <cd:keywords delimiters="none"> + <cd:constant type="cd:csname"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="spac-lin.mkiv" level="style" name="definelines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20686,7 +21143,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" level="style" name="setuplines"> + <cd:command category="structure" file="spac-lin.mkiv" level="style" name="setuplines"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20733,10 +21190,14 @@ <cd:parameter name="right"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter list="yes" name="indentlist"> + <cd:constant type="cd:dimension"/> + <cd:constant type="*"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" generated="yes" level="document" name="lines" type="environment" variant="instance"> + <cd:command category="structure" file="spac-lin.mkiv" generated="yes" level="document" name="lines" type="environment" variant="instance"> <cd:sequence> <cd:instance value="lines"/> </cd:sequence> @@ -20749,7 +21210,7 @@ <cd:constant value="lines"/> </cd:instances> </cd:command> - <cd:command file="spac-lin.mkiv" level="document" name="emptylines"> + <cd:command category="whitespace" file="spac-lin.mkiv" level="document" name="emptylines"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -20860,7 +21321,7 @@ <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetable" type="environment"/> <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetablehead" type="environment"/> <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetablebody" type="environment"/> - <cd:command category="tables buffer" file="tabl-ltb.mkiv" level="document" name="processlinetablebuffer"> + <cd:command category="tables" file="tabl-ltb.mkiv" keywords="buffer" level="document" name="processlinetablebuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> @@ -20988,10 +21449,11 @@ <cd:parameter name="pagecommand"> <cd:constant type="cd:oneargument"/> </cd:parameter> - <cd:parameter name="pagenumber"> + <cd:parameter list="yes" name="pagenumber"> <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> <cd:constant type="always"/> + <cd:constant type="realpage"/> </cd:parameter> <cd:parameter name="headnumber"> <cd:constant default="yes" type="yes"/> @@ -21163,7 +21625,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelselist"> + <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifelselist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:list"/> @@ -21176,7 +21638,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doiflistelse"> + <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doiflistelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:list"/> @@ -21400,7 +21862,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelsestructurelisthaspage"> + <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifelsestructurelisthaspage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -21410,7 +21872,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifstructurelisthaspageelse"> + <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifstructurelisthaspageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -21420,7 +21882,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelsestructurelisthasnumber"> + <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifelsestructurelisthasnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -21430,7 +21892,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifstructurelisthasnumberelse"> + <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifstructurelisthasnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -21565,11 +22027,15 @@ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKII"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKIV"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKVI"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKXL"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKLX"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKIX"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKXI"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPII"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPIV"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPVI"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPXL"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPLX"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTeX"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTEX"/> <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PRAGMA"/> @@ -22025,6 +22491,16 @@ <cd:variable value="ctxfunctiondefinition"/> </cd:sequence> </cd:command> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="setctxluafunction"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxfunction" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> @@ -22039,14 +22515,118 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="installctxfunction"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="lua" file="luat-ini.mkiv" generated="yes" level="system" name="ctxfunction" variant="example"> <cd:sequence> <cd:variable value="ctxfunction"/> </cd:sequence> </cd:command> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="installctxscanner"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="luat-ini.mkiv" generated="yes" level="system" name="ctxscanner" variant="example"> + <cd:sequence> + <cd:variable value="ctxscanner"/> + </cd:sequence> + </cd:command> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="installprotectedctxfunction"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="installprotectedctxscanner"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="resetctxscanner"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + </cd:interface> + <cd:interface file="i-luatable.xml"> + <cd:command category="lua" file="cldf-int.mkxl" level="system" name="newluatable"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-int.mkxl" level="system" name="useluatable"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-lmt.lua" level="system" name="disposeluatable"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-lmt.lua" level="system" name="inspectluatable"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-lmt.lua" level="system" name="showluatables"/> + <cd:command category="lua" file="cldf-lmt.lua" level="system" name="setluatable"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-lmt.lua" level="system" name="getfromluatable"> + <cd:arguments> + <cd:csname/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-lmt.lua" level="system" name="idxfromluatable"> + <cd:arguments> + <cd:csname/> + <cd:keywords delimiters="none"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-int.mkxl" level="system" name="setdatavalue"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-int.mkxl" level="system" name="getdatavalue"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="lua" file="cldf-int.mkxl" level="system" name="thedatavalue"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-makeup.xml"> - <cd:command category="structure layout" file="page-mak.mkvi" level="style" name="definemakeup"> + <cd:command category="structure" file="page-mak.mkvi" keywords="layout" level="style" name="definemakeup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -22059,7 +22639,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-mak.mkvi" level="style" name="setupmakeup"> + <cd:command category="structure" file="page-mak.mkvi" keywords="layout" level="style" name="setupmakeup"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -22160,7 +22740,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-mak.mkvi" level="document" name="makeup" type="environment"> + <cd:command category="structure" file="page-mak.mkvi" keywords="layout" level="document" name="makeup" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -22170,7 +22750,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-mak.mkvi" generated="yes" level="document" name="makeup" type="environment" variant="instance"> + <cd:command category="structure" file="page-mak.mkvi" generated="yes" keywords="layout" level="document" name="makeup" type="environment" variant="instance"> <cd:sequence> <cd:instance value="makeup"/> <cd:string value="makeup"/> @@ -22189,7 +22769,7 @@ </cd:command> </cd:interface> <cd:interface file="i-marginblock.xml"> - <cd:command category="structure layout" file="page-mbk.mkvi" level="style" name="definemarginblock"> + <cd:command category="structure" file="page-mbk.mkvi" keywords="layout" level="style" name="definemarginblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -22202,7 +22782,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-mbk.mkvi" level="style" name="setupmarginblock"> + <cd:command category="structure" file="page-mbk.mkvi" keywords="layout" level="style" name="setupmarginblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -22255,7 +22835,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-mbk.mkvi" level="document" name="marginblock" type="environment"> + <cd:command category="structure" file="page-mbk.mkvi" keywords="layout" level="document" name="marginblock" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -22473,7 +23053,7 @@ </cd:command> </cd:interface> <cd:interface file="i-marking.xml"> - <cd:command file="strc-mar.mkiv" level="style" name="definemarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="definemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -22486,7 +23066,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="setupmarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="setupmarking"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:mark"/> @@ -22509,7 +23089,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="system" name="relatemarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="system" name="relatemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22519,7 +23099,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="setmarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="setmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22529,14 +23109,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="system" name="resetmarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="system" name="resetmarking"> <cd:arguments> <cd:keywords> + <cd:constant type="all"/> <cd:constant type="cd:mark"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="system" name="synchronizemarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="system" name="synchronizemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22549,7 +23130,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="strc-mar.mkiv" level="system" name="doifelsemarking"> + <cd:command category="structure" file="strc-mar.mkiv" keywords="conditional" level="system" name="doifelsemarking"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:mark"/> @@ -22562,7 +23143,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="strc-mar.mkiv" level="system" name="doifmarkingelse"> + <cd:command category="structure" file="strc-mar.mkiv" keywords="conditional" level="system" name="doifmarkingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:mark"/> @@ -22575,7 +23156,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="getmarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="getmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22583,6 +23164,7 @@ <cd:keywords optional="yes"> <cd:constant default="yes" type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords optional="yes"> <cd:constant type="first"/> @@ -22604,7 +23186,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="fetchonemark"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchonemark"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22629,21 +23211,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="fetchtwomarks"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchtwomarks"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="fetchallmarks"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchallmarks"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="fetchmark"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchmark"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22668,7 +23250,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="fetchmarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22676,6 +23258,7 @@ <cd:keywords> <cd:constant type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords> <cd:constant type="first"/> @@ -22697,7 +23280,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="fetchonemarking"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchonemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22705,6 +23288,7 @@ <cd:keywords> <cd:constant type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords> <cd:constant type="first"/> @@ -22726,7 +23310,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="fetchtwomarkings"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchtwomarkings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22734,10 +23318,11 @@ <cd:keywords> <cd:constant type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="style" name="fetchallmarkings"> + <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchallmarkings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -22745,6 +23330,7 @@ <cd:keywords> <cd:constant type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> @@ -22864,9 +23450,9 @@ <cd:constant type="normal"/> </cd:parameter> <cd:parameter name="collapsing"> - <cd:constant type="1"/> + <cd:constant default="yes" type="1"/> <cd:constant type="2"/> - <cd:constant default="yes" type="3"/> + <cd:constant type="3"/> <cd:constant type="none"/> <cd:constant type="reset"/> </cd:parameter> @@ -23330,7 +23916,7 @@ <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"> + <cd:command category="mathematics" file="math-ali.mkiv" keywords="alignment" level="style" name="definemathalignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23343,7 +23929,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="setupmathalignment"> + <cd:command category="mathematics" file="math-ali.mkiv" keywords="alignment" level="style" name="setupmathalignment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23383,7 +23969,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics alignment" file="math-ali.mkiv" generated="yes" level="document" name="mathalignment" type="environment" variant="instance"> + <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="alignment" level="document" name="mathalignment" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathalignment"/> </cd:sequence> @@ -23399,7 +23985,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mathcases.xml"> - <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathcases"> + <cd:command category="mathematics" file="math-ali.mkiv" keywords="alignment" level="style" name="definemathcases"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23412,7 +23998,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="setupmathcases"> + <cd:command category="mathematics" file="math-ali.mkiv" keywords="alignment" level="style" name="setupmathcases"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23441,7 +24027,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics alignment" file="math-ali.mkiv" generated="yes" level="document" name="mathcases" type="environment" variant="instance"> + <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="alignment" level="document" name="mathcases" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathcases"/> </cd:sequence> @@ -23930,7 +24516,7 @@ <cd:command category="mathematics" file="math-fen.mkiv" level="style" name="checkedfences" type="environment"/> </cd:interface> <cd:interface file="i-mathmatrix.xml"> - <cd:command category="mathematics tables" file="math-ali.mkiv" level="style" name="definemathmatrix"> + <cd:command category="mathematics" file="math-ali.mkiv" keywords="tables" level="style" name="definemathmatrix"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23943,7 +24529,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics tables" file="math-ali.mkiv" level="style" name="setupmathmatrix"> + <cd:command category="mathematics" file="math-ali.mkiv" keywords="tables" level="style" name="setupmathmatrix"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23987,7 +24573,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix" type="environment" variant="instance"> + <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="tables" level="document" name="mathmatrix" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathmatrix"/> </cd:sequence> @@ -23999,17 +24585,24 @@ <cd:instances> <cd:constant value="matrix"/> <cd:constant value="mathmatrix"/> + <cd:constant value="thematrix"/> </cd:instances> </cd:command> - <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix"> + <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="tables" level="document" name="mathmatrix" variant="instance"> <cd:sequence> - <cd:variable value="mathmatrix"/> + <cd:instance value="mathmatrix"/> </cd:sequence> <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathmatrix"/> + </cd:assignments> <cd:content/> </cd:arguments> + <cd:instances> + <cd:constant value="thematrix"/> + </cd:instances> </cd:command> - <cd:command category="mathematics tables" file="math-ali.mkiv" level="document" name="matrices" type="environment"> + <cd:command category="mathematics" file="math-ali.mkiv" keywords="tables" level="document" name="matrices" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> @@ -24045,18 +24638,18 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bordermatrix"> + <cd:command category="mathematics" file="math-pln.mkiv" keywords="tables" level="document" name="bordermatrix"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bbordermatrix"> + <cd:command category="mathematics" file="math-pln.mkiv" keywords="tables" level="document" name="bbordermatrix"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bordermatrix" type="environment"/> - <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bbordermatrix" type="environment"/> + <cd:command category="mathematics" file="math-pln.mkiv" keywords="tables" level="document" name="bordermatrix" type="environment"/> + <cd:command category="mathematics" file="math-pln.mkiv" keywords="tables" level="document" name="bbordermatrix" type="environment"/> </cd:interface> <cd:interface file="i-mathornament.xml"> <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="definemathornament"> @@ -24264,6 +24857,18 @@ <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> </cd:parameter> + <cd:parameter name="lt"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rt"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="lb"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rb"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -24587,7 +25192,23 @@ </cd:keywords> </cd:arguments> <cd:instances> - <cd:resolve name="instance-mathovertextextensible"/> + <cd:constant value="overleftarrow"/> + <cd:constant value="overrightarrow"/> + <cd:constant value="overleftrightarrow"/> + <cd:constant value="overtwoheadleftarrow"/> + <cd:constant value="overtwoheadrightarrow"/> + <cd:constant value="overleftharpoondown"/> + <cd:constant value="overleftharpoonup"/> + <cd:constant value="overrightharpoondown"/> + <cd:constant value="overrightharpoonup"/> + <cd:constant value="overbar"/> + <cd:constant value="overbrace"/> + <cd:constant value="overparent"/> + <cd:constant value="overbracket"/> + <cd:constant value="overbartext"/> + <cd:constant value="overbracetext"/> + <cd:constant value="overparenttext"/> + <cd:constant value="overbrackettext"/> </cd:instances> </cd:command> <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathundertextextensible"> @@ -24616,7 +25237,23 @@ </cd:keywords> </cd:arguments> <cd:instances> - <cd:resolve name="instance-mathundertextextensible"/> + <cd:constant value="underleftarrow"/> + <cd:constant value="underrightarrow"/> + <cd:constant value="underleftrightarrow"/> + <cd:constant value="undertwoheadleftarrow"/> + <cd:constant value="undertwoheadrightarrow"/> + <cd:constant value="underleftharpoondown"/> + <cd:constant value="underleftharpoonup"/> + <cd:constant value="underrightharpoondown"/> + <cd:constant value="underrightharpoonup"/> + <cd:constant value="underbar"/> + <cd:constant value="underbrace"/> + <cd:constant value="underparent"/> + <cd:constant value="underbracket"/> + <cd:constant value="underbartext"/> + <cd:constant value="underbracetext"/> + <cd:constant value="underparenttext"/> + <cd:constant value="underbrackettext"/> </cd:instances> </cd:command> <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathtriplet"> @@ -24694,43 +25331,95 @@ <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="iff"/> </cd:interface> <cd:interface file="i-metapost.xml"> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPdefinitions" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPdefinitions" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:name"/> + <cd:constant type="metafun"/> + <cd:constant type="minifun"/> + <cd:constant type="extrafun"/> + <cd:constant type="lessfun"/> + <cd:constant type="doublefun"/> + <cd:constant type="binaryfun"/> + <cd:constant type="decimalfun"/> + <cd:constant type="mprun"/> + <cd:constant type="metapost"/> + <cd:constant type="nofun"/> + <cd:constant type="doublepost"/> + <cd:constant type="binarypost"/> + <cd:constant type="decimalpost"/> + <cd:constant type="simplefun"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPextensions" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPextensions" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" list="yes" optional="yes"> - <cd:constant type="cd:name"/> + <cd:constant type="metafun"/> + <cd:constant type="minifun"/> + <cd:constant type="extrafun"/> + <cd:constant type="lessfun"/> + <cd:constant type="doublefun"/> + <cd:constant type="binaryfun"/> + <cd:constant type="decimalfun"/> + <cd:constant type="mprun"/> + <cd:constant type="metapost"/> + <cd:constant type="nofun"/> + <cd:constant type="doublepost"/> + <cd:constant type="binarypost"/> + <cd:constant type="decimalpost"/> + <cd:constant type="simplefun"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinitializations" type="environment"/> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinclusions" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPinitializations" type="environment"/> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPinclusions" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> </cd:keywords> <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:name"/> + <cd:constant type="metafun"/> + <cd:constant type="minifun"/> + <cd:constant type="extrafun"/> + <cd:constant type="lessfun"/> + <cd:constant type="doublefun"/> + <cd:constant type="binaryfun"/> + <cd:constant type="decimalfun"/> + <cd:constant type="mprun"/> + <cd:constant type="metapost"/> + <cd:constant type="nofun"/> + <cd:constant type="doublepost"/> + <cd:constant type="binarypost"/> + <cd:constant type="decimalpost"/> + <cd:constant type="simplefun"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinclusions"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPinclusions"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> </cd:keywords> <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:name"/> + <cd:constant type="metafun"/> + <cd:constant type="minifun"/> + <cd:constant type="extrafun"/> + <cd:constant type="lessfun"/> + <cd:constant type="doublefun"/> + <cd:constant type="binaryfun"/> + <cd:constant type="decimalfun"/> + <cd:constant type="mprun"/> + <cd:constant type="metapost"/> + <cd:constant type="nofun"/> + <cd:constant type="doublepost"/> + <cd:constant type="binarypost"/> + <cd:constant type="decimalpost"/> + <cd:constant type="simplefun"/> </cd:keywords> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="defineMPinstance"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="defineMPinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24743,7 +25432,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setupMPinstance"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setupMPinstance"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24751,6 +25440,7 @@ <cd:assignments list="yes"> <cd:parameter name="format"> <cd:constant default="yes" type="metafun"/> + <cd:constant type="minifun"/> <cd:constant type="mpost"/> </cd:parameter> <cd:parameter name="initializations"> @@ -24781,50 +25471,50 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="system" name="resetMPinstance"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="system" name="resetMPinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="processMPfigurefile"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="processMPfigurefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPdrawing" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPdrawing" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="-"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="resetMPdrawing"/> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="getMPdrawing"/> - <cd:command begin="push" category="graphics metapost" end="pop" file="meta-ini.mkiv" level="system" name="MPdrawing" type="environment"/> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPdrawing"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="resetMPdrawing"/> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="getMPdrawing"/> + <cd:command begin="push" category="graphics" end="pop" file="meta-ini.mkiv" keywords="metapost" level="system" name="MPdrawing" type="environment"/> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPdrawing"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPclip" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPclip" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost fonts" file="meta-ini.mkiv" level="system" name="MPfontsizehskip"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost fonts" level="system" name="MPfontsizehskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" level="style" name="setupMPvariables"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setupMPvariables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24836,7 +25526,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" level="style" name="setMPvariables"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setMPvariables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24848,7 +25538,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" level="style" name="setMPvariable"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setMPvariable"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24860,7 +25550,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" level="system" name="MPrawvar"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="system" name="MPrawvar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24870,21 +25560,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" level="style" name="MPvariable"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" level="style" name="MPvar"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPvar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" level="style" name="useMPvariables"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24894,7 +25584,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="uniqueMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24904,7 +25594,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="uniqueMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24916,7 +25606,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24926,7 +25616,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24938,7 +25628,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="usableMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="usableMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24948,7 +25638,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reuseMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="reuseMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24960,7 +25650,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reusableMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="reusableMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24970,7 +25660,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reusableMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="reusableMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24982,7 +25672,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPpagegraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="uniqueMPpagegraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24992,7 +25682,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPpagegraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="uniqueMPpagegraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25004,21 +25694,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="processMPbuffer"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="processMPbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="runMPbuffer"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="runMPbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPenvironment" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPenvironment" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -25027,37 +25717,63 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="resetMPenvironment"/> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPenvironmentbuffer"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="resetMPenvironment"/> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPenvironmentbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPcode" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPcode" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:name"/> + <cd:constant type="metafun"/> + <cd:constant type="minifun"/> + <cd:constant type="extrafun"/> + <cd:constant type="lessfun"/> + <cd:constant type="doublefun"/> + <cd:constant type="binaryfun"/> + <cd:constant type="decimalfun"/> + <cd:constant type="mprun"/> + <cd:constant type="metapost"/> + <cd:constant type="nofun"/> + <cd:constant type="doublepost"/> + <cd:constant type="binarypost"/> + <cd:constant type="decimalpost"/> + <cd:constant type="simplefun"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPcode"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPcode"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:name"/> + <cd:constant type="metafun"/> + <cd:constant type="minifun"/> + <cd:constant type="extrafun"/> + <cd:constant type="lessfun"/> + <cd:constant type="doublefun"/> + <cd:constant type="binaryfun"/> + <cd:constant type="decimalfun"/> + <cd:constant type="mprun"/> + <cd:constant type="metapost"/> + <cd:constant type="nofun"/> + <cd:constant type="doublepost"/> + <cd:constant type="binarypost"/> + <cd:constant type="decimalpost"/> + <cd:constant type="simplefun"/> </cd:keywords> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPrun" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPrun" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="useMPrun"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="useMPrun"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25067,14 +25783,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPlibrary"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPlibrary"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setMPtext"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setMPtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25084,28 +25800,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPtext"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPstring"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPbetex"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPbetex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost conditional" file="meta-ini.mkiv" level="style" name="doifelseMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost conditional" level="style" name="doifelseMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25118,7 +25834,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost conditional" file="meta-ini.mkiv" level="style" name="doifMPgraphicelse"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost conditional" level="style" name="doifMPgraphicelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25131,14 +25847,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="staticMPfigure" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="staticMPfigure" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="staticMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="staticMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25148,7 +25864,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="usestaticMPfigure"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="usestaticMPfigure"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupscale"/> @@ -25158,7 +25874,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setupMPgraphics"> + <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setupMPgraphics"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -25173,7 +25889,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mixedcolumns.xml"> - <cd:command category="structure layout" file="page-mix.mkiv" level="style" name="definemixedcolumns"> + <cd:command category="columns" file="page-mix.mkiv" keywords="structure layout" level="style" name="definemixedcolumns"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25186,7 +25902,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-mix.mkiv" level="style" name="setupmixedcolumns"> + <cd:command category="columns" file="page-mix.mkiv" keywords="structure layout" level="style" name="setupmixedcolumns"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25269,7 +25985,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-mix.mkiv" level="document" name="mixedcolumns" type="environment"> + <cd:command category="columns" file="page-mix.mkiv" keywords="structure layout" level="document" name="mixedcolumns" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25279,7 +25995,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-mix.mkiv" generated="yes" level="document" name="mixedcolumns" type="environment" variant="instance"> + <cd:command category="columns" file="page-mix.mkiv" generated="yes" keywords="structure layout" level="document" name="mixedcolumns" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mixedcolumns"/> </cd:sequence> @@ -25294,7 +26010,7 @@ <cd:constant value="columns"/> </cd:instances> </cd:command> - <cd:command category="structure layout" file="page-smp.mkiv" level="style" name="setupcolumns"> + <cd:command category="columns" file="page-smp.mkiv" keywords="structure layout" level="style" name="setupcolumns"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupmixedcolumns"/> @@ -25406,7 +26122,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifelsemode"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifelsemode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -25419,7 +26135,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifmodeelse"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifmodeelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -25432,7 +26148,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifmode"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifmode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -25442,7 +26158,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifnotmode"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifnotmode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -25466,7 +26182,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifelseallmodes"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifelseallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -25479,7 +26195,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifallmodeselse"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifallmodeselse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -25492,7 +26208,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifallmodes"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -25505,7 +26221,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifnotallmodes"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifnotallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -25571,7 +26287,7 @@ </cd:command> </cd:interface> <cd:interface file="i-modules.xml"> - <cd:command file="file-mod.mkvi" level="style" name="usemodule"> + <cd:command category="structure" file="file-mod.mkvi" level="style" name="usemodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -25590,7 +26306,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="style" name="usetexmodule"> + <cd:command category="structure" file="file-mod.mkvi" level="style" name="usetexmodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -25609,21 +26325,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="module" type="environment"> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="module" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="module" type="environment" variant="string"> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="module" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="setupmodule"> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="setupmodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:file"/> @@ -25639,7 +26355,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="moduleparameter"> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="moduleparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -25649,15 +26365,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="currentmoduleparameter"> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="currentmoduleparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="moduletestsection" type="environment"/> - <cd:command file="file-mod.mkvi" level="system" name="fetchruntinecommand"> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="moduletestsection" type="environment"/> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="fetchruntinecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -25665,14 +26381,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="luaenvironment"> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="luaenvironment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="useluamodule"> + <cd:command category="structure" file="file-mod.mkvi" level="system" name="useluamodule"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -25681,7 +26397,7 @@ </cd:command> </cd:interface> <cd:interface file="i-narrow.xml"> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="style" name="definenarrower"> + <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="style" name="definenarrower"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25694,7 +26410,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="style" name="setupnarrower"> + <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="style" name="setupnarrower"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25727,7 +26443,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrower" type="environment"> + <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="document" name="narrower" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant method="none" prefix="cd:sign" type="left"/> @@ -25741,7 +26457,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" generated="yes" level="document" name="narrower" type="environment" variant="example"> + <cd:command category="whitespace" file="spac-hor.mkiv" generated="yes" keywords="layout" level="document" name="narrower" type="environment" variant="example"> <cd:sequence> <cd:variable value="narrower"/> </cd:sequence> @@ -25758,7 +26474,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment"> + <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="document" name="narrow" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25768,7 +26484,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="name"> + <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="document" name="narrow" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25785,7 +26501,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="assignment"> + <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="document" name="narrow" type="environment" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnarrower"/> @@ -25804,7 +26520,7 @@ </cd:command> </cd:interface> <cd:interface file="i-naturaltable.xml"> - <cd:command category="tables" file="tabl-ntb.mkiv" level="style" name="setupTABLE"> + <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="style" name="setupTABLE"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="r"/> @@ -25924,14 +26640,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLE" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLE" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TD" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEnested" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupTABLE"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TD" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -25959,77 +26682,77 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TR" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TR" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TC" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TC" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TX" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TX" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TY" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TY" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TH" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TH" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TN" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TN" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEhead" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEhead" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEnext" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEnext" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEbody" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEbody" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEfoot" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEfoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="style" name="defineTABLEsetup"> + <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="style" name="defineTABLEsetup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26039,49 +26762,49 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TDs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TDs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TRs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TRs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLE" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLE" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEhead" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEhead" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEnext" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEnext" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEbody" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEbody" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEfoot" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEfoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -26090,7 +26813,7 @@ </cd:command> </cd:interface> <cd:interface file="i-note.xml"> - <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotation"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupnotation"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26274,7 +26997,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotations"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupnotations"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26284,7 +27007,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance:assignment"> + <cd:command category="structure" file="strc-not.mkvi" generated="yes" keywords="notes" level="document" name="note" type="environment" variant="instance:assignment"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -26309,7 +27032,7 @@ <cd:constant value="endnote"/> </cd:instances> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance"> + <cd:command category="structure" file="strc-not.mkvi" generated="yes" keywords="notes" level="document" name="note" type="environment" variant="instance"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -26323,7 +27046,7 @@ <cd:constant value="endnote"/> </cd:instances> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance"> + <cd:command category="structure" file="strc-not.mkvi" generated="yes" keywords="notes" level="document" name="note" variant="instance"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -26340,7 +27063,7 @@ <cd:constant value="endnote"/> </cd:instances> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance:assignment"> + <cd:command category="structure" file="strc-not.mkvi" generated="yes" keywords="notes" level="document" name="note" variant="instance:assignment"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -26365,7 +27088,7 @@ <cd:constant value="endnote"/> </cd:instances> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="definenote"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="definenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26378,7 +27101,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnote"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupnote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26521,7 +27244,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotes"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupnotes"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26531,14 +27254,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupfootnotes"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" 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:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="setnote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26551,7 +27274,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote" variant="assignment"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="setnote" variant="assignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26572,7 +27295,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnotetext"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="setnotetext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26585,7 +27308,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnotetext" variant="assignment"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="setnotetext" variant="assignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26606,7 +27329,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placenotes"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="placenotes"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -26616,14 +27339,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="localnotes" type="environment"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="localnotes" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placelocalnotes"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="placelocalnotes"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26633,10 +27356,10 @@ </cd:assignments> </cd:arguments> </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:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="postponenotes"/> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="flushnotes"/> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" name="postponingnotes" type="environment"/> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes conditional" level="system" name="doifelsenoteonsamepage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -26649,7 +27372,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifnoteonsamepageelse"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes conditional" level="system" name="doifnoteonsamepageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -26662,7 +27385,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifnotescollected"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes conditional" level="system" name="doifnotescollected"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -26672,7 +27395,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="system" name="notesymbol"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="system" name="notesymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26682,7 +27405,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="note"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="note"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26692,7 +27415,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="footnotetext"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="footnotetext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -26702,7 +27425,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="footnotetext" variant="assignment"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="footnotetext" variant="assignment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -26720,22 +27443,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placefootnotes"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="placefootnotes"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="localfootnotes" type="environment"/> - <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placelocalfootnotes"> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="localfootnotes" type="environment"/> + <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="placelocalfootnotes"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-lnt.mkvi" level="style" name="definelinenote"> + <cd:command category="structure" file="strc-lnt.mkvi" keywords="notes" level="style" name="definelinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26748,7 +27471,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-lnt.mkvi" level="style" name="setuplinenote"> + <cd:command category="structure" file="strc-lnt.mkvi" keywords="notes" level="style" name="setuplinenote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26769,11 +27492,14 @@ <cd:parameter name="compressdistance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="compressstopper"> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="linenote" variant="instance"> + <cd:command category="structure" file="strc-lnt.mkvi" generated="yes" keywords="notes" level="document" name="linenote" variant="instance"> <cd:sequence> <cd:instance value="linenote"/> </cd:sequence> @@ -26786,7 +27512,7 @@ <cd:constant value="linenote"/> </cd:instances> </cd:command> - <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="startlinenote" variant="instance"> + <cd:command category="structure" file="strc-lnt.mkvi" generated="yes" keywords="notes" level="document" name="startlinenote" variant="instance"> <cd:sequence> <cd:string value="start"/> <cd:instance value="linenote"/> @@ -26803,7 +27529,7 @@ <cd:constant value="linenote"/> </cd:instances> </cd:command> - <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="stoplinenote" variant="instance"> + <cd:command category="structure" file="strc-lnt.mkvi" generated="yes" keywords="notes" level="document" name="stoplinenote" variant="instance"> <cd:sequence> <cd:string value="stop"/> <cd:instance value="linenote"/> @@ -26817,7 +27543,7 @@ <cd:constant value="linenote"/> </cd:instances> </cd:command> - <cd:command category="structure notes" file="strc-lnt.mkvi" level="document" name="fromlinenote"> + <cd:command category="structure" file="strc-lnt.mkvi" keywords="notes" level="document" name="fromlinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -26827,14 +27553,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-lnt.mkvi" level="document" name="tolinenote"> + <cd:command category="structure" file="strc-lnt.mkvi" keywords="notes" level="document" name="tolinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-tnt.mkiv" level="style" name="definetextnote"> + <cd:command category="structure" file="strc-tnt.mkiv" keywords="notes" level="style" name="definetextnote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26847,7 +27573,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-tnt.mkiv" level="style" name="setuptextnote"> + <cd:command category="structure" file="strc-tnt.mkiv" keywords="notes" level="style" name="setuptextnote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26872,7 +27598,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure notes" file="strc-tnt.mkiv" generated="yes" level="document" name="textnote"> + <cd:command category="structure" file="strc-tnt.mkiv" generated="yes" keywords="notes" level="document" name="textnote" variant="example"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptextnote"/> @@ -26994,7 +27720,7 @@ </cd:command> <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="defaultobjectreference"/> <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="defaultobjectpage"/> - <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifelseobjectfound"> + <cd:command category="pdf" file="pack-obj.mkiv" keywords="conditional" level="system" name="doifelseobjectfound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27010,7 +27736,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifobjectfoundelse"> + <cd:command category="pdf" file="pack-obj.mkiv" keywords="conditional" level="system" name="doifobjectfoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27026,7 +27752,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifelseobjectreferencefound"> + <cd:command category="pdf" file="pack-obj.mkiv" keywords="conditional" level="system" name="doifelseobjectreferencefound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27042,7 +27768,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifobjectreferencefoundelse"> + <cd:command category="pdf" file="pack-obj.mkiv" keywords="conditional" level="system" name="doifobjectreferencefoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27060,7 +27786,7 @@ </cd:command> </cd:interface> <cd:interface file="i-offset.xml"> - <cd:command category="layout" file="pack-box.mkiv" level="style" name="setupoffsetbox"> + <cd:command category="boxes" file="pack-box.mkiv" keywords="layout" level="style" name="setupoffsetbox"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="x"> @@ -27111,14 +27837,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="pack-box.mkiv" level="style" name="setupoffset"> + <cd:command category="boxes" file="pack-box.mkiv" keywords="layout" level="style" name="setupoffset"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupoffsetbox"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="pack-box.mkiv" level="system" name="offsetbox"> + <cd:command category="boxes" file="pack-box.mkiv" keywords="layout" level="system" name="offsetbox"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffsetbox"/> @@ -27127,7 +27853,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="layout" file="pack-box.mkiv" level="document" name="offset"> + <cd:command category="boxes" file="pack-box.mkiv" keywords="layout" level="document" name="offset"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffset"/> @@ -27158,8 +27884,104 @@ </cd:command> <cd:command category="layout" file="page-fac.mkiv" level="document" name="opposite" type="environment"/> </cd:interface> + <cd:interface file="i-orientation.xml"> + <cd:command category="alignment" file="pack-ori.mkxl" level="style" name="defineorientation"> + <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="setuporientation"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-ori.mkxl" level="style" name="setuporientation"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="orientation"> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant default="yes" type="normal"/> + </cd:parameter> + <cd:parameter name="horizontal"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant default="yes" type="normal"/> + </cd:parameter> + <cd:parameter name="vertical"> + <cd:constant type="line"/> + <cd:constant type="top"/> + <cd:constant type="middle"/> + <cd:constant type="bottom"/> + <cd:constant default="yes" type="normal"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-ori.mkxl" level="system" name="theorientation"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-ori.mkxl" level="system" name="autoorientation"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-ori.mkxl" keywords="conditional" level="system" name="doifelseorientation"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:keywords> + <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:interface> <cd:interface file="i-ornament.xml"> - <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="collector"> + <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="document" name="ornamenttext" variant="collector"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -27184,7 +28006,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="layer"> + <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="document" name="ornamenttext" variant="layer"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -27202,7 +28024,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="direct"> + <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="document" name="ornamenttext" variant="direct"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27213,7 +28035,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="background fonts colors" file="pack-box.mkiv" level="style" name="defineornament" variant="collector"> + <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="style" name="defineornament" variant="collector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27237,7 +28059,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background fonts colors" file="pack-box.mkiv" level="style" name="defineornament" variant="layer"> + <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="style" name="defineornament" variant="layer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27254,7 +28076,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background fonts colors" file="pack-box.mkiv" generated="yes" level="document" name="ornament" variant="example"> + <cd:command category="background" file="pack-box.mkiv" generated="yes" keywords="fonts colors" level="document" name="ornament" variant="example"> <cd:sequence> <cd:variable value="ornament"/> </cd:sequence> @@ -27330,14 +28152,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background colors" file="pack-rul.mkiv" level="system" name="overlaycolor"/> - <cd:command category="background colors" file="pack-rul.mkiv" level="system" name="overlaylinecolor"/> + <cd:command category="background colors" file="pack-rul.mkiv" keywords="background colors" level="system" name="overlaycolor"/> + <cd:command category="background colors" file="pack-rul.mkiv" keywords="background colors" level="system" name="overlaylinecolor"/> <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaywidth"/> <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlayheight"/> <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaydepth"/> <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlayoffset"/> <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaylinewidth"/> - <cd:command category="background conditional" file="pack-rul.mkiv" level="system" name="doifelseoverlay"> + <cd:command category="background" file="pack-rul.mkiv" keywords="conditional" level="system" name="doifelseoverlay"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27350,7 +28172,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background conditional" file="pack-rul.mkiv" level="system" name="doifoverlayelse"> + <cd:command category="background" file="pack-rul.mkiv" keywords="conditional" level="system" name="doifoverlayelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27365,7 +28187,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagebreak.xml"> - <cd:command file="page-brk.mkiv" level="style" name="definepagebreak"> + <cd:command category="structure" file="page-brk.mkiv" level="style" name="definepagebreak"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27396,10 +28218,11 @@ <cd:constant type="lastpage"/> <cd:constant type="start"/> <cd:constant type="stop"/> + <cd:constant type="xy"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="document" name="pagebreak"> + <cd:command category="structure" file="page-brk.mkiv" level="document" name="pagebreak"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="empty"/> @@ -27427,18 +28250,19 @@ <cd:constant type="lastpage"/> <cd:constant type="start"/> <cd:constant type="stop"/> + <cd:constant type="xy"/> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="document" name="page"> + <cd:command category="structure" file="page-brk.mkiv" level="document" name="page"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="pagebreak"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="style" name="definecolumnbreak"> + <cd:command category="structure" file="page-brk.mkiv" keywords="columns" level="style" name="definecolumnbreak"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27455,7 +28279,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="document" name="columnbreak"> + <cd:command category="structure" file="page-brk.mkiv" keywords="columns" level="document" name="columnbreak"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="yes"/> @@ -27470,14 +28294,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="document" name="column"> + <cd:command category="structure" file="page-brk.mkiv" keywords="columns" level="document" name="column"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="columnbreak"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="style" name="definepagechecker"> + <cd:command category="structure" file="page-brk.mkiv" level="style" name="definepagechecker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27490,7 +28314,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="style" name="setuppagechecker"> + <cd:command category="structure" file="page-brk.mkiv" level="style" name="setuppagechecker"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27520,7 +28344,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="document" name="checkpage"> + <cd:command category="structure" file="page-brk.mkiv" level="document" name="checkpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27530,7 +28354,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="document" name="testpage"> + <cd:command category="structure" file="page-brk.mkiv" level="document" name="testpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -27540,7 +28364,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="system" name="testpageonly"> + <cd:command category="structure" file="page-brk.mkiv" level="system" name="testpageonly"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -27550,7 +28374,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="system" name="testpagesync"> + <cd:command category="structure" file="page-brk.mkiv" level="system" name="testpagesync"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -27560,7 +28384,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" level="document" name="testcolumn"> + <cd:command category="structure" file="page-brk.mkiv" keywords="columns" level="document" name="testcolumn"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -27572,7 +28396,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagecolumns.xml"> - <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="definepagecolumns"> + <cd:command category="columns" file="page-pcl.mkiv" keywords="structure layout" level="style" name="definepagecolumns"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27585,7 +28409,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="setuppagecolumns"> + <cd:command category="columns" file="page-pcl.mkiv" keywords="structure layout" level="style" name="setuppagecolumns"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27626,21 +28450,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment" variant="name"> + <cd:command category="columns" file="page-pcl.mkiv" keywords="structure layout" 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:command category="columns" file="page-pcl.mkiv" keywords="structure layout" 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:command category="columns" file="page-pcl.mkiv" generated="yes" keywords="structure layout" level="document" name="pagecolumns" type="environment" variant="instance"> <cd:sequence> <cd:instance value="pagecolumns"/> </cd:sequence> @@ -27712,7 +28536,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagegrid.xml"> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnset"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="definecolumnset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27725,7 +28549,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnset"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnset"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27768,7 +28592,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="columnset" type="environment" variant="example"> + <cd:command category="columns" file="page-cst.mkiv" generated="yes" keywords="structure layout" level="document" name="columnset" type="environment" variant="example"> <cd:sequence> <cd:variable value="columnset"/> </cd:sequence> @@ -27778,7 +28602,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnset" type="environment"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="document" name="columnset" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -27788,7 +28612,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetspan"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="definecolumnsetspan"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27801,7 +28625,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetspan"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetspan"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27827,7 +28651,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnsetspan" type="environment"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="document" name="columnsetspan" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27859,14 +28683,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="columnsetspanwidth"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" 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="definecolumnsetarea"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="definecolumnsetarea"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27879,7 +28703,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetarea"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetarea"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27919,7 +28743,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetareatext"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetareatext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27929,7 +28753,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetlines"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetlines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27945,7 +28769,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetstart"> + <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetstart"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28097,14 +28921,14 @@ </cd:command> </cd:interface> <cd:interface file="i-pagenumber.xml"> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="setuprealpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="setuprealpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setupuserpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="setupuserpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="viewerprefix"> @@ -28121,14 +28945,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setupsubpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="setupsubpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="setuppagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="viewerprefix"> @@ -28145,10 +28969,10 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="resetuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="resetsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="resetpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumbering"> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="resetuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="resetsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="resetpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="setuppagenumbering"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -28190,6 +29014,7 @@ <cd:constant type="inmargin"/> <cd:constant type="atmargin"/> <cd:constant type="marginedge"/> + <cd:constant type="none"/> </cd:parameter> <cd:parameter name="style"> <cd:constant type="cd:style"/> @@ -28201,44 +29026,44 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstrealpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastrealpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevrealpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextrealpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstrealpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstuserpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstsubpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevrealpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevuserpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevsubpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextrealpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextuserpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextsubpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastrealpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastuserpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastsubpage"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="realpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="userpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="subpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="pagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prefixedpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="incrementpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="incrementsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="decrementpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="decrementsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="completepagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" level="style" name="placepagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="firstrealpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="firstuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="firstsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="lastrealpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="lastuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="lastsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="prevrealpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="prevuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="prevsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="nextrealpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="nextuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="nextsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="firstrealpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="firstuserpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="firstsubpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="prevrealpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="prevuserpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="prevsubpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="nextrealpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="nextuserpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="nextsubpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="lastrealpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="lastuserpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="lastsubpage"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="realpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="userpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="subpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="pagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="prefixedpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="incrementpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="incrementsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="decrementpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="decrementsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="completepagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="placepagenumber"/> </cd:interface> <cd:interface file="i-pageselection.xml"> - <cd:command file="page-sel.mkvi" level="document" name="insertpages"> + <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="insertpages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -28259,7 +29084,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" level="document" name="filterpages"> + <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="filterpages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -28283,7 +29108,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" level="document" name="copypages"> + <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="copypages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -28305,7 +29130,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" level="document" name="combinepages"> + <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="combinepages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -28372,7 +29197,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" level="document" name="slicepages"> + <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="slicepages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -28421,7 +29246,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pageshift.xml"> - <cd:command file="page-imp.mkiv" level="style" name="definepageshift"> + <cd:command category="layout" file="page-imp.mkiv" level="style" name="definepageshift"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28435,7 +29260,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" level="style" name="setuppageshift"> + <cd:command category="layout" file="page-imp.mkiv" level="style" name="setuppageshift"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="page"/> @@ -28451,8 +29276,18 @@ </cd:command> </cd:interface> <cd:interface file="i-pagestate.xml"> - <cd:command file="spac-pag.mkiv" level="system" name="signalrightpage"/> - <cd:command file="spac-pag.mkiv" level="system" name="doifelserightpage"> + <cd:command category="twopassdata" file="spac-pag.mkiv" level="system" name="signalrightpage"/> + <cd:command category="twopassdata" file="spac-pag.mkiv" keywords="conditional" level="system" name="doifelserightpage"> + <cd:arguments> + <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 category="twopassdata" file="spac-pag.mkiv" keywords="conditional" level="system" name="doifrightpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -28462,8 +29297,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-pag.mkiv" level="system" name="rightpageorder"/> - <cd:command file="core-dat.mkiv" level="system" name="definepagestate"> + <cd:command category="twopassdata" file="spac-pag.mkiv" level="system" name="rightpageorder"/> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="definepagestate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28476,7 +29311,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" level="system" name="setuppagestate"> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="setuppagestate"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28489,7 +29324,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" level="system" name="setpagestate"> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="setpagestate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28500,7 +29335,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" level="system" name="pagestaterealpage"> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="pagestaterealpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28511,7 +29346,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" level="system" name="setpagestaterealpageno"> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="setpagestaterealpageno"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28522,7 +29357,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" level="system" name="pagestaterealpageorder"> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="pagestaterealpageorder"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28533,21 +29368,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" level="system" name="autopagestaterealpage"> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="autopagestaterealpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" level="system" name="setautopagestaterealpageno"> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="setautopagestaterealpageno"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" level="system" name="autopagestaterealpageorder"> + <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="autopagestaterealpageorder"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28556,7 +29391,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagemarks.xml"> - <cd:command file="page-ini.mkiv" level="style" name="markpage"> + <cd:command category="structure" file="page-ini.mkiv" level="style" name="markpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28566,21 +29401,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-ini.mkiv" level="style" name="markedpages"> + <cd:command category="structure" 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:command category="structure" 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:command category="structure" file="page-ini.mkiv" keywords="conditional" level="style" name="doifelsemarkedpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28595,7 +29430,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pairedbox.xml"> - <cd:command file="pack-com.mkiv" level="style" name="definepairedbox"> + <cd:command category="tables" file="pack-com.mkiv" level="style" name="definepairedbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28608,7 +29443,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="style" name="setuppairedbox"> + <cd:command category="tables" file="pack-com.mkiv" level="style" name="setuppairedbox"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28666,7 +29501,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="document" name="placepairedbox"> + <cd:command category="tables" file="pack-com.mkiv" level="document" name="placepairedbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28680,7 +29515,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="document" name="placepairedbox" type="environment"> + <cd:command category="tables" file="pack-com.mkiv" level="document" name="placepairedbox" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28690,7 +29525,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" level="style" name="setuppairedbox" variant="instance"> + <cd:command category="tables" file="pack-com.mkiv" generated="yes" level="style" name="setuppairedbox" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="pairedbox"/> @@ -28704,7 +29539,7 @@ <cd:constant value="legend"/> </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" variant="instance"> + <cd:command category="tables" file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -28722,7 +29557,7 @@ <cd:constant value="legend"/> </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" type="environment" variant="instance"> + <cd:command category="tables" file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" type="environment" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -28736,13 +29571,13 @@ <cd:constant value="legend"/> </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" level="document" name="placeontopofeachother"> + <cd:command category="tables" file="pack-com.mkiv" level="document" name="placeontopofeachother"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="document" name="placesidebyside"> + <cd:command category="tables" file="pack-com.mkiv" level="document" name="placesidebyside"> <cd:arguments> <cd:content/> <cd:content/> @@ -29000,7 +29835,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraphnumber.xml"> - <cd:command category="structure counter" file="page-par.mkiv" level="style" name="setupparagraphnumbering"> + <cd:command category="structure" file="page-par.mkiv" keywords="counter" level="style" name="setupparagraphnumbering"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -29189,7 +30024,7 @@ <cd:command category="tables" file="tabl-mis.mkiv" level="document" name="paragraphscell" type="environment"/> </cd:interface> <cd:interface file="i-parallel.xml"> - <cd:command file="buff-par.mkvi" level="style" name="defineparallel"> + <cd:command category="columns" file="buff-par.mkvi" keywords="structure" level="style" name="defineparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -29199,7 +30034,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" level="style" name="setupparallel"> + <cd:command category="columns" file="buff-par.mkvi" keywords="structure" level="style" name="setupparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -29223,7 +30058,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" level="document" name="placeparallel"> + <cd:command category="columns" file="buff-par.mkvi" keywords="structure" level="document" name="placeparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -29236,7 +30071,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="conditional" file="buff-par.mkvi" level="style" name="doifelseparallel"> + <cd:command category="columns" file="buff-par.mkvi" keywords="structure conditional" level="style" name="doifelseparallel"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29253,7 +30088,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="buff-par.mkvi" level="style" name="doifparallelelse"> + <cd:command category="columns" file="buff-par.mkvi" keywords="structure conditional" level="style" name="doifparallelelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29270,7 +30105,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" level="style" name="resetparallel"> + <cd:command category="columns" file="buff-par.mkvi" keywords="structure" level="style" name="resetparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -29281,7 +30116,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" generated="yes" level="document" name="parallel" type="environment" variant="example"> + <cd:command category="columns" file="buff-par.mkvi" generated="yes" keywords="structure" level="document" name="parallel" type="environment" variant="example"> <cd:sequence> <cd:variable value="parallel"/> </cd:sequence> @@ -29316,6 +30151,82 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-parwrapper.xml"> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="freezeparagraphproperties"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="defrostparagraphproperties"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="updateparagraphproperties"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="updateparagraphpenalties"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="updateparagraphdemerits"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="updateparagraphshapes"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="setparagraphfreezing"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="forgetparagraphfreezing"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="registerparwrapper"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="registerparwrapperreverse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="directparwrapper"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="forgetparwrapper"/> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="unregisterparwrapper"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="doifelseparwrapper"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <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 category="whitespace" file="spac-par.mkxl" level="system" name="showparwrapperstate"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-par.lmt" level="system" name="getparwrapper"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-par.lmt" level="system" name="lastparwrapper"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-pdf.xml"> <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetcatalog"> <cd:arguments> @@ -29534,22 +30445,22 @@ <cd:command category="symbols" file="enco-ini.mkiv" level="document" name="unknown"/> </cd:interface> <cd:interface file="i-phantom.xml"> - <cd:command file="supp-box.mkiv" level="style" name="phantom"> + <cd:command category="strings" file="supp-box.mkiv" level="style" name="phantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="style" name="hphantom"> + <cd:command category="strings" file="supp-box.mkiv" level="style" name="hphantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="style" name="vphantom"> + <cd:command category="strings" file="supp-box.mkiv" level="style" name="vphantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="style" name="phantombox"> + <cd:command category="boxes" file="pack-box.mkiv" keywords="strings" level="style" name="phantombox"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -29565,6 +30476,53 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-placeholder.xml"> + <cd:command category="structure" file="typo-plc.mkiv" level="style" name="defineplaceholder"> + <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="setupplaceholder"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="typo-plc.mkiv" level="style" name="setupplaceholder"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </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="text"> + <cd:constant type="cd:text"/> + </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:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="typo-plc.mkiv" level="document" name="placeholder"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-placement.xml"> <cd:command category="layout" file="pack-mis.mkiv" level="style" name="defineplacement"> <cd:arguments> @@ -29640,7 +30598,7 @@ </cd:command> </cd:interface> <cd:interface file="i-position.xml"> - <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifpositionaction"> + <cd:command file="anch-pgr.mkiv" keywords="conditional" level="system" name="doifpositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29653,7 +30611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifelsepositionaction"> + <cd:command file="anch-pgr.mkiv" keywords="conditional" level="system" name="doifelsepositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29666,7 +30624,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifpositionactionelse"> + <cd:command file="anch-pgr.mkiv" keywords="conditional" level="system" name="doifpositionactionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29693,7 +30651,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPoverlayanchor"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPoverlayanchor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29717,7 +30675,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositiongraphic" type="environment"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPpositiongraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29727,7 +30685,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositiongraphic"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPpositiongraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29739,14 +30697,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositionmethod" type="environment"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPpositionmethod" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="setMPpositiongraphic"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="setMPpositiongraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29761,7 +30719,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="setMPpositiongraphicrange"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="setMPpositiongraphicrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29779,7 +30737,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetposboxes"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPgetposboxes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -29789,7 +30747,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetmultipars"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPgetmultipars"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -29799,7 +30757,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetmultishape"> + <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPgetmultishape"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30123,7 +31081,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifposition"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30136,7 +31094,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelseposition"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelseposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30149,7 +31107,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionelse"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30162,7 +31120,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositiononpage"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelsepositiononpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30178,7 +31136,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositiononpageelse"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositiononpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30234,7 +31192,7 @@ <cd:command file="anch-pos.mkiv" level="system" name="tracepositions"/> <cd:command file="anch-pos.mkiv" level="system" name="enableparpositions"/> <cd:command file="anch-pos.mkiv" level="system" name="disableparpositions"/> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelseoverlapping"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelseoverlapping"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30250,7 +31208,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifoverlappingelse"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifoverlappingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30266,7 +31224,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsonsamepage"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelsepositionsonsamepage"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -30279,7 +31237,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsonsamepageelse"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositionsonsamepageelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -30292,7 +31250,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsonthispage"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelsepositionsonthispage"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -30305,7 +31263,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsonthispageelse"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositionsonthispageelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -30318,7 +31276,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsused"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelsepositionsused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -30328,7 +31286,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsusedelse"> + <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositionsusedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -30510,7 +31468,7 @@ </cd:command> </cd:interface> <cd:interface file="i-processor.xml"> - <cd:command category="fonts colors" file="typo-prc.mkvi" level="style" name="defineprocessor"> + <cd:command category="fonts" file="typo-prc.mkvi" keywords="colors" level="style" name="defineprocessor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -30523,7 +31481,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="typo-prc.mkvi" level="style" name="setupprocessor"> + <cd:command category="fonts" file="typo-prc.mkvi" keywords="colors" level="style" name="setupprocessor"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -30552,7 +31510,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts colors" file="typo-prc.mkvi" level="system" name="applyprocessor"> + <cd:command category="fonts" file="typo-prc.mkvi" keywords="colors" level="system" name="applyprocessor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32815,7 +33773,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelse"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -32858,7 +33816,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoif"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoif"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -32898,7 +33856,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifnot"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifnot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -32945,7 +33903,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsesameaspreviouschecked"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelsesameaspreviouschecked"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -32992,7 +33950,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsesameasprevious"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelsesameasprevious"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -33035,7 +33993,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsecombiinlist"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelsecombiinlist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -33051,7 +34009,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifsameaspreviouscheckedelse"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifsameaspreviouscheckedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -33098,7 +34056,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifsameaspreviouselse"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifsameaspreviouselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -33141,7 +34099,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifcombiinlistelse"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifcombiinlistelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -33164,7 +34122,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelseuservariable"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelseuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -33177,7 +34135,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifuservariableelse"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifuservariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -33256,7 +34214,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxsingularplural"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxsingularplural"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -33271,7 +34229,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxsingularorplural"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxsingularorplural"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -33286,7 +34244,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxoneorrange"> + <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxoneorrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -33537,7 +34495,7 @@ </cd:command> </cd:interface> <cd:interface file="i-random.xml"> - <cd:command file="supp-ran.mkiv" level="system" name="getrandomcount"> + <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomcount"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -33548,7 +34506,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" level="system" name="getrandomdimen"> + <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomdimen"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -33559,7 +34517,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" level="system" name="getrandomnumber"> + <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomnumber"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -33570,7 +34528,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" level="system" name="getrandomfloat"> + <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomfloat"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -33581,21 +34539,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" level="system" name="setrandomseed"> + <cd:command category="counter" file="supp-ran.mkiv" level="system" name="setrandomseed"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" level="system" name="getrandomseed"> + <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomseed"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="supp-ran.mkiv" level="system" name="randomseed" type="environment"/> - <cd:command file="supp-ran.mkiv" level="system" name="reuserandomseed"/> - <cd:command file="supp-ran.mkiv" level="system" name="randomnumber"> + <cd:command begin="push" category="counter" end="pop" file="supp-ran.mkiv" level="system" name="randomseed" type="environment"/> + <cd:command category="counter" file="supp-ran.mkiv" level="system" name="reuserandomseed"/> + <cd:command category="counter" file="supp-ran.mkiv" level="system" name="randomnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -33605,7 +34563,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" level="system" name="mprandomnumber"/> + <cd:command category="counter" file="supp-ran.mkiv" keywords="metapost" level="system" name="mprandomnumber"/> </cd:interface> <cd:interface file="i-references.xml"> <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferencing"> @@ -33655,6 +34613,33 @@ <cd:constant type="-"/> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="labelalternative"> + <cd:constant type="inleftmargin"/> + <cd:constant type="inrightmargin"/> + <cd:constant type="inoutermargin"/> + <cd:constant type="ininnermargin"/> + <cd:constant type="inleftedge"/> + <cd:constant type="inrightedge"/> + <cd:constant type="inouteredge"/> + <cd:constant type="ininneredge"/> + <cd:constant type="atleftmargin"/> + <cd:constant type="atrightmargin"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inouter"/> + <cd:constant type="ininner"/> + <cd:constant type="inmargin"/> + <cd:constant type="inother"/> + <cd:constant type="margintext"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="labelstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="labelcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -33765,7 +34750,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelsereferencefound"> + <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifelsereferencefound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -33778,7 +34763,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifreferencefoundelse"> + <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifreferencefoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -33942,7 +34927,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="system" name="docheckedpagestate"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifcheckedpagestate"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -34157,7 +35142,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelseurldefined"> + <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifelseurldefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34170,7 +35155,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifurldefinedelse"> + <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifurldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34183,7 +35168,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelsefiledefined"> + <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifelsefiledefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34196,7 +35181,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doiffiledefinedelse"> + <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doiffiledefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34357,6 +35342,13 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencepagestate"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencepagedetail"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencerealpage"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencecolumnnumber"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="tracedpagestate"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="markreferencepage"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencesymbol"/> </cd:interface> <cd:interface file="i-regime.xml"> <cd:command category="language" file="regi-ini.mkiv" level="system" name="currentregime"/> @@ -36006,7 +36998,7 @@ <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords> + <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords> @@ -36014,17 +37006,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-rep.mkiv" level="style" name="setreplacement"> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="setreplacements"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> <cd:constant type="cd:name"/> </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-rep.mkiv" level="style" name="resetreplacement"/> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="resetreplacements"/> </cd:interface> - <cd:interface file="i-rotatation.xml"> + <cd:interface file="i-rotation.xml"> <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="mirror"> <cd:arguments> <cd:content/> @@ -36072,7 +37067,7 @@ </cd:command> </cd:interface> <cd:interface file="i-ruby.xml"> - <cd:command category="fonts" file="typo-rub.mkiv" level="style" name="defineruby"> + <cd:command category="language" file="typo-rub.mkiv" keywords="fonts" level="style" name="defineruby"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -36085,7 +37080,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="typo-rub.mkiv" level="style" name="setupruby"> + <cd:command category="language" file="typo-rub.mkiv" keywords="fonts" level="style" name="setupruby"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -36133,7 +37128,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="typo-rub.mkiv" level="document" name="ruby"> + <cd:command category="language" file="typo-rub.mkiv" keywords="fonts" level="document" name="ruby"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -36146,7 +37141,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="typo-rub.mkiv" level="document" name="ruby" type="environment"> + <cd:command category="language" file="typo-rub.mkiv" keywords="fonts" level="document" name="ruby" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -36308,6 +37303,7 @@ <cd:constant type="nihongo"/> <cd:constant type="ethiopic"/> <cd:constant type="thai"/> + <cd:constant type="tibetan"/> <cd:constant type="test"/> </cd:parameter> <cd:parameter name="preset"> @@ -36369,7 +37365,7 @@ </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:command category="language" file="scrp-ini.mkvi" level="document" name="script" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -36377,6 +37373,7 @@ <cd:constant type="nihongo"/> <cd:constant type="ethiopic"/> <cd:constant type="thai"/> + <cd:constant type="tibetan"/> <cd:constant type="test"/> <cd:constant type="cd:name"/> </cd:keywords> @@ -36807,6 +37804,9 @@ <cd:parameter name="ownnumber"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="placeholder"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> </cd:arguments> <cd:instances> @@ -36849,6 +37849,9 @@ <cd:parameter name="ownnumber"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="placeholder"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:key"> @@ -36896,6 +37899,9 @@ <cd:parameter name="ownnumber"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="placeholder"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:key"> @@ -37097,6 +38103,9 @@ <cd:parameter name="ownnumber"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="placeholder"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:key"> @@ -37129,6 +38138,9 @@ <cd:parameter name="ownnumber"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="placeholder"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:key"> @@ -37283,7 +38295,7 @@ </cd:command> </cd:interface> <cd:interface file="i-selector.xml"> - <cd:command file="core-env.mkiv" level="style" name="defineselector"> + <cd:command category="strings" file="core-env.mkiv" level="style" name="defineselector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -37293,7 +38305,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="setupselector"> + <cd:command category="strings" file="core-env.mkiv" level="style" name="setupselector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -37302,13 +38314,13 @@ <cd:parameter name="n"> <cd:constant type="cd:number"/> </cd:parameter> - <cd:parameter name="m"> + <cd:parameter name="max"> <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="document" name="select"> + <cd:command category="strings" file="core-env.mkiv" level="document" name="select"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -37320,7 +38332,7 @@ <cd:content optional="yes"/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="directselect"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="directselect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -37334,77 +38346,77 @@ </cd:command> </cd:interface> <cd:interface file="i-setups.xml"> - <cd:command file="core-env.mkiv" level="style" name="setups"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="setups"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="setups" variant="direct"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="setups" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="setup"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="setup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="setup" variant="direct"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="setup" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="directsetup"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="directsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="fastsetup"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="fastsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="texsetup"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="texsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="lua" file="core-env.mkiv" level="style" name="luasetup"> + <cd:command category="structure" file="core-env.mkiv" keywords="lua" level="style" name="luasetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="systemsetups"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="systemsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="resetsetups"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="resetsetups"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="copysetups"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="copysetups"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -37414,14 +38426,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="showsetupsdefinition"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="showsetupsdefinition"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setupwithargument"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="setupwithargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -37429,7 +38441,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="fastsetupwithargument"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="fastsetupwithargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -37437,7 +38449,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setupwithargumentswapped"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="setupwithargumentswapped"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -37445,7 +38457,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="fastsetupwithargumentswapped"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="fastsetupwithargumentswapped"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -37453,26 +38465,26 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="usesetupsparameter"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="usesetupsparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="autosetups"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="autosetups"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doprocesslocalsetups"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="doprocesslocalsetups"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelsesetups"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="system" name="doifelsesetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -37485,7 +38497,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifsetupselse"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="system" name="doifsetupselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -37498,7 +38510,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifsetups"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="system" name="doifsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -37508,7 +38520,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotsetups"> + <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="system" name="doifnotsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -37518,7 +38530,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="lua" file="core-env.mkiv" level="system" name="luasetups" type="environment"> + <cd:command category="structure" file="core-env.mkiv" keywords="lua" level="system" name="luasetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -37528,14 +38540,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="lua" file="core-env.mkiv" level="system" name="luasetups" type="environment" variant="string"> + <cd:command category="structure" file="core-env.mkiv" keywords="lua" level="system" name="luasetups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="core-env.mkiv" level="style" name="xmlsetups" type="environment"> + <cd:command category="structure" file="core-env.mkiv" keywords="xml" level="style" name="xmlsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -37545,14 +38557,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="core-env.mkiv" level="style" name="xmlsetups" type="environment" variant="string"> + <cd:command category="structure" file="core-env.mkiv" keywords="xml" level="style" name="xmlsetups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="rawsetups" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="rawsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -37562,14 +38574,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="rawsetups" type="environment" variant="string"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="rawsetups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="localsetups" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="localsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -37579,14 +38591,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="localsetups" type="environment" variant="string"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="localsetups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="setups" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="setups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -37596,7 +38608,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="setups" type="environment" variant="string"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="setups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -37774,7 +38786,7 @@ </cd:command> </cd:interface> <cd:interface file="i-simplecolumns.xml"> - <cd:command category="structure layout" file="page-smp.mkiv" level="system" name="setsimplecolumnshsize"> + <cd:command category="columns" file="page-smp.mkiv" keywords="structure layout" level="system" name="setsimplecolumnshsize"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -37792,16 +38804,27 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure layout" file="page-smp.mkiv" level="system" name="simplecolumns" type="environment"> + <cd:command category="columns" file="page-smp.mkiv" keywords="structure layout" level="system" name="simplecolumns" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setsimplecolumnshsize"/> + <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:interface> <cd:interface file="i-smash.xml"> - <cd:command file="supp-box.mkiv" level="system" name="smashbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="smashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -37809,7 +38832,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="smashboxed"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="smashboxed"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -37817,7 +38840,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="hsmashbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hsmashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -37825,7 +38848,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="vsmashbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vsmashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -37833,27 +38856,27 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="hsmash"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hsmash"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="vsmash"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vsmash"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="hsmashed"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hsmashed"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="vsmashed"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vsmashed"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="smashedhbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="smashedhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -37861,7 +38884,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="smashedvbox"> + <cd:command category="boxes" file="supp-box.mkiv" level="system" name="smashedvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -37869,7 +38892,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="document" name="smash"> + <cd:command category="boxes" file="supp-box.mkiv" level="document" name="smash"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="w"/> @@ -37982,6 +39005,12 @@ <cd:parameter name="synonymcolor"> <cd:constant type="cd:color"/> </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:assignments> </cd:arguments> </cd:command> @@ -38042,7 +39071,7 @@ <cd:constant value="logos"/> </cd:instances> </cd:command> - <cd:command category="language conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsortingused"> + <cd:command category="language" file="strc-syn.mkiv" keywords="conditional" level="system" name="doifelsecurrentsortingused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -38124,7 +39153,7 @@ <cd:assignments list="yes"> <cd:parameter name="state"> <cd:constant type="start"/> - <cd:constant defult="yes" type="stop"/> + <cd:constant default="yes" type="stop"/> </cd:parameter> <cd:parameter name="method"> <cd:constant type="1"/> @@ -38218,8 +39247,8 @@ </cd:command> </cd:interface> <cd:interface file="i-stream.xml"> - <cd:command file="page-str.mkiv" level="system" name="currentoutputstream"/> - <cd:command file="page-str.mkiv" level="system" name="ifinoutputstream"> + <cd:command category="structure" file="page-str.mkiv" level="system" name="currentoutputstream"/> + <cd:command category="structure" file="page-str.mkiv" keywords="conditional" level="system" name="ifinoutputstream"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -38231,64 +39260,64 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="enableoutputstream"> + <cd:command category="structure" file="page-str.mkiv" level="system" name="enableoutputstream"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="disableoutputstream"/> - <cd:command file="page-str.mkiv" level="system" name="outputstream" type="environment"> + <cd:command category="structure" file="page-str.mkiv" level="system" name="disableoutputstream"/> + <cd:command category="structure" file="page-str.mkiv" level="system" name="outputstream" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="flushoutputstream"> + <cd:command category="structure" file="page-str.mkiv" level="system" name="flushoutputstream"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="outputstreambox"> + <cd:command category="structure" file="page-str.mkiv" keywords="boxes" level="system" name="outputstreambox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="outputstreamcopy"> + <cd:command category="structure" file="page-str.mkiv" keywords="boxes" level="system" name="outputstreamcopy"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="outputstreamunvbox"> + <cd:command category="structure" file="page-str.mkiv" keywords="boxes" level="system" name="outputstreamunvbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="outputstreamunvcopy"> + <cd:command category="structure" file="page-str.mkiv" keywords="boxes" level="system" name="outputstreamunvcopy"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="synchronizeoutputstreams"> + <cd:command category="structure" file="page-str.mkiv" level="system" name="synchronizeoutputstreams"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" level="system" name="pushoutputstream"> + <cd:command category="structure" file="page-str.mkiv" level="system" name="pushoutputstream"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -38297,70 +39326,70 @@ </cd:command> </cd:interface> <cd:interface file="i-string.xml"> - <cd:command file="blob-ini.mkiv" level="system" name="wdofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="wdofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="htofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="htofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="dpofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="dpofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="hdofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="hdofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="htdpofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="htdpofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="widthofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="widthofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="heightofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="heightofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="depthofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="depthofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="heightanddepthofstring"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="heightanddepthofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" level="system" name="setwidthof"> + <cd:command category="strings" file="blob-ini.mkiv" level="system" name="setwidthof"> <cd:arguments> <cd:text/> <cd:delimiter name="to"/> @@ -38369,12 +39398,12 @@ </cd:command> </cd:interface> <cd:interface file="i-strut.xml"> - <cd:command file="supp-box.mkiv" level="system" name="strutdp"/> - <cd:command file="supp-box.mkiv" level="system" name="strutht"/> - <cd:command file="supp-box.mkiv" level="system" name="strutwd"/> - <cd:command file="supp-box.mkiv" level="system" name="struthtdp"/> - <cd:command file="supp-box.mkiv" level="system" name="strutgap"/> - <cd:command file="spac-ver.mkiv" level="style" name="setupstruts"> + <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="strutdp"/> + <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="strutht"/> + <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="strutwd"/> + <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="struthtdp"/> + <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="strutgap"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="style" name="setupstrut"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="yes"/> @@ -38388,7 +39417,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="synchronizestrut"> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="synchronizestrut"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -38402,27 +39431,27 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="strut"/> - <cd:command file="spac-ver.mkiv" level="system" name="halfstrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="quarterstrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="halflinestrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="noheightstrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="depthstrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="setstrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="setcharstrut"> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="style" name="strut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="halfstrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="quarterstrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="halflinestrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="noheightstrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="depthstrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setstrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setcharstrut"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="setfontstrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="settightstrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="setcapstrut"/> - <cd:command file="spac-ver.mkiv" level="system" name="setnostrut"/> - <cd:command file="spac-ver.mkiv" level="document" name="showstruts"/> - <cd:command file="spac-ver.mkiv" level="document" name="showcolorstruts"/> - <cd:command begin="beg" end="end" file="spac-ver.mkiv" level="system" name="strut" type="environment"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setfontstrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="settightstrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setcapstrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setnostrut"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="document" name="showstruts"/> + <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="document" name="showcolorstruts"/> + <cd:command begin="beg" category="fonts" end="end" file="spac-ver.mkiv" keywords="whitespace" level="system" name="strut" type="environment"/> </cd:interface> <cd:interface file="i-symbol.xml"> <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="definesymbol"> @@ -38438,7 +39467,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelseinsymbolset"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifelseinsymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38454,7 +39483,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifinsymbolsetelse"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifinsymbolsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38470,7 +39499,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifinsymbolset"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifinsymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38486,7 +39515,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelsesymbolset"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifelsesymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38499,7 +39528,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifsymbolsetelse"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifsymbolsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38539,7 +39568,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols graphics" file="symb-ini.mkiv" level="style" name="definefiguresymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="graphics" level="style" name="definefiguresymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -38553,7 +39582,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="symbols graphics" file="symb-ini.mkiv" level="document" name="figuresymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="graphics" level="document" name="figuresymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -38564,7 +39593,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelsesymboldefined"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifelsesymboldefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38577,7 +39606,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifsymboldefinedelse"> + <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifsymboldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38775,6 +39804,25 @@ <cd:parameter name="synonymcolor"> <cd:constant type="cd:color"/> </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="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="hyphens"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -38851,7 +39899,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymused"> + <cd:command category="symbols" file="strc-syn.mkiv" keywords="conditional" level="system" name="doifelsecurrentsynonymused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -38861,7 +39909,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymshown"> + <cd:command category="symbols" file="strc-syn.mkiv" keywords="conditional" level="system" name="doifelsecurrentsynonymshown"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -38914,31 +39962,31 @@ </cd:command> </cd:interface> <cd:interface file="i-system.xml"> - <cd:command file="syst-aux.mkiv" level="system" name="expanded"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="expanded"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="expanded" type="environment"/> - <cd:command file="syst-aux.mkiv" level="system" name="gobbleoneargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="expanded" type="environment"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleoneargument"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbletwoarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbletwoarguments"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblethreearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblethreearguments"> <cd:arguments> <cd:content/> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblefourarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblefourarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -38946,7 +39994,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblefivearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblefivearguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -38955,7 +40003,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblesixarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblesixarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -38965,7 +40013,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblesevenarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblesevenarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -38976,7 +40024,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbleeightarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleeightarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -38988,7 +40036,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbleninearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleninearguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -39001,7 +40049,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbletenarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbletenarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -39015,14 +40063,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbleoneoptional"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleoneoptional"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbletwooptionals"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbletwooptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -39032,7 +40080,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblethreeoptionals"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblethreeoptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -39045,7 +40093,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblefouroptionals"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblefouroptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -39061,7 +40109,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblefiveoptionals"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblefiveoptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -39080,8 +40128,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="donothing"/> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextchar"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="donothing"/> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -39094,7 +40142,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnextcharelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -39107,7 +40155,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextoptional"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextoptional"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39117,7 +40165,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnextoptionalelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextoptionalelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39127,19 +40175,19 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextoptionalcs"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextoptionalcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnextoptionalcselse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextoptionalcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextbgroup"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextbgroup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39149,7 +40197,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnextbgroupelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextbgroupelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39159,19 +40207,19 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextbgroupcs"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextbgroupcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnextbgroupcselse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextbgroupcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextparenthesis"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextparenthesis"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39181,7 +40229,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnextparenthesiselse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextparenthesiselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39191,7 +40239,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsefastoptionalcheck"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsefastoptionalcheck"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39201,7 +40249,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doiffastoptionalcheckelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doiffastoptionalcheckelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39211,25 +40259,25 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsefastoptionalcheckcs"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsefastoptionalcheckcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doiffastoptionalcheckcselse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doiffastoptionalcheckcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="assumelongusagecs"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="assumelongusagecs"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39237,7 +40285,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setgvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39245,7 +40293,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setevalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39253,7 +40301,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setxvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setxvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39261,14 +40309,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39276,7 +40324,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letgvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39284,28 +40332,28 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="resetvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="resetvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="undefinevalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="undefinevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ignorevalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="ignorevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setuvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setuvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39313,7 +40361,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setuevalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setuevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39321,7 +40369,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setugvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setugvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39329,7 +40377,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setuxvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setuxvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39337,14 +40385,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getuvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getuvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseundefined"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39357,7 +40405,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifundefinedelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifundefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39370,7 +40418,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsedefined"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsedefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39383,7 +40431,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifdefinedelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifdefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39396,7 +40444,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifundefined"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39406,7 +40454,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifdefined"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39416,28 +40464,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letbeundefined"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letbeundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="localundefine"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="localundefine"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="globalundefine"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalundefine"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsealldefined"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsealldefined"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -39450,7 +40498,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifalldefinedelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifalldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -39463,7 +40511,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doif"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doif"> <cd:arguments> <cd:content/> <cd:content/> @@ -39472,7 +40520,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnot"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnot"> <cd:arguments> <cd:content/> <cd:content/> @@ -39481,7 +40529,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelse"> <cd:arguments> <cd:content/> <cd:content/> @@ -39493,7 +40541,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseempty"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -39504,7 +40552,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifemptyelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifemptyelse"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -39515,7 +40563,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifempty"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -39523,7 +40571,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotempty"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -39531,7 +40579,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseinset"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseinset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39547,7 +40595,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifinsetelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifinsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39563,7 +40611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifinset"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifinset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39576,7 +40624,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotinset"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotinset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39589,7 +40637,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsecommon"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsecommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -39605,7 +40653,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifcommonelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifcommonelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -39621,7 +40669,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifcommon"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -39634,7 +40682,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotcommon"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -39647,7 +40695,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processcommalist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -39655,9 +40703,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="quitcommalist"/> - <cd:command file="syst-aux.mkiv" level="system" name="quitprevcommalist"/> - <cd:command file="syst-aux.mkiv" level="system" name="processcommacommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="quitcommalist"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="quitprevcommalist"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommacommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -39665,7 +40713,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processcommalistwithparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommalistwithparameters"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -39673,22 +40721,22 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processcommalist" type="environment"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommalist" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processcommacommand" type="environment"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommacommand" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="currentcommalistitem"/> - <cd:command file="syst-aux.mkiv" level="system" name="processaction"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentcommalistitem"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processaction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -39696,7 +40744,7 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processfirstactioninset"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processfirstactioninset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -39704,7 +40752,7 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processallactionsinset"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processallactionsinset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -39713,16 +40761,16 @@ </cd:arguments> </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="commalistelement"/> - <cd:command file="syst-aux.mkiv" level="system" name="firstcharacter"/> - <cd:command file="syst-aux.mkiv" level="system" name="remainingcharacters"/> - <cd:command file="syst-aux.mkiv" level="system" name="getfirstcharacter"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="firstcharacter"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="remainingcharacters"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="getfirstcharacter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsefirstchar"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsefirstchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39738,7 +40786,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doiffirstcharelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doiffirstcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39754,21 +40802,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="thefirstcharacter"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="thefirstcharacter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="theremainingcharacters"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="theremainingcharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseinstring"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39784,7 +40832,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifinstringelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifinstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39800,7 +40848,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifinstring"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39813,7 +40861,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotinstring"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39826,7 +40874,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseincsname"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseincsname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39842,7 +40890,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifincsnameelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifincsnameelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39858,7 +40906,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenumber"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39871,7 +40919,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnumberelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39884,7 +40932,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnumber"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39894,7 +40942,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotnumber"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39904,7 +40952,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="percentdimen"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="percentdimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39916,7 +40964,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setpercentdimen"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setpercentdimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39928,7 +40976,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="makerawcommalist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="makerawcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -39936,7 +40984,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="rawprocesscommalist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="rawprocesscommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -39944,7 +40992,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="rawprocesscommacommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="rawprocesscommacommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -39952,7 +41000,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="rawdoifelseinset"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="rawdoifelseinset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39968,7 +41016,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="rawdoifinsetelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="rawdoifinsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39984,7 +41032,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="rawdoifinset"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="rawdoifinset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39997,7 +41045,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="rawprocessaction"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="rawprocessaction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -40005,8 +41053,8 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="currentvalue"/> - <cd:command file="syst-aux.mkiv" level="system" name="getparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentvalue"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40018,7 +41066,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="geteparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="geteparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40030,7 +41078,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getgparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getgparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40042,7 +41090,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getxparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getxparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40054,7 +41102,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="forgetparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="forgetparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40066,7 +41114,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getexpandedparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getexpandedparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40078,7 +41126,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doassign"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40090,7 +41138,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doeassign"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doeassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40102,7 +41150,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="undoassign"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="undoassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40114,7 +41162,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doassignempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doassignempty"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40126,7 +41174,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processassignmentlist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignmentlist"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -40136,7 +41184,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processassignmentcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignmentcommand"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -40146,7 +41194,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processassignmentlist" type="environment"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignmentlist" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -40155,7 +41203,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processassignmentcommand" type="environment"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignmentcommand" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -40164,9 +41212,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="currentassignmentlistkey"/> - <cd:command file="syst-aux.mkiv" level="system" name="currentassignmentlistvalue"/> - <cd:command file="syst-aux.mkiv" level="system" name="getemptyparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentassignmentlistkey"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentassignmentlistvalue"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getemptyparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40178,7 +41226,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="copyparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="copyparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40191,14 +41239,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="checkparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="checkparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ifparameters"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="ifparameters"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -40210,22 +41258,22 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="commalistsize"/> - <cd:command file="syst-aux.mkiv" level="system" name="getcommalistsize"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="commalistsize"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getcommalistsize"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getcommacommandsize"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getcommacommandsize"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getfromcommalist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getfromcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -40235,7 +41283,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getfromcommacommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getfromcommacommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -40245,14 +41293,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstinlist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstinlist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dogetcommacommandelement"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dogetcommacommandelement"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:number"/> @@ -40265,7 +41313,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dosingleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosingleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -40273,7 +41321,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dodoubleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoubleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -40284,7 +41332,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dotripleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotripleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -40298,7 +41346,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doquadrupleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquadrupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -40315,7 +41363,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doquintupleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquintupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -40335,7 +41383,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dosixtupleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosixtupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -40358,7 +41406,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doseventupleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doseventupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -40384,7 +41432,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dosingleargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosingleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -40392,7 +41440,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dodoubleargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoubleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -40403,7 +41451,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dotripleargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotripleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -40417,7 +41465,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doquadrupleargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquadrupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -40434,7 +41482,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doquintupleargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquintupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -40454,7 +41502,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dosixtupleargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosixtupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -40477,7 +41525,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doseventupleargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doseventupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -40503,24 +41551,24 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="strippedcsname"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="strippedcsname"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="strippedcsname" variant="string"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="strippedcsname" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="complexorsimple"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="complexorsimple"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="complexorsimple" variant="argument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="complexorsimple" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40528,12 +41576,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="complexorsimpleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="complexorsimpleempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="complexorsimpleempty" variant="argument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="complexorsimpleempty" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40541,12 +41589,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimple"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="definecomplexorsimple"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimple" variant="argument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="definecomplexorsimple" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40554,12 +41602,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty" variant="argument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40567,9 +41615,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="permitspacesbetweengroups"/> - <cd:command file="syst-aux.mkiv" level="system" name="dontpermitspacesbetweengroups"/> - <cd:command file="syst-aux.mkiv" level="system" name="dosinglegroupempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="permitspacesbetweengroups"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dontpermitspacesbetweengroups"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosinglegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -40577,7 +41625,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dodoublegroupempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoublegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -40588,7 +41636,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dotriplegroupempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotriplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -40602,7 +41650,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doquadruplegroupempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquadruplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -40619,7 +41667,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doquintuplegroupempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquintuplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -40639,14 +41687,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstofoneargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofoneargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstoftwoarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstoftwoarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40656,7 +41704,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="secondoftwoarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondoftwoarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40666,7 +41714,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstofthreearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40679,7 +41727,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="secondofthreearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40692,7 +41740,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="thirdofthreearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40705,7 +41753,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstoffourarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40721,7 +41769,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="secondoffourarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40737,7 +41785,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="thirdoffourarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40753,7 +41801,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="fourthoffourarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="fourthoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40769,7 +41817,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstoffivearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40788,7 +41836,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="secondoffivearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40807,7 +41855,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="thirdoffivearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40826,7 +41874,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="fourthoffivearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="fourthoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40845,7 +41893,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="fifthoffivearguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="fifthoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40864,7 +41912,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstofsixarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40886,7 +41934,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="secondofsixarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40908,7 +41956,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="thirdofsixarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40930,7 +41978,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="fourthofsixarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="fourthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40952,7 +42000,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="fifthofsixarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="fifthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40974,7 +42022,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="sixthofsixarguments"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="sixthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40996,14 +42044,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstofoneunexpanded"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofoneunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstoftwounexpanded"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstoftwounexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41013,7 +42061,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="secondoftwounexpanded"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondoftwounexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41023,7 +42071,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="firstofthreeunexpanded"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41036,7 +42084,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="secondofthreeunexpanded"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41049,7 +42097,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="thirdofthreeunexpanded"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41062,52 +42110,52 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="globalletempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalletempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letvalueempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letvalueempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letgvalueempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letgvalueempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letvaluerelax"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letvaluerelax"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letgvalurelax"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letgvalurelax"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="relaxvalueifundefined"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="relaxvalueifundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="rawgetparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="rawgetparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -41119,7 +42167,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="texdefinition" type="environment"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="texdefinition" type="environment"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="spaces"/> @@ -41156,35 +42204,34 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="texdefinition"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="texdefinition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="texcode" type="environment"/> - <cd:command file="syst-aux.mkiv" level="system" name="newcounter"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="newcounter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="fastincrement"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="fastincrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="fastdecrement"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="fastdecrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="increment"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="increment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="increment" variant="argument"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="increment" variant="argument"> <cd:arguments> <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> @@ -41192,12 +42239,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="decrement"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="decrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="decrement" variant="argument"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="decrement" variant="argument"> <cd:arguments> <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> @@ -41205,46 +42252,39 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="incrementvalue"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="incrementvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="decrementvalue"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="decrementvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="newsignal"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="newsignal"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="checkedstrippedcsname"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="checkedstrippedcsname"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="checkedstrippedcsname" variant="string"> - <cd:arguments> - <cd:keywords delimiters="none"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="savenormalmeaning"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="savenormalmeaning"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="recursedepth"/> - <cd:command file="syst-aux.mkiv" level="system" name="recurselevel"/> - <cd:command file="syst-aux.mkiv" level="system" name="resetrecurselevel"/> - <cd:command file="syst-aux.mkiv" level="system" name="dostepwiserecurse"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="recursedepth"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="recurselevel"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="resetrecurselevel"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dostepwiserecurse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -41260,7 +42300,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dorecurse"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dorecurse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -41270,7 +42310,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doexpandedrecurse"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doexpandedrecurse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -41280,7 +42320,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dowith"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dowith"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:command"/> @@ -41290,16 +42330,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doloop"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doloop"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="exitloop"/> - <cd:command file="syst-aux.mkiv" level="system" name="exitloopnow"/> - <cd:command file="syst-aux.mkiv" level="system" name="dofastloopcs"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="exitloop"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="exitloopnow"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dofastloopcs"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -41307,9 +42347,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="fastloopindex"/> - <cd:command file="syst-aux.mkiv" level="system" name="fastloopfinal"/> - <cd:command file="syst-aux.mkiv" level="system" name="doloopoverlist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="fastloopindex"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="fastloopfinal"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="doloopoverlist"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -41319,29 +42359,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="recursestring"/> - <cd:command file="syst-aux.mkiv" level="system" name="newevery"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="recursestring"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="newevery"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="EveryPar"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="EveryPar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="EveryLine"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="EveryLine"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="forgeteverypar"/> - <cd:command file="syst-aux.mkiv" level="system" name="convertvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="forgeteverypar"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="convertvalue"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -41350,7 +42390,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="defconvertedvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="defconvertedvalue"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -41358,7 +42398,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseassignment"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseassignment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41371,7 +42411,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifassignmentelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifassignmentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41384,14 +42424,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="docheckassignment"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="docheckassignment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ifassignment"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="ifassignment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -41403,7 +42443,21 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseassignmentcs"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="validassignment"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="nonvalidassignment"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseassignmentcs"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41412,7 +42466,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifassignmentelsecs"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifassignmentelsecs"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41421,7 +42475,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="convertargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="convertargument"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41430,14 +42484,14 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="convertcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="convertcommand"> <cd:arguments> <cd:csname/> <cd:delimiter name="to"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="defconvertedargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="defconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -41445,13 +42499,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="defconvertedcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="defconvertedcommand"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="edefconvertedargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="edefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -41459,7 +42513,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gdefconvertedargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gdefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -41467,13 +42521,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gdefconvertedcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gdefconvertedcommand"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="xdefconvertedargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="xdefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -41481,14 +42535,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="showvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="showvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsemeaning"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsemeaning"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -41500,7 +42554,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifmeaningelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifmeaningelse"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -41512,7 +42566,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsesamestring"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsesamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41528,7 +42582,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifsamestringelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsamestringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41544,7 +42598,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifsamestring"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41557,7 +42611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotsamestring"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotsamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41570,7 +42624,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ConvertToConstant"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="ConvertToConstant"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -41581,7 +42635,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ConvertConstantAfter"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="ConvertConstantAfter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -41592,7 +42646,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="assignifempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="assignifempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -41600,7 +42654,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="grabuntil"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="grabuntil"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41608,7 +42662,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processbetween"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processbetween"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41616,12 +42670,12 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbleuntil"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleuntil"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbleuntilrelax"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleuntilrelax"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:content"/> @@ -41629,12 +42683,12 @@ <cd:delimiter name="relax"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processuntil"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processuntil"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="groupedcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="groupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -41644,7 +42698,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="simplegroupedcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="simplegroupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -41654,7 +42708,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="pickupgroupedcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="pickupgroupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -41667,33 +42721,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="BeforePar"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="BeforePar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="AfterPar"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="AfterPar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="GetPar"/> - <cd:command file="syst-aux.mkiv" level="system" name="GotoPar"/> - <cd:command file="syst-aux.mkiv" level="system" name="dowithpargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="GetPar"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="GotoPar"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dowithpargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dowithwargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dowithwargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dorepeatwithcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dorepeatwithcommand"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -41702,7 +42756,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsestringinstring"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsestringinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41718,7 +42772,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifstringinstringelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifstringinstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41734,7 +42788,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="appendtoks"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="appendtoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -41743,7 +42797,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="prependtoks"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="prependtoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -41752,7 +42806,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="appendtoksonce"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="appendtoksonce"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -41761,7 +42815,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="prependtoksonce"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="prependtoksonce"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -41770,7 +42824,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseintoks"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseintoks"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -41786,7 +42840,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifintokselse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifintokselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -41802,20 +42856,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="collecting" type="environment"/> - <cd:command file="syst-aux.mkiv" level="system" name="collect" type="environment"/> - <cd:command file="syst-aux.mkiv" level="system" name="expandedcollect" type="environment"/> - <cd:command file="syst-aux.mkiv" level="system" name="collect"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="collecting" type="environment"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="collect" type="environment"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="expandedcollect" type="environment"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="collect"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="collectexpanded"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="collectexpanded"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="removetoks"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="removetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -41824,7 +42878,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="appendetoks"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="appendetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -41833,7 +42887,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="prependetoks"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="prependetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -41842,17 +42896,17 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="flushtoks"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="flushtoks"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dotoks"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="dotoks"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="beforesplitstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="beforesplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41865,7 +42919,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="aftersplitstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="aftersplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41878,7 +42932,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="splitstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41893,7 +42947,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="greedysplitstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="greedysplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41908,7 +42962,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="beforetestandsplitstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="beforetestandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41921,7 +42975,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="aftertestandsplitstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="aftertestandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41934,7 +42988,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="testandsplitstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="testandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41949,7 +43003,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="splitatperiod"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatperiod"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41958,7 +43012,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="splitatcomma"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatcomma"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41967,7 +43021,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="splitatasterisk"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatasterisk"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41976,7 +43030,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="splitatcolon"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatcolon"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41985,7 +43039,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="splitatcolons"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatcolons"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -41994,7 +43048,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="removesubstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="removesubstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -42007,7 +43061,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="appendtocommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="appendtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42015,7 +43069,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="prependtocommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="prependtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42023,7 +43077,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="addtocommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="addtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42031,7 +43085,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="pretocommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="pretocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42039,7 +43093,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="robustdoifelseinset"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="robustdoifelseinset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42055,7 +43109,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="robustdoifinsetelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="robustdoifinsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42071,7 +43125,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="robustaddtocommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="robustaddtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42079,7 +43133,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="robustpretocommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="robustpretocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42087,7 +43141,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="xsplitstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="xsplitstring"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42095,7 +43149,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="removefromcommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="removefromcommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42103,7 +43157,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="substituteincommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="substituteincommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42114,7 +43168,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="replaceincommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="replaceincommalist"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42122,7 +43176,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="globalprocesscommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="globalprocesscommalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -42130,21 +43184,21 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="withoutpt"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="withoutpt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="PtToCm"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="PtToCm"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dimensiontocount"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="dimensiontocount"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -42152,89 +43206,89 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="numberofpoints"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="numberofpoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="swapdimens"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="swapdimens"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="swapcounts"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="swapcounts"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="swapmacros"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="swapmacros"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="globalswapdimens"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalswapdimens"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="globalswapcounts"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalswapcounts"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="globalswapmacros"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalswapmacros"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="globalpushmacro"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalpushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="localpushmacro"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="localpushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="globalpopmacro"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalpopmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="localpopmacro"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="localpopmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="pushmacro"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="pushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="popmacro"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="popmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="localhsize"/> - <cd:command file="syst-aux.mkiv" level="system" name="setlocalhsize"> + <cd:command category="layout" file="syst-aux.mkiv" level="system" name="localhsize"/> + <cd:command category="layout" file="syst-aux.mkiv" level="system" name="setlocalhsize"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant method="none" prefix="cd:sign" type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="availablehsize"/> - <cd:command file="syst-aux.mkiv" level="system" name="distributedhsize"> + <cd:command category="layout" file="syst-aux.mkiv" level="system" name="availablehsize"/> + <cd:command category="layout" file="syst-aux.mkiv" level="system" name="distributedhsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -42247,7 +43301,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="hsizefraction"> + <cd:command category="layout" file="syst-aux.mkiv" level="system" name="hsizefraction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -42257,7 +43311,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifvalue"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="doifvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42270,7 +43324,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotvalue"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42283,7 +43337,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsevalue"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42299,7 +43353,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifvalueelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifvalueelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42315,7 +43369,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnothing"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42325,7 +43379,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifsomething"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42335,7 +43389,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenothing"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42348,7 +43402,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnothingelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnothingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42361,7 +43415,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsesomething"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsesomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42374,7 +43428,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifsomethingelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsomethingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42387,7 +43441,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifvaluenothing"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifvaluenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42397,7 +43451,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifvaluesomething"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifvaluesomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42407,7 +43461,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsevaluenothing"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsevaluenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42420,7 +43474,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifvaluenothingelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifvaluenothingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42433,7 +43487,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseemptyvalue"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42446,7 +43500,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifemptyvalueelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifemptyvalueelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42459,7 +43513,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifemptyvalue"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42469,7 +43523,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotemptyvalue"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42479,7 +43533,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseallcommon"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -42495,7 +43549,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifallcommonelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifallcommonelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -42511,7 +43565,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifallcommon"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -42524,7 +43578,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotallcommon"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -42537,7 +43591,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dodoubleemptywithset"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoubleemptywithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes" optional="yes"> @@ -42548,7 +43602,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dotripleemptywithset"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotripleemptywithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes" optional="yes"> @@ -42562,7 +43616,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dodoubleargumentwithset"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoubleargumentwithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes"> @@ -42573,7 +43627,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dotripleargumentwithset"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotripleargumentwithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes"> @@ -42587,7 +43641,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="stripcharacter"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="stripcharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -42600,7 +43654,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="stripspaces"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="stripspaces"> <cd:arguments> <cd:delimiter name="from"/> <cd:keywords delimiters="none"> @@ -42610,7 +43664,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="unspacestring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="unspacestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -42619,7 +43673,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="executeifdefined"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="executeifdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42629,7 +43683,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsesomespace"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsesomespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42642,7 +43696,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifsomespaceelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsomespaceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42655,7 +43709,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processseparatedlist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processseparatedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -42669,7 +43723,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processlist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processlist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -42683,7 +43737,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processassignlist"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignlist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:text"/> @@ -42691,7 +43745,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="untexargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="untexargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42700,7 +43754,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="untexcommand"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="untexcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:csname"/> @@ -42709,7 +43763,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="PointsToBigPoints"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="PointsToBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -42717,7 +43771,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="PointsToWholeBigPoints"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="PointsToWholeBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -42725,7 +43779,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ScaledPointsToBigPoints"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="ScaledPointsToBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -42733,7 +43787,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ScaledPointsToWholeBigPoints"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="ScaledPointsToWholeBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -42741,7 +43795,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="PointsToReal"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="PointsToReal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -42749,22 +43803,22 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="style" name="dontleavehmode"/> - <cd:command file="syst-aux.mkiv" level="system" name="utfupper"> + <cd:command category="system" file="syst-aux.mkiv" level="style" name="dontleavehmode"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="utfupper"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="utflower"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="utflower"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="uppercasestring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="uppercasestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -42773,7 +43827,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="lowercasestring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="lowercasestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -42782,7 +43836,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="counttoken"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="counttoken"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -42795,7 +43849,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="counttokens"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="counttokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -42804,7 +43858,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="splitofftokens"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitofftokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -42817,7 +43871,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="handletokens"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="handletokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -42826,9 +43880,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="settrialtypesetting"/> - <cd:command file="syst-aux.mkiv" level="system" name="resettrialtypesetting"/> - <cd:command file="syst-aux.mkiv" level="system" name="iftrialtypesetting"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="settrialtypesetting"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="resettrialtypesetting"/> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="iftrialtypesetting"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -42840,35 +43894,35 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="integerrounding"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="integerrounding"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="onedigitrounding"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="onedigitrounding"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="twodigitrounding"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="twodigitrounding"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="threedigitrounding"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="threedigitrounding"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processcontent"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="processcontent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42876,14 +43930,14 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dogobblesingleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dogobblesingleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dogobbledoubleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dogobbledoubleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -42893,14 +43947,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblesingleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblesingleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobbledoubleempty"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbledoubleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -42910,7 +43964,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsesometoks"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsesometoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42921,7 +43975,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifsometokselse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsometokselse"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42932,7 +43986,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifsometoks"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsometoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42940,7 +43994,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifemptytoks"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifemptytoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42948,8 +44002,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="strictinspectnextcharacter" type="environment"/> - <cd:command file="syst-aux.mkiv" level="system" name="strictdoifelsenextoptional"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="strictinspectnextcharacter" type="environment"/> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="strictdoifelsenextoptional"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -42959,7 +44013,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="strictdoifnextoptionalelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="strictdoifnextoptionalelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -42969,42 +44023,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="gobblespacetokens"/> - <cd:command file="syst-aux.mkiv" level="system" name="verbatimstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="gobblespacetokens"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="verbatimstring"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="lastdigit"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="lastdigit"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="lasttwodigits"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="lasttwodigits"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="serializedcommalist"/> - <cd:command file="syst-aux.mkiv" level="system" name="serializecommalist"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="serializedcommalist"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="serializecommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="purenumber"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="purenumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="filterfromvalue"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="filterfromvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43017,7 +44071,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="filterfromnext"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="filterfromnext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43032,7 +44086,7 @@ <cd:content optional="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="style" name="definemeasure"> + <cd:command category="counter" file="syst-aux.mkiv" level="style" name="definemeasure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43042,7 +44096,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="freezemeasure"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="freezemeasure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43052,7 +44106,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setmeasure"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setmeasure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43062,7 +44116,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setgmeasure"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setgmeasure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43072,7 +44126,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setemeasure"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setemeasure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43082,7 +44136,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setxmeasure"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setxmeasure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43092,21 +44146,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="style" name="measure"> + <cd:command category="counter" file="syst-aux.mkiv" level="style" name="measure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="style" name="measured"> + <cd:command category="counter" file="syst-aux.mkiv" level="style" name="measured"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dividedsize"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="dividedsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -43119,7 +44173,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsedimension"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsedimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43132,7 +44186,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifdimensionelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifdimensionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43145,7 +44199,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsedimenstring"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsedimenstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43158,7 +44212,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifdimenstringelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifdimenstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43171,8 +44225,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="compresult"/> - <cd:command file="syst-aux.mkiv" level="system" name="comparedimension"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="compresult"/> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="comparedimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -43182,7 +44236,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="comparedimensioneps"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="comparedimensioneps"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -43192,7 +44246,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letcscsname"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letcscsname"> <cd:arguments> <cd:csname/> <cd:delimiter name="csname"/> @@ -43202,7 +44256,7 @@ <cd:delimiter name="endcsname"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letcsnamecs"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letcsnamecs"> <cd:arguments> <cd:delimiter name="csname"/> <cd:keywords delimiters="none"> @@ -43212,7 +44266,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="letcsnamecsname"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="letcsnamecsname"> <cd:arguments> <cd:delimiter name="csname"/> <cd:keywords delimiters="none"> @@ -43226,7 +44280,7 @@ <cd:delimiter name="endcsname"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="addvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="addvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43236,14 +44290,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="unspaced"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="unspaced"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="unspaceargument"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="unspaceargument"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -43252,7 +44306,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="unspaceafter"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="unspaceafter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -43260,7 +44314,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsehasspace"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsehasspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43273,7 +44327,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifhasspaceelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifhasspaceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43286,28 +44340,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="setflag"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="setflag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="resetflag"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="resetflag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="flag"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="flag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelseflagged"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseflagged"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43320,7 +44374,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifflaggedelse"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifflaggedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43333,7 +44387,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnotflagged"> + <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotflagged"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43343,7 +44397,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="inheritparameter"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="inheritparameter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -43356,7 +44410,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifelsenonzeropositive"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenonzeropositive"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43369,7 +44423,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="doifnonzeropositiveelse"> + <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnonzeropositiveelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43382,7 +44436,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getrawparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getrawparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -43394,7 +44448,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getraweparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getraweparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -43406,7 +44460,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getrawgparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getrawgparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -43418,7 +44472,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getrawxparameters"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="getrawxparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -43430,7 +44484,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="unprotected"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="unprotected"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:content"/> @@ -43438,11 +44492,12 @@ <cd:delimiter name="par"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="resettimer"/> - <cd:command file="syst-aux.mkiv" level="system" name="elapsedtime"/> - <cd:command file="syst-aux.mkiv" level="system" name="elapsedseconds"/> - <cd:command file="syst-aux.mkiv" level="system" name="currentfeaturetest"/> - <cd:command file="syst-aux.mkiv" level="system" name="testfeature"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="resettimer"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="elapsedtime"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="elapsedseconds"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="elapsedsteptime"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentfeaturetest"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="testfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43450,14 +44505,15 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="showtimer"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="retestfeature"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="showtimer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="testfeatureonce"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="testfeatureonce"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43465,20 +44521,20 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="freezedimenmacro"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="freezedimenmacro"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="negated"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="negated"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="assigndimen"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="assigndimen"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -43486,7 +44542,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="appendvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="appendvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43496,7 +44552,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="appendgvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="appendgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43506,7 +44562,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="prependvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="prependvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43516,7 +44572,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="prependgvalue"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="prependgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43526,7 +44582,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="processranges"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="processranges"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:number"/> @@ -43535,7 +44591,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="dowithrange"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="dowithrange"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:number"/> @@ -43544,9 +44600,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ignoreimplicitspaces"/> - <cd:command file="syst-aux.mkiv" level="system" name="nointerference" type="environment"/> - <cd:command file="syst-aux.mkiv" level="system" name="expandcheckedcsname"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="ignoreimplicitspaces"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="nointerference" type="environment"/> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="expandcheckedcsname"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -43557,39 +44613,39 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="docheckedpair"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="docheckedpair"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="constantnumber"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantnumber"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="constantnumberargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantnumberargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="constantdimen"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantdimen"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="constantdimenargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantdimenargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="constantemptyargument"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantemptyargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="getsubstring"> + <cd:command category="strings" file="syst-aux.mkiv" level="system" name="getsubstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43602,7 +44658,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="converteddimen"> + <cd:command category="counter" file="syst-aux.mkiv" level="system" name="converteddimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -43623,7 +44679,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" level="system" name="ntimes"> + <cd:command category="system" file="syst-aux.mkiv" level="system" name="ntimes"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43633,7 +44689,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expdoifelse"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifelse"> <cd:arguments> <cd:content/> <cd:content/> @@ -43645,7 +44701,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expdoif"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoif"> <cd:arguments> <cd:content/> <cd:content/> @@ -43654,7 +44710,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expdoifnot"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifnot"> <cd:arguments> <cd:content/> <cd:content/> @@ -43663,7 +44719,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expandeddoif"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expandeddoif"> <cd:arguments> <cd:content/> <cd:content/> @@ -43672,7 +44728,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifnot"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expandeddoifnot"> <cd:arguments> <cd:content/> <cd:content/> @@ -43681,7 +44737,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifelse"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expandeddoifelse"> <cd:arguments> <cd:content/> <cd:content/> @@ -43693,7 +44749,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expdoifelsecommon"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifelsecommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -43709,7 +44765,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expdoifcommonelse"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifcommonelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -43725,7 +44781,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expdoifelseinset"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifelseinset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43741,7 +44797,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="expdoifinsetelse"> + <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifinsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -43757,14 +44813,23 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-lua.mkiv" level="system" name="luaexpr"> + <cd:command category="strings" file="syst-lua.mkiv" level="system" name="luaexpr"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> + <cd:command category="counter" file="core-sys.mkiv" level="style" name="setupsystem"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-systemlog.xml"> - <cd:command file="core-sys.mkiv" level="system" name="systemlog"> + <cd:command category="tracker" file="core-sys.mkiv" level="system" name="systemlog"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43777,7 +44842,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" level="system" name="systemlogfirst"> + <cd:command category="tracker" file="core-sys.mkiv" level="system" name="systemlogfirst"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43790,7 +44855,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" level="system" name="systemloglast"> + <cd:command category="tracker" file="core-sys.mkiv" level="system" name="systemloglast"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43866,7 +44931,7 @@ <cd:command category="tables" file="tabl-tab.mkiv" level="style" name="setuptables"> <cd:arguments> <cd:assignments list="yes"> - <cd:parameter name="text"> + <cd:parameter name="textwidth"> <cd:constant type="cd:dimension"/> <cd:constant type="max"/> </cd:parameter> @@ -43933,7 +44998,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tabulation.xml"> - <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="definetabulation"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="definetabulate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43941,14 +45006,15 @@ <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptabulation"/> - </cd:assignments> + <cd:template optional="yes"/> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="setuptabulation"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="setuptabulate"> <cd:arguments> - <cd:keywords list="yes" optional="yes"> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> @@ -44100,43 +45166,6 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-tbl.mkiv" generated="yes" level="document" name="tabulation" type="environment" variant="example"> - <cd:sequence> - <cd:variable value="tabulation"/> - </cd:sequence> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptabulation"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="definetabulate"> - <cd:arguments> - <cd:keywords> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:template optional="yes"/> - </cd:arguments> - </cd:command> - <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="setuptabulate"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes"> - <cd:inherit name="setuptabulation"/> - </cd:assignments> - </cd:arguments> - </cd:command> <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulate" type="environment"> <cd:arguments> <cd:template optional="yes"/> @@ -44217,7 +45246,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="xml conditional" file="strc-tag.mkiv" level="system" name="doifelseinelement"> + <cd:command category="xml" file="strc-tag.mkiv" keywords="conditional" level="system" name="doifelseinelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44230,7 +45259,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml conditional" file="strc-tag.mkiv" level="system" name="doifinelementelse"> + <cd:command category="xml" file="strc-tag.mkiv" keywords="conditional" level="system" name="doifinelementelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44243,7 +45272,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml language" file="strc-tag.mkiv" level="system" name="taggedlabeltexts"> + <cd:command category="xml" file="strc-tag.mkiv" keywords="language" level="system" name="taggedlabeltexts"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44254,7 +45283,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="xml language" file="strc-tag.mkiv" level="system" name="namedtaggedlabeltexts"> + <cd:command category="xml" file="strc-tag.mkiv" keywords="language" level="system" name="namedtaggedlabeltexts"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44483,7 +45512,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doifelsetextflowcollector"> + <cd:command category="structure" file="page-flw.mkiv" keywords="conditional" level="system" name="doifelsetextflowcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44496,7 +45525,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doiftextflowcollectorelse"> + <cd:command category="structure" file="page-flw.mkiv" keywords="conditional" level="system" name="doiftextflowcollectorelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44509,7 +45538,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doifelsetextflow"> + <cd:command category="structure" file="page-flw.mkiv" keywords="conditional" level="system" name="doifelsetextflow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44522,7 +45551,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doiftextflowelse"> + <cd:command category="structure" file="page-flw.mkiv" keywords="conditional" level="system" name="doiftextflowelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44665,10 +45694,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <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"/> @@ -44676,6 +45718,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44685,6 +45730,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44729,10 +45777,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <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"/> @@ -44740,6 +45801,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44749,6 +45813,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44793,10 +45860,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <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"/> @@ -44804,6 +45884,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44813,6 +45896,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44857,10 +45943,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <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"/> @@ -44868,6 +45967,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44877,6 +45979,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44921,10 +46026,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <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"/> @@ -44932,6 +46050,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44941,6 +46062,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44985,10 +46109,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <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"/> @@ -44996,6 +46133,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -45005,13 +46145,16 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <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 category="layout conditional" file="page-txt.mkvi" level="system" name="doifelselayouttextline"> + <cd:command category="layout" file="page-txt.mkvi" keywords="conditional" level="system" name="doifelselayouttextline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45024,7 +46167,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doiflayouttextlineelse"> + <cd:command category="layout" file="page-txt.mkvi" keywords="conditional" level="system" name="doiflayouttextlineelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45037,7 +46180,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doifelselayoutsomeline"> + <cd:command category="layout" file="page-txt.mkvi" keywords="conditional" level="system" name="doifelselayoutsomeline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45050,7 +46193,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doiflayoutsomelineelse"> + <cd:command category="layout" file="page-txt.mkvi" keywords="conditional" level="system" name="doiflayoutsomelineelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45399,63 +46542,63 @@ </cd:command> </cd:interface> <cd:interface file="i-token.xml"> - <cd:command file="toks-tra.mkiv" level="system" name="tokens" type="environment"> + <cd:command category="strings" file="toks-tra.mkiv" level="system" name="tokens" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-tra.mkiv" level="system" name="flushtokens"> + <cd:command category="strings" file="toks-tra.mkiv" level="system" name="flushtokens"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-tra.mkiv" level="system" name="showtokens"> + <cd:command category="strings" file="toks-tra.mkiv" level="system" name="showtokens"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-tra.mkiv" level="system" name="testtokens"> + <cd:command category="strings" file="toks-tra.mkiv" level="system" name="testtokens"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-aux.mkiv" level="style" name="definetokenlist"> + <cd:command category="strings" file="toks-aux.mkiv" level="style" name="definetokenlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-aux.mkiv" level="style" name="tokenlist" type="environment"> + <cd:command category="strings" file="toks-aux.mkiv" level="style" name="tokenlist" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-aux.mkiv" level="style" name="gettokenlist"> + <cd:command category="strings" file="toks-aux.mkiv" level="style" name="gettokenlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-aux.mkiv" level="style" name="resettokenlist"> + <cd:command category="strings" file="toks-aux.mkiv" level="style" name="resettokenlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-aux.mkiv" level="style" name="settokenlist"> + <cd:command category="strings" file="toks-aux.mkiv" level="style" name="settokenlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -45553,7 +46696,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tracker.xml"> - <cd:command file="trac-ctx.mkiv" level="system" name="installtextracker"> + <cd:command category="tracker" file="trac-ctx.mkiv" level="system" name="installtextracker"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45566,7 +46709,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-ctx.mkiv" level="system" name="installtexdirective"> + <cd:command category="tracker" file="trac-ctx.mkiv" level="system" name="installtexdirective"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45579,56 +46722,56 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" level="style" name="enabletrackers"> + <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="enabletrackers"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" level="style" name="disabletrackers"> + <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="disabletrackers"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" level="system" name="resettrackers"/> - <cd:command file="trac-deb.mkiv" level="document" name="showtrackers"/> - <cd:command file="trac-deb.mkiv" level="style" name="enabledirectives"> + <cd:command category="tracker" file="trac-deb.mkiv" level="system" name="resettrackers"/> + <cd:command category="tracker" file="trac-deb.mkiv" level="document" name="showtrackers"/> + <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="enabledirectives"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" level="style" name="disabledirectives"> + <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="disabledirectives"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" level="document" name="showdirectives"/> - <cd:command file="trac-deb.mkiv" level="style" name="enableexperiments"> + <cd:command category="tracker" file="trac-deb.mkiv" level="document" name="showdirectives"/> + <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="enableexperiments"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" level="style" name="disableexperiments"> + <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="disableexperiments"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" level="document" name="showexperiments"/> - <cd:command file="trac-deb.mkiv" level="system" name="showedebuginfo"/> - <cd:command file="trac-deb.mkiv" level="system" name="overloaderror"/> - <cd:command file="trac-deb.mkiv" level="system" name="showlogcategories"/> - <cd:command file="trac-jus.mkiv" level="system" name="showjustification"/> + <cd:command category="tracker" file="trac-deb.mkiv" level="document" name="showexperiments"/> + <cd:command category="tracker" file="trac-deb.mkiv" level="system" name="showedebuginfo"/> + <cd:command category="tracker" file="trac-deb.mkiv" level="system" name="overloaderror"/> + <cd:command category="tracker" file="trac-deb.mkiv" level="system" name="showlogcategories"/> + <cd:command category="tracker" file="trac-jus.mkiv" level="system" name="showjustification"/> </cd:interface> <cd:interface file="i-translation.xml"> <cd:command category="language" file="lang-lab.mkiv" level="document" name="translate"> @@ -45653,7 +46796,7 @@ </cd:command> </cd:interface> <cd:interface file="i-twopassdata.xml"> - <cd:command file="core-two.mkiv" level="system" name="immediatesavetwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="immediatesavetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45664,7 +46807,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="savetwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="savetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45675,7 +46818,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="lazysavetwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="lazysavetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45686,7 +46829,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="savetaggedtwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="savetaggedtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45700,7 +46843,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="lazysavetaggedtwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="lazysavetaggedtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45714,28 +46857,28 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="definetwopasslist"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="definetwopasslist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="gettwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="gettwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="checktwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="checktwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="findtwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="findtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45745,21 +46888,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="getfirsttwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="getfirsttwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="getlasttwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="getlasttwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="getnamedtwopassdatalist"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="getnamedtwopassdatalist"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -45767,14 +46910,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="gettwopassdatalist"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="gettwopassdatalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="doifelseintwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" keywords="conditional" level="system" name="doifelseintwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45790,7 +46933,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="doifintwopassdataelse"> + <cd:command category="twopassdata" file="core-two.mkiv" keywords="conditional" level="system" name="doifintwopassdataelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45806,7 +46949,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" level="system" name="getfromtwopassdata"> + <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="getfromtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46254,7 +47397,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure" file="strc-usr.mkiv" level="document" name="userdata" type="environment"> + <cd:command category="structure" file="strc-usr.mkiv" keywords="buffer" level="document" name="userdata" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -46294,11 +47437,11 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure" file="strc-usr.mkiv" level="style" name="getuserdata"/> - <cd:command category="structure" file="strc-usr.mkiv" level="style" name="getinlineuserdata"/> + <cd:command category="structure" file="strc-usr.mkiv" keywords="buffer" level="style" name="getuserdata"/> + <cd:command category="structure" file="strc-usr.mkiv" keywords="buffer" level="style" name="getinlineuserdata"/> </cd:interface> <cd:interface file="i-variables.xml"> - <cd:command file="core-env.mkiv" level="style" name="setvariables"> + <cd:command category="strings" file="core-env.mkiv" level="style" name="setvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -46316,7 +47459,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setevariables"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="setevariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -46334,7 +47477,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setgvariables"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="setgvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -46352,7 +47495,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setxvariables"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="setxvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -46370,7 +47513,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="checkvariables"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="checkvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -46388,7 +47531,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="setvariable"> + <cd:command category="strings" file="core-env.mkiv" level="style" name="setvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46401,7 +47544,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setevariable"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="setevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46414,7 +47557,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setgvariable"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="setgvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46427,7 +47570,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setxvariable"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="setxvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46440,7 +47583,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="style" name="getvariable"> + <cd:command category="strings" file="core-env.mkiv" level="style" name="getvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46450,7 +47593,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="showvariable"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="showvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46460,7 +47603,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelsevariable"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifelsevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46476,7 +47619,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifvariableelse"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifvariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46492,7 +47635,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifvariable"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46505,7 +47648,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotvariable"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifnotvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46518,7 +47661,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelseemptyvariable"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifelseemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46534,7 +47677,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifemptyvariableelse"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifemptyvariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46550,7 +47693,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifemptyvariable"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46563,7 +47706,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotemptyvariable"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifnotemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46576,7 +47719,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="getvariabledefault"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="getvariabledefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46589,7 +47732,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setupenv"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="setupenv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="set"> @@ -46604,7 +47747,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelseenv"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifelseenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -46617,7 +47760,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifenvelse"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifenvelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -46630,7 +47773,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifenv"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -46640,7 +47783,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotenv"> + <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifnotenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -46650,14 +47793,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="env"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="env"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="envvar"> + <cd:command category="strings" file="core-env.mkiv" level="system" name="envvar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -46667,7 +47810,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="setdocumentfilename"> + <cd:command category="strings" file="luat-ini.mkiv" level="system" name="setdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -46677,7 +47820,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="setdocumentargument"> + <cd:command category="strings" file="luat-ini.mkiv" level="system" name="setdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46687,7 +47830,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="setdocumentargumentdefault"> + <cd:command category="strings" file="luat-ini.mkiv" level="system" name="setdocumentargumentdefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46697,21 +47840,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="getdocumentfilename"> + <cd:command category="strings" file="luat-ini.mkiv" level="system" name="getdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="getdocumentargument"> + <cd:command category="strings" file="luat-ini.mkiv" level="system" name="getdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="getdocumentargumentdefault"> + <cd:command category="strings" file="luat-ini.mkiv" level="system" name="getdocumentargumentdefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46721,7 +47864,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifelsedocumentargument"> + <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifelsedocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46734,7 +47877,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentargumentelse"> + <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifdocumentargumentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46747,7 +47890,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentargument"> + <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46757,7 +47900,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifnotdocumentargument"> + <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifnotdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -46767,7 +47910,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifelsedocumentfilename"> + <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifelsedocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -46780,7 +47923,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentfilenameelse"> + <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifdocumentfilenameelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -46793,7 +47936,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentfilename"> + <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -46803,7 +47946,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifnotdocumentfilename"> + <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifnotdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -47071,7 +48214,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typing" type="environment" variant="instance"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" keywords="buffer" level="document" name="typing" type="environment" variant="instance"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -47089,7 +48232,7 @@ <cd:constant value="XML"/> </cd:instances> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typing" type="environment" variant="instance:argument"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" keywords="buffer" level="document" name="typing" type="environment" variant="instance:argument"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -47162,7 +48305,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="verbatim conditional" file="buff-ver.mkiv" level="system" name="doifelsetypingfile"> + <cd:command category="verbatim" file="buff-ver.mkiv" keywords="conditional" level="system" name="doifelsetypingfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -47175,7 +48318,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="verbatim conditional" file="buff-ver.mkiv" level="system" name="doiftypingfileelse"> + <cd:command category="verbatim" file="buff-ver.mkiv" keywords="conditional" level="system" name="doiftypingfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -47229,7 +48372,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifelseolderversion"> + <cd:command file="file-mod.mkvi" keywords="conditional" level="system" name="doifelseolderversion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -47245,7 +48388,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifolderversionelse"> + <cd:command file="file-mod.mkvi" keywords="conditional" level="system" name="doifolderversionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -47261,7 +48404,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifelseoldercontext"> + <cd:command file="file-mod.mkvi" keywords="conditional" level="system" name="doifelseoldercontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -47274,7 +48417,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifoldercontextelse"> + <cd:command file="file-mod.mkvi" keywords="conditional" level="system" name="doifoldercontextelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -47354,7 +48497,7 @@ <cd:command category="pdf" file="attr-lay.mkiv" level="document" name="showlayoutcomponents"/> </cd:interface> <cd:interface file="i-visualizer.xml"> - <cd:command file="trac-vis.mkiv" level="system" name="ruledhbox"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47362,7 +48505,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="ruledvbox"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47370,7 +48513,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="ruledvtop"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47378,7 +48521,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="ruledtopv"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledtopv"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47386,7 +48529,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="ruledhpack"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledhpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47394,7 +48537,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="ruledvpack"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledvpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47402,7 +48545,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="ruledtpack"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledtpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47410,12 +48553,12 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="ruledmbox"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledmbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="filledhboxr"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxr"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47423,7 +48566,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="filledhboxg"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxg"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47431,7 +48574,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="filledhboxb"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxb"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47439,7 +48582,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="filledhboxc"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxc"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47447,7 +48590,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="filledhboxm"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxm"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47455,7 +48598,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="filledhboxy"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxy"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47463,7 +48606,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" level="system" name="filledhboxk"> + <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxk"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -47471,7 +48614,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trc-vis.mkiv" level="document" name="showmakeup"> + <cd:command category="boxes" file="trc-vis.mkiv" level="document" name="showmakeup"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="makeup"/> @@ -47504,21 +48647,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trc-vis.mkiv" level="document" name="showallmakeup"/> - <cd:command file="trc-vis.mkiv" level="document" name="showboxes"/> - <cd:command file="trc-vis.mkiv" level="document" name="showglyphs"/> - <cd:command file="trc-vis.mkiv" level="document" name="showfontkerns"/> - <cd:command file="trc-vis.mkiv" level="document" name="showfontitalics"/> - <cd:command file="trc-vis.mkiv" level="document" name="showglyphdata"/> - <cd:command file="trc-vis.mkiv" level="document" name="showfontexpansion"/> - <cd:command file="trc-vis.mkiv" level="system" name="setvisualizerfont"> + <cd:command category="boxes" file="trc-vis.mkiv" level="document" name="showallmakeup"/> + <cd:command category="boxes" file="trc-vis.mkiv" level="document" name="showboxes"/> + <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showglyphs"/> + <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showfontkerns"/> + <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showfontitalics"/> + <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showglyphdata"/> + <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showfontexpansion"/> + <cd:command category="fonts" file="trc-vis.mkiv" level="system" name="setvisualizerfont"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trc-vis.mkiv" level="system" name="resetvisualizers"/> + <cd:command category="fonts" file="trc-vis.mkiv" level="system" name="resetvisualizers"/> </cd:interface> <cd:interface file="i-vspace.xml"> <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="definevspacingamount"> @@ -47699,6 +48842,16 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="whitespace" file="spac-ver.mkxl" keywords="conditional" level="document" name="doifoutervmode"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-ver.mkxl" level="document" name="dosomebreak"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="godown"> <cd:arguments> <cd:keywords> @@ -47783,7 +48936,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="alignment" file="spac-ver.mkiv" level="system" name="forgetparskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" keywords="alignment" level="system" name="forgetparskip"/> </cd:interface> <cd:interface file="i-xml.xml"> <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmain"> @@ -48850,16 +50003,6 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregisterns"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:name"/> - </cd:keywords> - </cd:arguments> - </cd:command> <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremapname"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -49087,6 +50230,10 @@ <cd:constant type="yes"/> <cd:constant type="no"/> </cd:parameter> + <cd:parameter name="entities"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -49097,9 +50244,16 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldepth"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-xtable.xml"> - <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="definextable"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="style" name="definextable"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -49112,7 +50266,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="setupxtable"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="style" name="setupxtable"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -49200,35 +50354,35 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtable" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtable" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtable" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtable" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="embeddedxtable" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="style" name="embeddedxtable" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="embeddedxtable" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="style" name="embeddedxtable" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" generated="yes" level="document" name="xtable" type="environment" variant="example"> + <cd:command category="tables" file="tabl-xtb.mkvi" generated="yes" keywords="background rules" level="document" name="xtable" type="environment" variant="example"> <cd:sequence> <cd:variable value="xtable"/> </cd:sequence> @@ -49238,14 +50392,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="processxtablebuffer"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="processxtablebuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xrow" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xrow" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -49255,21 +50409,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcolumn" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xcolumn" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcolumn" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xcolumn" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcell" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xcell" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -49291,63 +50445,63 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablehead" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablehead" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablehead" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablehead" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablefoot" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablefoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablefoot" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablefoot" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablenext" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablenext" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablenext" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablenext" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablebody" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablebody" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablebody" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablebody" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -49357,7 +50511,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xrowgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xrowgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -49367,7 +50521,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcellgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xcellgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -49377,7 +50531,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" level="system" name="currentxtablerow"/> - <cd:command category="tables" file="tabl-xtb.mkvi" level="system" name="currentxtablecolumn"/> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="system" name="currentxtablerow"/> + <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="system" name="currentxtablecolumn"/> </cd:interface> </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-accent.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-accent.xml index 190e1faa9fa..d14690e581b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-accent.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-accent.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineaccent" level="style" file="enco-ini.mkiv"> + <cd:command name="defineaccent" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-character"/> @@ -12,150 +12,150 @@ </cd:arguments> </cd:command> - <cd:command name="definecharacter" level="style" file="enco-ini.mkiv"> + <cd:command name="definecharacter" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-number"/> </cd:arguments> </cd:command> - <cd:command name="definecommand" level="style" file="enco-ini.mkiv"> + <cd:command name="definecommand" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-command"/> </cd:arguments> </cd:command> - <cd:command name="definemathaccent" level="style" file="enco-ini.mkiv"> + <cd:command name="definemathaccent" level="style" category="mathematics" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="buildmathaccent" level="style" file="enco-ini.mkiv"> + <cd:command name="buildmathaccent" level="style" category="mathematics" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextaccent" level="style" file="enco-ini.mkiv"> + <cd:command name="buildtextaccent" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextmacron" level="style" file="enco-ini.mkiv"> + <cd:command name="buildtextmacron" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextbottomdot" level="style" file="enco-ini.mkiv"> + <cd:command name="buildtextbottomdot" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextcedilla" level="style" file="enco-ini.mkiv"> + <cd:command name="buildtextcedilla" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextognek" level="style" file="enco-ini.mkiv"> + <cd:command name="buildtextognek" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextbottomcomma" level="style" file="enco-ini.mkiv"> + <cd:command name="buildtextbottomcomma" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="d" level="style" file="enco-ini.mkiv"> + <cd:command name="d" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextgrave" level="style" file="enco-ini.mkiv"> + <cd:command name="buildtextgrave" level="style" category="language" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="acute" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="acute" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="grave" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="grave" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="ddot" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="ddot" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="tilde" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="tilde" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="bar" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="bar" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="breve" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="breve" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="check" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="check" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="hat" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="hat" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="vec" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="vec" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="dot" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="dot" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="ring" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="ring" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="dddot" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:command name="dddot" level="document" category="mathematics" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> @@ -163,102 +163,102 @@ <!-- - <cd:command name="AA" file="enco-ini.mkiv"/> + <cd:command name="AA" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="aa" file="enco-ini.mkiv"/> + <cd:command name="aa" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="AE" file="enco-ini.mkiv"/> + <cd:command name="AE" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="ae" file="enco-ini.mkiv"/> + <cd:command name="ae" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="CC" file="enco-ini.mkiv"/> + <cd:command name="CC" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="cc" file="enco-ini.mkiv"/> + <cd:command name="cc" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="L" file="enco-ini.mkiv"/> + <cd:command name="L" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="l" file="enco-ini.mkiv"/> + <cd:command name="l" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="O" file="enco-ini.mkiv"/> + <cd:command name="O" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="o" file="enco-ini.mkiv"/> + <cd:command name="o" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="OE" file="enco-ini.mkiv"/> + <cd:command name="OE" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="oe" file="enco-ini.mkiv"/> + <cd:command name="oe" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="SZ" file="enco-ini.mkiv"/> + <cd:command name="SZ" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="sz" file="enco-ini.mkiv"/> + <cd:command name="sz" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="SS" file="enco-ini.mkiv"/> + <cd:command name="SS" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="IJ" file="enco-ini.mkiv"/> + <cd:command name="IJ" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="ij" file="enco-ini.mkiv"/> + <cd:command name="ij" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="i" file="enco-ini.mkiv"/> + <cd:command name="i" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="j" file="enco-ini.mkiv"/> + <cd:command name="j" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="eszett" file="enco-ini.mkiv"/> + <cd:command name="eszett" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Eszett" file="enco-ini.mkiv"/> + <cd:command name="Eszett" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Ssharp" file="enco-ini.mkiv"/> + <cd:command name="Ssharp" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="lslash" file="enco-ini.mkiv"/> + <cd:command name="lslash" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Lslash" file="enco-ini.mkiv"/> + <cd:command name="Lslash" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="dslash" file="enco-ini.mkiv"/> + <cd:command name="dslash" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Dslash" file="enco-ini.mkiv"/> + <cd:command name="Dslash" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="oslash" file="enco-ini.mkiv"/> + <cd:command name="oslash" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Oslash" file="enco-ini.mkiv"/> + <cd:command name="Oslash" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="dcroat" file="enco-ini.mkiv"/> + <cd:command name="dcroat" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Dcroat" file="enco-ini.mkiv"/> + <cd:command name="Dcroat" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="kcedilla" file="enco-ini.mkiv"/> + <cd:command name="kcedilla" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Kcedilla" file="enco-ini.mkiv"/> + <cd:command name="Kcedilla" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="lcedilla" file="enco-ini.mkiv"/> + <cd:command name="lcedilla" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Lcedilla" file="enco-ini.mkiv"/> + <cd:command name="Lcedilla" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="ncedilla" file="enco-ini.mkiv"/> + <cd:command name="ncedilla" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Ncedilla" file="enco-ini.mkiv"/> + <cd:command name="Ncedilla" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="rcedilla" file="enco-ini.mkiv"/> + <cd:command name="rcedilla" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Rcedilla" file="enco-ini.mkiv"/> + <cd:command name="Rcedilla" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="aumlaut" file="enco-ini.mkiv"/> + <cd:command name="aumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Aumlaut" file="enco-ini.mkiv"/> + <cd:command name="Aumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="eumlaut" file="enco-ini.mkiv"/> + <cd:command name="eumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Eumlaut" file="enco-ini.mkiv"/> + <cd:command name="Eumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="iumlaut" file="enco-ini.mkiv"/> + <cd:command name="iumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Iumlaut" file="enco-ini.mkiv"/> + <cd:command name="Iumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="oumlaut" file="enco-ini.mkiv"/> + <cd:command name="oumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Oumlaut" file="enco-ini.mkiv"/> + <cd:command name="Oumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="uumlaut" file="enco-ini.mkiv"/> + <cd:command name="uumlaut" level="document" category="language" file="enco-ini.mkiv"/> - <cd:command name="Uumlaut" file="enco-ini.mkiv"/> + <cd:command name="Uumlaut" level="document" category="language" file="enco-ini.mkiv"/> --> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-align.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-align.xml index eaebaa698f2..46afca89732 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-align.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-align.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupalign" category="alignment" level="style" file="spac-ali.mkiv"> + <cd:command name="setupalign" level="style" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="broad"/> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="alignment" type="environment" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="alignment" type="environment" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupalign"/> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="linealignment" type="environment" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="linealignment" type="environment" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="left"/> @@ -93,49 +93,49 @@ </cd:arguments> </cd:command> - <cd:command name="leftaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> + <cd:command name="leftaligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="middlealigned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> + <cd:command name="middlealigned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="rightaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> + <cd:command name="rightaligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="maxaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> + <cd:command name="maxaligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="midaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> + <cd:command name="midaligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="centeraligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> + <cd:command name="centeraligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="leftaligned" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="leftaligned" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightaligned" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="rightaligned" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="middlealigned" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="middlealigned" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="maxaligned" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="maxaligned" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="midaligned" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="midaligned" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centeraligned" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="centeraligned" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> @@ -149,7 +149,7 @@ </cd:arguments> </cd:command> - <cd:command name="wordright" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="wordright" level="document" category="alignment" keywords="linebreak" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="right"/> @@ -159,7 +159,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="simplealignedbox" level="system" category="alignment" keywords="boxes" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -167,7 +167,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedspreadbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="simplealignedspreadbox" level="system" category="alignment" keywords="boxes" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -175,7 +175,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedboxplus" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="simplealignedboxplus" level="system" category="alignment" keywords="boxes" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -184,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplereversealignedbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="simplereversealignedbox" level="system" category="alignment" keywords="boxes direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -192,7 +192,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplereversealignedboxplus" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="simplereversealignedboxplus" level="system" category="alignment" keywords="boxes direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -201,7 +201,7 @@ </cd:arguments> </cd:command> - <cd:command name="alignedbox" level="system" category="alignment" file="pack-box.mkiv"> + <cd:command name="alignedbox" level="system" category="alignment" keywords="boxes" file="pack-box.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-aligned"/> @@ -220,65 +220,65 @@ </cd:arguments> </cd:command> - <cd:command name="lefttoright" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="lefttoright" level="style" category="alignment" keywords="direction" file="spac-ali.mkiv"/> - <cd:command name="righttoleft" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="righttoleft" level="style" category="alignment" keywords="direction" file="spac-ali.mkiv"/> - <cd:command name="raggedbottom" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="raggedbottom" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="alignbottom" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="alignbottom" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="baselinebottom" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="baselinebottom" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="notragged" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="notragged" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="raggedleft" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="raggedleft" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="raggedcenter" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="raggedcenter" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="raggedright" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="raggedright" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="veryraggedleft" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="veryraggedleft" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="veryraggedcenter" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="veryraggedcenter" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="veryraggedright" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="veryraggedright" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="raggedwidecenter" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="raggedwidecenter" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="centeredlastline" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="centeredlastline" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="flushedrightlastline" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="flushedrightlastline" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="ttraggedright" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="ttraggedright" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="forgetragged" category="alignment" level="style" file="spac-ali.mkiv"/> + <cd:command name="forgetragged" level="style" category="alignment" file="spac-ali.mkiv"/> - <cd:command name="line" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="line" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftline" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="leftline" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightline" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="rightline" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centerline" category="alignment" level="document" file="spac-ali.mkiv"> + <cd:command name="centerline" level="document" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hanging" type="environment" category="alignment" level="document" file="spac-ver.mkiv"> + <cd:command name="hanging" type="environment" level="document" category="alignment" file="spac-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="distance"> @@ -296,7 +296,7 @@ </cd:arguments> </cd:command> - <cd:command name="hanging" type="environment" variant="argument" category="alignment" level="document" file="spac-ver.mkiv"> + <cd:command name="hanging" type="environment" variant="argument" level="document" category="alignment" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left" default="yes"/> @@ -306,7 +306,7 @@ </cd:arguments> </cd:command> - <cd:command name="fixed" type="environment" category="alignment" level="document" file="spac-ver.mkiv"> + <cd:command name="fixed" type="environment" level="document" category="alignment" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="low"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-anchor.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-anchor.xml index c8dad56d5c4..28b69a43652 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-anchor.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-anchor.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineanchor" level="style" file="pack-box.mkiv"> + <cd:command name="defineanchor" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -18,7 +18,7 @@ </cd:arguments> </cd:command> - <cd:command name="anchor" level="document" file="pack-box.mkiv"> + <cd:command name="anchor" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -32,4 +32,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml index 550cc57ce66..b75a5ac66dc 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineattachment" level="style" file="scrn-wid.mkvi"> + <cd:command name="defineattachment" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupattachment" level="style" file="scrn-wid.mkvi"> + <cd:command name="setupattachment" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupattachments" level="style" file="scrn-wid.mkvi"> + <cd:command name="setupattachments" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="registerattachment" level="document" file="scrn-wid.mkvi"> + <cd:command name="registerattachment" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -106,7 +106,7 @@ </cd:arguments> </cd:command> - <cd:command name="attachment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> + <cd:command name="attachment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:sequence> <cd:instance value="attachment"/> </cd:sequence> @@ -121,7 +121,7 @@ </cd:instances> </cd:command> - <cd:command name="attachment" type="environment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> + <cd:command name="attachment" type="environment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:sequence> <cd:instance value="attachment"/> </cd:sequence> @@ -136,28 +136,6 @@ </cd:instances> </cd:command> - <cd:command name="placeattachments" level="document" file="scrn-wid.mkvi"/> + <cd:command name="placeattachments" level="document" category="pdf" file="scrn-wid.mkvi"/> - <!-- - - <cd:command name="attachment" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupattachment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="attachment" type="environment" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupattachment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-attribute.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-attribute.xml index 0ea4ce7c0d5..77b91ff44d7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-attribute.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-attribute.xml @@ -4,25 +4,25 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pushattribute" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="pushattribute" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="popattribute" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="popattribute" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="installattributestack" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="installattributestack" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="defineattribute" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="defineattribute" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -35,7 +35,7 @@ </cd:arguments> </cd:command> - <cd:command name="definesystemattribute" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="definesystemattribute" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -48,51 +48,51 @@ </cd:arguments> </cd:command> - <cd:command name="newattribute" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="newattribute" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dosetattribute" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="dosetattribute" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="doresetattribute" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="doresetattribute" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dogetattribute" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="dogetattribute" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dogetattributeid" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="dogetattributeid" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetallattributes" category="attribute" level="system" file="attr-ini.mkiv"/> + <cd:command name="resetallattributes" level="system" category="attribute" file="attr-ini.mkiv"/> - <cd:command name="savecurrentattributes" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="savecurrentattributes" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="restorecurrentattributes" category="attribute" level="system" file="attr-ini.mkiv"> + <cd:command name="restorecurrentattributes" level="system" category="attribute" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="showattributes" category="attribute" level="document" file="attr-ini.mkiv"/> + <cd:command name="showattributes" level="document" category="attribute" file="attr-ini.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-backend.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-backend.xml index d0bdb485346..2ec8f422b2e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-backend.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-backend.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupbackend" level="style" catehory="pdf" file="back-ini.mkiv"> + <cd:command name="setupbackend" level="style" category="pdf" file="back-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="export"> @@ -86,4 +86,19 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="setupoutput" level="style" category="pdf" file="back-ini.mkxl"> + <cd:arguments> + <cd:keywords> + <cd:constant type="default"/> + <cd:constant type="pdf"/> + <cd:constant type="lua"/> + <cd:constant type="json"/> + <cd:constant type="js"/> + <cd:constant type="mps"/> + <cd:constant type="none"/> + <cd:constant type="empty"/> + </cd:keywords> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-background.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-background.xml index 6bdddbb1b16..b638e4a203b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-background.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-background.xml @@ -85,7 +85,7 @@ </cd:arguments> </cd:command> - <cd:command name="backgroundline" level="document" category="background colors" file="pack-bck.mkvi"> + <cd:command name="backgroundline" level="document" category="background" keywords="colors" file="pack-bck.mkvi"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> @@ -140,7 +140,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesomebackground" level="system" category="background conditional" file="page-bck.mkiv"> + <cd:command name="doifelsesomebackground" level="system" category="background" keywords="conditional" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -148,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomebackgroundelse" level="system" category="background conditional" file="page-bck.mkiv"> + <cd:command name="doifsomebackgroundelse" level="system" category="background" keywords="conditional" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -156,7 +156,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomebackground" level="system" category="background conditional" file="page-bck.mkiv"> + <cd:command name="doifsomebackground" level="system" category="background" keywords="conditional" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-bar.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-bar.xml index fb120d05b69..4f9bd9c3444 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-bar.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-bar.xml @@ -78,6 +78,10 @@ <cd:parameter name="right"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="repeat"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -127,106 +131,6 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="overbar" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="underbar" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="hiddenbar" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="overstrike" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="understrike" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="overbars" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="underbars" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="overstrikes" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="understrikes" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="underrandom" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="underrandoms" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="underdash" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="underdashes" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="underdot" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="underdots" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="nobar" level="document" category="rules" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - --> - <cd:command name="resetbar" level="style" category="rules" file="node-rul.mkiv"/> </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-blackrule.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-blackrule.xml index 0463f21ed30..84992ebc686 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-blackrule.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-blackrule.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupblackrules" level="style" category="rules colors" file="pack-mrl.mkiv"> + <cd:command name="setupblackrules" level="style" category="rules" keywords="colors" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -47,7 +47,7 @@ </cd:arguments> </cd:command> - <cd:command name="blackrule" level="document" category="rules colors" file="pack-mrl.mkiv"> + <cd:command name="blackrule" level="document" category="rules" keywords="colors" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="blackrules" level="document" category="rules colors" file="pack-mrl.mkiv"> + <cd:command name="blackrules" level="document" category="rules" keywords="colors" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> @@ -110,9 +110,26 @@ <cd:constant type="cd:text" prefix="type␣" method="none"/> <cd:constant type="cd:text" prefix="data␣" method="none"/> <cd:constant type="cd:text" prefix="name␣" method="none"/> + <cd:constant type="cd:dimension" prefix="radius␣" method="none"/> + <cd:constant type="cd:text" prefix="corner␣" method="none"/> + </cd:keywords> + <cd:delimiter name="relax"/> + </cd:arguments> + </cd:command> + + <cd:command name="autorule" level="style" category="rules" file="node-rul.mkiv"> + <cd:arguments> + <cd:keywords delimiters="none" list="yes"> + <cd:constant type="cd:dimension" prefix="width␣" method="none"/> + <cd:constant type="cd:dimension" prefix="height␣" method="none"/> + <cd:constant type="cd:dimension" prefix="depth␣" method="none"/> + <cd:constant type="cd:dimension" prefix="xoffset␣" method="none"/> + <cd:constant type="cd:dimension" prefix="yoffset␣" method="none"/> + <cd:constant type="cd:dimension" prefix="left␣" method="none"/> + <cd:constant type="cd:dimension" prefix="right␣" method="none"/> </cd:keywords> <cd:delimiter name="relax"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-bleed.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-bleed.xml index ee860b85f6f..f48b9d40c3e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-bleed.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-bleed.xml @@ -61,4 +61,4 @@ <cd:command name="bleedheight" level="style" category="graphics" file="pack-box.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-block.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-block.xml index 3416a96ee81..dbc64e8880d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-block.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-block.xml @@ -41,7 +41,7 @@ <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="align"> - <cd:resolve name="value-alignsimple"/> + <cd:inherit name="setupalign"/> </cd:parameter> <cd:parameter name="style"> <cd:resolve name="value-style"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-bookmark.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-bookmark.xml index 3dbfa34069c..4b02ab7d1a6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-bookmark.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-bookmark.xml @@ -76,4 +76,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml index 8c6c6c74a7a..b13c8c3abbf 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="doiftext" level="system" category="conditional" file="supp-box.mkiv"> + <cd:command name="doiftext" level="system" category="strings" keywords="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetext" level="system" category="conditional" file="supp-box.mkiv"> + <cd:command name="doifelsetext" level="system" category="strings" keywords="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftextelse" level="system" category="conditional" file="supp-box.mkiv"> + <cd:command name="doiftextelse" level="system" category="strings" keywords="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithnextbox" level="system" file="supp-box.mkiv"> + <cd:command name="dowithnextbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:csname/> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithnextboxcs" level="system" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcs" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -44,21 +44,21 @@ </cd:arguments> </cd:command> - <cd:command name="nextboxwd" level="system" file="supp-box.mkiv"/> + <cd:command name="nextboxwd" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="nextboxht" level="system" file="supp-box.mkiv"/> + <cd:command name="nextboxht" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="nextboxdp" level="system" file="supp-box.mkiv"/> + <cd:command name="nextboxdp" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="nextboxhtdp" level="system" file="supp-box.mkiv"/> + <cd:command name="nextboxhtdp" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="flushnextbox" level="system" file="supp-box.mkiv"/> + <cd:command name="flushnextbox" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="nextbox" level="system" file="supp-box.mkiv"/> + <cd:command name="nextbox" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="nextdepth" level="system" file="supp-box.mkiv"/> + <cd:command name="nextdepth" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="dowithnextboxcontent" level="system" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcontent" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -67,7 +67,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithnextboxcontentcs" level="system" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcontentcs" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -76,55 +76,55 @@ </cd:arguments> </cd:command> - <cd:command name="rlap" level="system" file="supp-box.mkiv"> + <cd:command name="rlap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="llap" level="system" file="supp-box.mkiv"> + <cd:command name="llap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="clap" level="system" file="supp-box.mkiv"> + <cd:command name="clap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="tlap" level="system" file="supp-box.mkiv"> + <cd:command name="tlap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="blap" level="system" file="supp-box.mkiv"> + <cd:command name="blap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="reshapebox" level="system" file="supp-box.mkiv"> + <cd:command name="reshapebox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="shapebox" type="environment" begin="beginof" end="endof" level="system" file="supp-box.mkiv"/> + <cd:command name="shapebox" type="environment" begin="beginof" end="endof" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="flushshapebox" level="system" file="supp-box.mkiv"/> + <cd:command name="flushshapebox" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="innerflushshapebox" level="system" file="supp-box.mkiv"/> + <cd:command name="innerflushshapebox" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="shapedhbox" level="system" file="supp-box.mkiv"> + <cd:command name="shapedhbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="processtokens" level="system" file="supp-box.mkiv"> + <cd:command name="processtokens" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -134,7 +134,7 @@ </cd:arguments> </cd:command> - <cd:command name="doboundtext" level="system" file="supp-box.mkiv"> + <cd:command name="doboundtext" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -142,7 +142,7 @@ </cd:arguments> </cd:command> - <cd:command name="limitatetext" level="system" file="supp-box.mkiv"> + <cd:command name="limitatetext" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:keywords delimiters="braces"> @@ -152,7 +152,7 @@ </cd:arguments> </cd:command> - <cd:command name="limitatetext" variant="list" level="system" file="supp-box.mkiv"> + <cd:command name="limitatetext" variant="list" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:keywords delimiters="braces" list="yes"> @@ -162,7 +162,7 @@ </cd:arguments> </cd:command> - <cd:command name="limitatefirstline" level="system" file="supp-box.mkiv"> + <cd:command name="limitatefirstline" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -170,159 +170,159 @@ </cd:arguments> </cd:command> - <cd:command name="processisolatedchars" level="system" file="supp-box.mkiv"> + <cd:command name="processisolatedchars" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processisolatedwords" level="system" file="supp-box.mkiv"> + <cd:command name="processisolatedwords" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="applytocharacters" level="system" file="supp-box.mkiv"> + <cd:command name="applytocharacters" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytowords" level="system" file="supp-box.mkiv"> + <cd:command name="applytowords" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringchar" level="system" file="supp-box.mkiv"> + <cd:command name="applytosplitstringchar" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringword" level="system" file="supp-box.mkiv"> + <cd:command name="applytosplitstringword" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringline" level="system" file="supp-box.mkiv"> + <cd:command name="applytosplitstringline" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringcharspaced" level="system" file="supp-box.mkiv"> + <cd:command name="applytosplitstringcharspaced" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringwordspaced" level="system" file="supp-box.mkiv"> + <cd:command name="applytosplitstringwordspaced" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringlinespaced" level="system" file="supp-box.mkiv"> + <cd:command name="applytosplitstringlinespaced" level="system" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="sbox" level="system" file="supp-box.mkiv"> + <cd:command name="sbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="linebox" level="system" file="supp-box.mkiv"> + <cd:command name="linebox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="shiftbox" level="system" file="supp-box.mkiv"> + <cd:command name="shiftbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:dimension/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hpackbox" level="system" file="supp-box.mkiv"> + <cd:command name="hpackbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:dimension/> </cd:arguments> </cd:command> - <cd:command name="vpackbox" level="system" file="supp-box.mkiv"> + <cd:command name="vpackbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:dimension/> </cd:arguments> </cd:command> - <cd:command name="hpackedbox" level="system" file="supp-box.mkiv"> + <cd:command name="hpackedbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:dimension/> </cd:arguments> </cd:command> - <cd:command name="vpackedbox" level="system" file="supp-box.mkiv"> + <cd:command name="vpackedbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:dimension/> </cd:arguments> </cd:command> - <cd:command name="inlinedbox" level="system" file="supp-box.mkiv"> + <cd:command name="inlinedbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="struttedbox" level="system" file="supp-box.mkiv"> + <cd:command name="struttedbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="topskippedbox" level="system" file="supp-box.mkiv"> + <cd:command name="topskippedbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centeredbox" level="system" file="supp-box.mkiv"> + <cd:command name="centeredbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centerednextbox" level="system" file="supp-box.mkiv"> + <cd:command name="centerednextbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centerbox" level="system" file="supp-box.mkiv"> + <cd:command name="centerbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setrigidcolumnhsize" level="system" file="supp-box.mkiv"> + <cd:command name="setrigidcolumnhsize" level="system" category="columns" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -330,21 +330,21 @@ </cd:arguments> </cd:command> - <cd:command name="setrigidcolumnbalance" level="system" file="supp-box.mkiv"> + <cd:command name="setrigidcolumnbalance" level="system" category="columns" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vboxtohbox" type="environment" level="system" file="supp-box.mkiv"/> + <cd:command name="vboxtohbox" type="environment" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="vboxtohboxseparator" type="environment" level="system" file="supp-box.mkiv"/> + <cd:command name="vboxtohboxseparator" type="environment" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="convertvboxtohbox" level="system" file="supp-box.mkiv"/> + <cd:command name="convertvboxtohbox" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="hboxestohbox" type="environment" level="system" file="supp-box.mkiv"/> + <cd:command name="hboxestohbox" type="environment" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="unhhbox" level="system" file="supp-box.mkiv"> + <cd:command name="unhhbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:delimiter name="with"/> @@ -354,17 +354,17 @@ <!-- - <cd:command name="hhbox" level="system" file="supp-box.mkiv"/> + <cd:command name="hhbox" level="system" category="boxes" file="supp-box.mkiv"/> --> - <cd:command name="hboxofvbox" level="system" file="supp-box.mkiv"> + <cd:command name="hboxofvbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="doifcontent" level="system" file="supp-box.mkiv"> + <cd:command name="doifcontent" level="system" category="boxes" keywords="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -374,105 +374,105 @@ </cd:arguments> </cd:command> - <cd:command name="overlay" type="environment" level="system" file="supp-box.mkiv"/> + <cd:command name="overlay" type="environment" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="fakebox" level="system" file="supp-box.mkiv"> + <cd:command name="fakebox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="lbox" level="system" file="supp-box.mkiv"> + <cd:command name="lbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="cbox" level="system" file="supp-box.mkiv"> + <cd:command name="cbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rbox" level="system" file="supp-box.mkiv"> + <cd:command name="rbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ltop" level="system" file="supp-box.mkiv"> + <cd:command name="ltop" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ctop" level="system" file="supp-box.mkiv"> + <cd:command name="ctop" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rtop" level="system" file="supp-box.mkiv"> + <cd:command name="rtop" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="tbox" level="system" file="supp-box.mkiv"> + <cd:command name="tbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bbox" level="system" file="supp-box.mkiv"> + <cd:command name="bbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lhbox" level="system" file="supp-box.mkiv"> + <cd:command name="lhbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mhbox" level="system" file="supp-box.mkiv"> + <cd:command name="mhbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rhbox" level="system" file="supp-box.mkiv"> + <cd:command name="rhbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefthbox" level="system" file="supp-box.mkiv"> + <cd:command name="lefthbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="midhbox" level="system" file="supp-box.mkiv"> + <cd:command name="midhbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righthbox" level="system" file="supp-box.mkiv"> + <cd:command name="righthbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="boxofsize" level="system" file="supp-box.mkiv"> + <cd:command name="boxofsize" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none" list="yes" optional="yes"> @@ -482,7 +482,7 @@ </cd:arguments> </cd:command> - <cd:command name="limitatelines" level="system" file="supp-box.mkiv"> + <cd:command name="limitatelines" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-command"/> @@ -490,117 +490,117 @@ </cd:arguments> </cd:command> - <cd:command name="fittopbaselinegrid" level="system" file="supp-box.mkiv"> + <cd:command name="fittopbaselinegrid" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="boxcursor" level="system" file="supp-box.mkiv"/> + <cd:command name="boxcursor" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="placedbox" level="system" file="supp-box.mkiv"> + <cd:command name="placedbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightbox" level="system" file="supp-box.mkiv"> + <cd:command name="rightbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftbox" level="system" file="supp-box.mkiv"> + <cd:command name="leftbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="topbox" level="system" file="supp-box.mkiv"> + <cd:command name="topbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bottombox" level="system" file="supp-box.mkiv"> + <cd:command name="bottombox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttopbox" level="system" file="supp-box.mkiv"> + <cd:command name="lefttopbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righttopbox" level="system" file="supp-box.mkiv"> + <cd:command name="righttopbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftbottombox" level="system" file="supp-box.mkiv"> + <cd:command name="leftbottombox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightbottombox" level="system" file="supp-box.mkiv"> + <cd:command name="rightbottombox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="topleftbox" level="system" file="supp-box.mkiv"> + <cd:command name="topleftbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="toprightbox" level="system" file="supp-box.mkiv"> + <cd:command name="toprightbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bottomleftbox" level="system" file="supp-box.mkiv"> + <cd:command name="bottomleftbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bottomrightbox" level="system" file="supp-box.mkiv"> + <cd:command name="bottomrightbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="middlebox" level="system" file="supp-box.mkiv"> + <cd:command name="middlebox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="baselinemiddlebox" level="system" file="supp-box.mkiv"> + <cd:command name="baselinemiddlebox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="baselineleftbox" level="system" file="supp-box.mkiv"> + <cd:command name="baselineleftbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="baselinerightbox" level="system" file="supp-box.mkiv"> + <cd:command name="baselinerightbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lrtbbox" level="system" file="supp-box.mkiv"> + <cd:command name="lrtbbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -610,13 +610,13 @@ </cd:arguments> </cd:command> - <cd:command name="toplinebox" level="system" file="supp-box.mkiv"> + <cd:command name="toplinebox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setstackbox" level="system" file="supp-box.mkiv"> + <cd:command name="setstackbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -624,13 +624,13 @@ </cd:arguments> </cd:command> - <cd:command name="initializeboxstack" level="system" file="supp-box.mkiv"> + <cd:command name="initializeboxstack" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="savebox" level="system" file="supp-box.mkiv"> + <cd:command name="savebox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -638,28 +638,28 @@ </cd:arguments> </cd:command> - <cd:command name="flushbox" level="system" file="supp-box.mkiv"> + <cd:command name="flushbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="restorebox" level="system" file="supp-box.mkiv"> + <cd:command name="restorebox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="foundbox" level="system" file="supp-box.mkiv"> + <cd:command name="foundbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsebox" level="system" category="conditional" file="supp-box.mkiv"> + <cd:command name="doifelsebox" level="system" category="boxes" keywords="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -668,7 +668,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifboxelse" level="system" category="conditional" file="supp-box.mkiv"> + <cd:command name="doifboxelse" level="system" category="boxes" keywords="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -677,51 +677,51 @@ </cd:arguments> </cd:command> - <cd:command name="localpushbox" level="system" file="supp-box.mkiv"> + <cd:command name="localpushbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="localpopbox" level="system" file="supp-box.mkiv"> + <cd:command name="localpopbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="globalpushbox" level="system" file="supp-box.mkiv"> + <cd:command name="globalpushbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="globalpopbox" level="system" file="supp-box.mkiv"> + <cd:command name="globalpopbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="removedepth" level="system" file="supp-box.mkiv"/> + <cd:command name="removedepth" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="obeydepth" level="system" file="supp-box.mkiv"/> + <cd:command name="obeydepth" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="undepthed" level="system" file="supp-box.mkiv"> + <cd:command name="undepthed" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="removebottomthings" level="system" file="supp-box.mkiv"/> + <cd:command name="removebottomthings" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="removelastskip" level="system" file="supp-box.mkiv"/> + <cd:command name="removelastskip" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="makestrutofbox" level="system" file="supp-box.mkiv"> + <cd:command name="makestrutofbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="raisebox" level="system" file="supp-box.mkiv"> + <cd:command name="raisebox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> @@ -729,7 +729,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowerbox" level="system" file="supp-box.mkiv"> + <cd:command name="lowerbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> @@ -737,213 +737,213 @@ </cd:arguments> </cd:command> - <cd:command name="halfwaybox" level="system" file="supp-box.mkiv"> + <cd:command name="halfwaybox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="depthonlybox" level="system" file="supp-box.mkiv"> + <cd:command name="depthonlybox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalhbox" level="system" file="supp-dir.mkiv"> + <cd:command name="naturalhbox" level="system" category="boxes" 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-dir.mkiv"> + <cd:command name="naturalvbox" level="system" category="boxes" 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-dir.mkiv"> + <cd:command name="naturalvtop" level="system" category="boxes" file="supp-dir.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvcenter" level="system" file="supp-box.mkiv"> + <cd:command name="naturalvcenter" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalhpack" level="system" file="supp-dir.mkiv"> + <cd:command name="naturalhpack" level="system" category="boxes" 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-dir.mkiv"> + <cd:command name="naturalvpack" level="system" category="boxes" 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:command name="naturaltpack" level="system" category="boxes" 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:command name="reversehbox" level="system" category="boxes" 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:command name="reversevbox" level="system" category="boxes" 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:command name="reversevtop" level="system" category="boxes" 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:command name="reversehpack" level="system" category="boxes" 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:command name="reversevpack" level="system" category="boxes" 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:command name="reversetpack" level="system" category="boxes" file="supp-dir.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="frozenhbox" level="system" file="supp-box.mkiv"> + <cd:command name="frozenhbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setboxllx" level="system" file="supp-box.mkiv"> + <cd:command name="setboxllx" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setboxlly" level="system" file="supp-box.mkiv"> + <cd:command name="setboxlly" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="gsetboxllx" level="system" file="supp-box.mkiv"> + <cd:command name="gsetboxllx" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="gsetboxlly" level="system" file="supp-box.mkiv"> + <cd:command name="gsetboxlly" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getboxllx" level="system" file="supp-box.mkiv"> + <cd:command name="getboxllx" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="getboxlly" level="system" file="supp-box.mkiv"> + <cd:command name="getboxlly" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="directgetboxllx" level="system" file="supp-box.mkiv"> + <cd:command name="directgetboxllx" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="directgetboxlly" level="system" file="supp-box.mkiv"> + <cd:command name="directgetboxlly" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="shownextbox" level="system" file="supp-box.mkiv"> + <cd:command name="shownextbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="spreadhbox" level="system" file="supp-box.mkiv"> + <cd:command name="spreadhbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="minimalhbox" level="system" file="supp-box.mkiv"> + <cd:command name="minimalhbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="nodetostring" level="system" file="supp-box.mkiv"> + <cd:command name="nodetostring" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getnaturaldimensions" level="system" file="supp-box.mkiv"> + <cd:command name="getnaturaldimensions" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="lastnaturalboxwd" level="system" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxwd" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="lastnaturalboxht" level="system" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxht" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="lastnaturalboxdp" level="system" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxdp" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="naturalwd" level="system" file="supp-box.mkiv"> + <cd:command name="naturalwd" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="doifelserighttoleftinbox" level="system" category="conditional" file="supp-box.mkiv"> + <cd:command name="doifelserighttoleftinbox" level="system" category="boxes" keywords="conditional direction" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-true"/> @@ -951,7 +951,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifrighttoleftinboxelse" level="system" category="conditional" file="supp-box.mkiv"> + <cd:command name="doifrighttoleftinboxelse" level="system" category="boxes" keywords="conditional direction" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-true"/> @@ -959,209 +959,209 @@ </cd:arguments> </cd:command> - <cd:command name="runninghbox" level="system" file="supp-box.mkiv"> + <cd:command name="runninghbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vbox" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> + <cd:command name="vbox" type="environment" begin="begin" end="end" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="hbox" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> + <cd:command name="hbox" type="environment" begin="begin" end="end" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="vtop" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> + <cd:command name="vtop" type="environment" begin="begin" end="end" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="setvboxregister" level="system" file="supp-box.mkiv"> + <cd:command name="setvboxregister" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="sethboxregister" level="system" file="supp-box.mkiv"> + <cd:command name="sethboxregister" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setvtopregister" level="system" file="supp-box.mkiv"> + <cd:command name="setvtopregister" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="flushboxregister" level="system" file="supp-box.mkiv"> + <cd:command name="flushboxregister" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vboxregister" type="environment" level="system" file="supp-box.mkiv"> + <cd:command name="vboxregister" type="environment" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hboxregister" type="environment" level="system" file="supp-box.mkiv"> + <cd:command name="hboxregister" type="environment" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vtopregister" type="environment" level="system" file="supp-box.mkiv"> + <cd:command name="vtopregister" type="environment" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="righttolefthbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="righttolefthbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rtlhbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="rtlhbox" level="system" category="boxes" keywords="direction" 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:command name="lefttorighthbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ltrhbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="ltrhbox" level="system" category="boxes" keywords="direction" 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:command name="righttoleftvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rtlvbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="rtlvbox" level="system" category="boxes" keywords="direction" 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:command name="lefttorightvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ltrvbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="ltrvbox" level="system" category="boxes" keywords="direction" 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:command name="righttoleftvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rtlvtop" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="rtlvtop" level="system" category="boxes" keywords="direction" 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:command name="lefttorightvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ltrvtop" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="ltrvtop" level="system" category="boxes" keywords="direction" 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:command name="autodirhbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirvbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="autodirvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirvtop" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="autodirvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrighthbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="leftorrighthbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrightvbox" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="leftorrightvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrightvtop" level="system" category="alignment" file="spac-ali.mkiv"> + <cd:command name="leftorrightvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ibox" level="system" file="spac-ali.mkiv"> + <cd:command name="ibox" level="system" category="boxes" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="obox" level="system" file="spac-ali.mkiv"> + <cd:command name="obox" level="system" category="boxes" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definehbox" level="system" file="spac-ali.mkiv"> + <cd:command name="definehbox" level="system" category="boxes" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="hbox" generated="yes" variant="example" level="system" file="spac-ali.mkiv"> + <cd:command name="hbox" generated="yes" variant="example" level="system" category="boxes" file="spac-ali.mkiv"> <cd:sequence> <cd:string value="hbox"/> <cd:variable value="box"/> @@ -1171,9 +1171,9 @@ </cd:arguments> </cd:command> - <cd:command name="lastlinewidth" level="system" file="supp-box.mkiv"/> + <cd:command name="lastlinewidth" level="system" category="boxes" file="supp-box.mkiv"/> - <cd:command name="putboxincache" level="system" file="supp-box.mkiv"> + <cd:command name="putboxincache" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -1184,7 +1184,7 @@ </cd:arguments> </cd:command> - <cd:command name="getboxfromcache" level="system" file="supp-box.mkiv"> + <cd:command name="getboxfromcache" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -1195,7 +1195,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseboxincache" level="system" category="conditional" file="supp-box.mkiv"> + <cd:command name="doifelseboxincache" level="system" category="boxes" keywords="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -1207,7 +1207,7 @@ </cd:arguments> </cd:command> - <cd:command name="copyboxfromcache" level="system" file="supp-box.mkiv"> + <cd:command name="copyboxfromcache" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -1218,7 +1218,7 @@ </cd:arguments> </cd:command> - <cd:command name="directboxfromcache" level="system" file="supp-box.mkiv"> + <cd:command name="directboxfromcache" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -1228,7 +1228,7 @@ </cd:arguments> </cd:command> - <cd:command name="directcopyboxfromcache" level="system" file="supp-box.mkiv"> + <cd:command name="directcopyboxfromcache" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -1238,13 +1238,13 @@ </cd:arguments> </cd:command> - <cd:command name="resetboxesincache" level="system" file="supp-box.mkiv"> + <cd:command name="resetboxesincache" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="putnextboxincache" level="system" file="supp-box.mkiv"> + <cd:command name="putnextboxincache" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -1256,4 +1256,10 @@ </cd:arguments> </cd:command> + <cd:command name="reversevboxcontent" level="system" category="boxes" file="supp-box.lmt"> + <cd:arguments> + <cd:resolve name="string-box"/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-buffer.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-buffer.xml index f08cb8ca447..451c93c7e2c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-buffer.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-buffer.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="doifelsebuffer" level="system" category="buffer conditional" file="buff-ini.mkiv"> + <cd:command name="doifelsebuffer" level="system" category="buffer" keywords="conditional" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-true"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifbufferelse" level="system" category="buffer conditional" file="buff-ini.mkiv"> + <cd:command name="doifbufferelse" level="system" category="buffer" keywords="conditional" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-true"/> @@ -117,12 +117,6 @@ </cd:sequence> </cd:command> - <!-- - - <cd:command name="hiding" type="environment" level="document" category="buffer" file="buff-ini.mkiv"/> - - --> - <cd:command name="processtexbuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:sequence> <cd:string value="processTEXbuffer"/> @@ -156,7 +150,7 @@ </cd:arguments> </cd:command> - <cd:command name="ctxluabuffer" level="style" category="buffer lua" file="buff-ini.mkiv"> + <cd:command name="ctxluabuffer" level="style" category="buffer" keywords="lua" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> @@ -174,7 +168,7 @@ </cd:arguments> </cd:command> - <cd:command name="typebuffer" level="document" category="buffer verbatim" file="buff-ver.mkiv"> + <cd:command name="typebuffer" level="document" category="buffer" keywords="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> <cd:assignments list="yes" optional="yes"> @@ -183,7 +177,7 @@ </cd:arguments> </cd:command> - <cd:command name="typebuffer" generated="yes" variant="instance" level="document" category="buffer verbatim" file="buff-ver.mkiv"> + <cd:command name="typebuffer" generated="yes" variant="instance" level="document" category="buffer" keywords="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:string value="type"/> <cd:instance value="buffer"/> @@ -195,7 +189,7 @@ </cd:arguments> </cd:command> - <cd:command name="typedefinedbuffer" level="system" category="buffer verbatim" file="buff-ver.mkiv"> + <cd:command name="typedefinedbuffer" level="system" category="buffer" keywords="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer"/> <cd:assignments list="yes" optional="yes"> @@ -204,7 +198,7 @@ </cd:arguments> </cd:command> - <cd:command name="prettyprintbuffer" level="style" category="buffer verbatim" file="lxml-ini.mkiv"> + <cd:command name="prettyprintbuffer" level="style" category="buffer" keywords="verbatim" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:keywords delimiters="braces"> @@ -213,7 +207,7 @@ </cd:arguments> </cd:command> - <cd:command name="inlineprettyprintbuffer" level="style" category="buffer verbatim" file="lxml-ini.mkiv"> + <cd:command name="inlineprettyprintbuffer" level="style" category="buffer" keywords="verbatim" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:keywords delimiters="braces"> @@ -222,7 +216,7 @@ </cd:arguments> </cd:command> - <cd:command name="typeinlinebuffer" level="style" category="buffer verbatim" file="buff-ver.mkiv"> + <cd:command name="typeinlinebuffer" level="style" category="buffer" keywords="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> <cd:assignments list="yes" optional="yes"> @@ -231,4 +225,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-button.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-button.xml index d7228c9496a..180738b79f8 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-button.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-button.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definebutton" level="style" catehory="pdf" file="scrn-but.mkvi"> + <cd:command name="definebutton" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbutton" level="style" catehory="pdf" file="scrn-but.mkvi"> + <cd:command name="setupbutton" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -49,7 +49,7 @@ <!-- - <cd:command name="setupbuttons" level="style" catehory="pdf" file="scrn-but.mkvi"> + <cd:command name="setupbuttons" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -60,7 +60,7 @@ --> - <cd:command name="button" generated="yes" variant="example" level="document" catehory="pdf" file="scrn-but.mkvi"> + <cd:command name="button" generated="yes" variant="example" level="document" category="pdf" file="scrn-but.mkvi"> <cd:sequence> <cd:variable value="button"/> </cd:sequence> @@ -76,7 +76,7 @@ </cd:instances> </cd:command> - <cd:command name="button" level="document" catehory="pdf" file="scrn-but.mkvi"> + <cd:command name="button" level="document" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbutton"/> @@ -86,32 +86,32 @@ </cd:arguments> </cd:command> - <cd:command name="overlaybutton" level="style" catehory="pdf" file="scrn-but.mkvi"> + <cd:command name="overlaybutton" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="overlaybutton" variant="direct" level="style" catehory="pdf" file="scrn-but.mkvi"> + <cd:command name="overlaybutton" variant="direct" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="MPmenubuttons" level="style" catehory="pdf" file="scrn-but.mkvi"> + <cd:command name="MPmenubuttons" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="overlayrollbutton" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="overlayrollbutton" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="definepushbutton" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="definepushbutton" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -120,14 +120,14 @@ </cd:arguments> </cd:command> - <cd:command name="pushbutton" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="pushbutton" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="definepushsymbol" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="definepushsymbol" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -140,7 +140,7 @@ <!-- - <cd:command name="psh" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="psh" scope="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -148,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="psh" type="environment" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="psh" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> @@ -156,7 +156,7 @@ --> - <cd:command name="rollbutton" variant="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="rollbutton" variant="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -167,7 +167,7 @@ </cd:arguments> </cd:command> - <cd:command name="rollbutton" variant="button" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="rollbutton" variant="button" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -179,7 +179,7 @@ <!-- - <cd:command name="rob" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="rob" scope="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -187,7 +187,7 @@ </cd:arguments> </cd:command> - <cd:command name="rob" type="environment" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> + <cd:command name="rob" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml index 6115b1519ba..03d8d7f8bab 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml @@ -223,4 +223,4 @@ <cd:command name="randomized" type="environment" level="document" category="fonts" file="typo-cap.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-catcodes.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-catcodes.xml index 351e8f6e4bd..561cd9af675 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-catcodes.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-catcodes.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="texcode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/> + <cd:command name="texcode" type="environment" level="system" category="catcode" file="catc-ctx.mkxl"/> <cd:command name="contextcode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/> @@ -120,4 +120,12 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="asciimode" level="document" category="catcode" file="math-ini.mkxl"/> + + <cd:command name="enableasciimode" level="document" category="catcode" file="math-ini.mkxl"/> + + <cd:command name="asciimode" type="environment" level="document" category="catcode" file="math-ini.mkxl"/> + + <cd:command name="literalmode" level="document" category="catcode" file="buff-ver.mkiv"/> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-character.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-character.xml index 61d6a32a677..1c89a9fe3da 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-character.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-character.xml @@ -62,32 +62,32 @@ <cd:command name="letterexclamationmark" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="utfchar" level="document" category="characters fonts" file="char-ini.mkiv"> + <cd:command name="utfchar" level="document" category="characters" keywords="fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="safechar" level="style" category="characters fonts" file="char-ini.mkiv"> + <cd:command name="safechar" level="style" category="characters" keywords="fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="checkedchar" level="style" category="characters fonts" file="char-ini.mkiv"> + <cd:command name="checkedchar" level="style" category="characters" keywords="fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="textormathchar" level="style" category="characters fonts" file="char-ini.mkiv"> + <cd:command name="textormathchar" level="style" category="characters" keywords="fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="textormathchars" level="style" category="characters fonts" file="char-ini.mkiv"> + <cd:command name="textormathchars" level="style" category="characters" keywords="fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-characteralign.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-characteralign.xml index b95ff8487b3..2f5b85e2ebe 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-characteralign.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-characteralign.xml @@ -41,7 +41,7 @@ <cd:command name="alignmentcharacter" level="system" category="alignment" file="typo-tal.mkiv"/> - <cd:command name="characteralign" type="environment" category="alignment" level="system" file="typo-tal.mkiv"> + <cd:command name="characteralign" type="environment" level="system" category="alignment" file="typo-tal.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacteralign"/> @@ -49,7 +49,7 @@ </cd:arguments> </cd:command> - <cd:command name="characteralign" type="environment" variant="argument" category="alignment" level="system" file="typo-tal.mkiv"> + <cd:command name="characteralign" type="environment" variant="argument" level="system" category="alignment" file="typo-tal.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -93,4 +93,4 @@ <cd:command name="setsecondpasscharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-characterspacing.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-characterspacing.xml index 0247115a36d..6c43db07617 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-characterspacing.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-characterspacing.xml @@ -40,4 +40,4 @@ <cd:command name="resetcharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-characterstripping.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-characterstripping.xml index 5c776e3ab3e..ee9750f3ef0 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-characterstripping.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-characterstripping.xml @@ -17,4 +17,4 @@ <cd:command name="forcecharacterstripping" level="style" category="language" file="typo-rep.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml index 43672efa043..d91e23cb27c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="setupFLOWchart" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWchart" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -96,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWcharts" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWcharts" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -107,7 +107,7 @@ --> - <cd:command name="setupFLOWcharts" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWcharts" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -202,7 +202,7 @@ </cd:command> <!-- - <cd:command name="setupFLOWline" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWline" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -234,7 +234,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWlines" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWlines" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -245,7 +245,7 @@ --> - <cd:command name="setupFLOWlines" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWlines" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="corner"> @@ -278,7 +278,7 @@ <!-- - <cd:command name="setupFLOWshape" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWshape" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -298,7 +298,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWshapes" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWshapes" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -309,7 +309,7 @@ --> - <cd:command name="setupFLOWshapes" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWshapes" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="default"> @@ -328,7 +328,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWfocus" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWfocus" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -345,7 +345,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWsplit" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="setupFLOWsplit" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -374,20 +374,20 @@ </cd:arguments> </cd:command> - <cd:command name="FLOWchart" type="environment" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="FLOWchart" type="environment" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="defineFLOWchart" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="defineFLOWchart" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="FLOWcell" type="environment" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="FLOWcell" type="environment" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupFLOWshape"/> @@ -398,7 +398,7 @@ </cd:arguments> </cd:command> - <cd:command name="FLOWchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="FLOWchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -407,7 +407,7 @@ </cd:arguments> </cd:command> - <cd:command name="FLOWcharts" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="FLOWcharts" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -416,13 +416,13 @@ </cd:arguments> </cd:command> - <cd:command name="name" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="name" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="shape" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="shape" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-flowshape"/> @@ -430,25 +430,25 @@ </cd:arguments> </cd:command> - <cd:command name="destination" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="destination" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="focus" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="focus" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="overlay" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="overlay" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="location" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="location" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="-"/> @@ -458,7 +458,7 @@ </cd:arguments> </cd:command> - <cd:command name="figure" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="figure" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -467,7 +467,7 @@ </cd:arguments> </cd:command> - <cd:command name="text" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="text" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-chartlabel"/> @@ -476,7 +476,7 @@ </cd:arguments> </cd:command> - <cd:command name="label" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="label" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-chartlabel"/> @@ -485,7 +485,7 @@ </cd:arguments> </cd:command> - <cd:command name="comment" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="comment" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-chartlabel"/> @@ -494,7 +494,7 @@ </cd:arguments> </cd:command> - <cd:command name="exit" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="exit" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-chartlabel"/> @@ -503,7 +503,7 @@ </cd:arguments> </cd:command> - <cd:command name="connection" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="connection" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -527,7 +527,7 @@ </cd:arguments> </cd:command> - <cd:command name="include" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:command name="include" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -541,4 +541,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-charwidth.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-charwidth.xml index dc19713f3d0..14d5d71edc2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-charwidth.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-charwidth.xml @@ -14,4 +14,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-chemical.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-chemical.xml index a2df03edebd..5b3ca602a10 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-chemical.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-chemical.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="molecule" level="document" file="chem-ini.mkiv"> + <cd:command name="molecule" level="document" category="symbols" file="chem-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="chem" level="document" file="chem-ini.mkiv"> + <cd:command name="chem" level="document" category="symbols" file="chem-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -252,4 +252,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-cleaning.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-cleaning.xml index dd54fdacc3a..f3237229797 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-cleaning.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-cleaning.xml @@ -4,11 +4,11 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="punctuation" type="environment" begin="push" end="pop" level="system" file="typo-chr.mkiv"/> + <cd:command name="punctuation" type="environment" begin="push" end="pop" level="system" category="language" file="typo-chr.mkiv"/> - <cd:command name="removepunctuation" level="system" file="typo-chr.mkiv"/> + <cd:command name="removepunctuation" level="system" category="language" file="typo-chr.mkiv"/> - <cd:command name="markcontent" level="system" file="typo-chr.mkiv"> + <cd:command name="markcontent" level="system" category="language" file="typo-chr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -19,7 +19,7 @@ </cd:arguments> </cd:command> - <cd:command name="markedcontent" type="environment" level="system" file="typo-chr.mkiv"> + <cd:command name="markedcontent" type="environment" level="system" category="language" file="typo-chr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -29,13 +29,21 @@ </cd:arguments> </cd:command> - <cd:command name="removemarkedcontent" level="system" file="typo-chr.mkiv"> + <cd:command name="removemarkedcontent" level="system" category="language" file="typo-chr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setcharactercleaning" level="system" file="typo-cln.mkiv"> + <cd:command name="doifelsemarkedcontent" level="system" category="language" keywords="conditional" file="typo-chr.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="setcharactercleaning" level="system" category="language" file="typo-cln.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-clipping.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-clipping.xml index c823b102d0c..2eda483b601 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-clipping.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-clipping.xml @@ -75,4 +75,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-collector.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-collector.xml index 6642e6980bf..8531d400958 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-collector.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-collector.xml @@ -111,4 +111,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-color.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-color.xml index 4dd76d0b3af..09dd21563a7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-color.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-color.xml @@ -73,6 +73,9 @@ <cd:parameter name="v"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="w"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="x"> <cd:constant type="cd:number"/> </cd:parameter> @@ -432,7 +435,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecolor" level="system" category="colors conditional" file="color-ini.mkiv"> + <cd:command name="doifelsecolor" level="system" category="colors" keywords="conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -440,7 +443,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcolorelse" level="system" category="colors conditional" file="color-ini.mkiv"> + <cd:command name="doifcolorelse" level="system" category="colors" keywords="conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -448,7 +451,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcolor" level="system" category="colors conditional" file="color-ini.mkiv"> + <cd:command name="doifcolor" level="system" category="colors" keywords="conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -515,7 +518,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseblack" level="system" category="colors conditional" file="colo-ini.mkiv"> + <cd:command name="doifelseblack" level="system" category="colors" keywords="conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -523,7 +526,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifblackelse" level="system" category="colors conditional" file="colo-ini.mkiv"> + <cd:command name="doifblackelse" level="system" category="colors" keywords="conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -531,14 +534,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedrawingblack" level="system" category="colors conditional" file="colo-ini.mkiv"> + <cd:command name="doifelsedrawingblack" level="system" category="colors" keywords="conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifdrawingblackelse" level="system" category="colors conditional" file="colo-ini.mkiv"> + <cd:command name="doifdrawingblackelse" level="system" category="colors" keywords="conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> @@ -607,4 +610,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml index aa290a0a959..9890ec46f2c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml @@ -4,8 +4,19 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupcolumns" level="style" category="columns" file="page-mul.mkiv"> + <cd:command name="definemulticolumns" level="style" category="tables" file="page-mcl.mkxl"> <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments optional="yes" list="yes"> + <cd:inherit name="setupmulticolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupmulticolumns" level="style" category="columns" file="page-mcl.mkxl"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="n"> <cd:constant type="cd:number"/> @@ -13,99 +24,33 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> - <cd:parameter name="option"> - <cd:constant type="background"/> - </cd:parameter> - <cd:parameter name="offset"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="command"> - <cd:constant type="cd:oneargument"/> - </cd:parameter> - <cd:parameter name="height"> - <cd:constant type="cd:dimension"/> - </cd:parameter> <cd:parameter name="direction"> - <cd:constant type="left"/> <cd:constant type="right" default="yes"/> + <cd:constant type="reverse"/> </cd:parameter> <cd:parameter name="balance"> <cd:constant type="yes" default="yes"/> <cd:constant type="no"/> </cd:parameter> - <cd:parameter name="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> - <cd:parameter name="tolerance"> - <cd:inherit name="setuptolerance"/> - </cd:parameter> <cd:parameter name="blank"> <cd:inherit name="blank"/> </cd:parameter> - <cd:parameter name="ntop"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="rule"> - <cd:constant type="on"/> - <cd:constant type="off" default="yes"/> - <cd:constant type="cd:command"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="columns" type="environment" level="document" category="columns" file="page-mul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcolumns"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="setupcolumnspan" level="style" category="columns" file="page-mul.mkiv"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:inherit name="setupframed"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="columnspan" type="environment" level="document" category="columns" file="page-mul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcolumnspan"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="setsimplecolumnshsize" level="system" category="columns" file="page-mul.mkiv"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="width"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> </cd:parameter> - <cd:parameter name="lines"> + <cd:parameter name="ntop"> <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="simplecolumns" type="environment" level="system" category="columns" file="page-mul.mkiv"> + <cd:command name="multicolumns" type="environment" level="document" category="tables" file="page-mcl.mkxl"> <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setsimplecolumnshsize"/> + <cd:assignments optional="yes" list="yes"> + <cd:inherit name="setupmulticolumns"/> </cd:assignments> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-combination.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-combination.xml index bd732c264c9..2a42e78734b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-combination.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-combination.xml @@ -111,7 +111,7 @@ --> - <cd:command name="floatcombination" type="environment" variant="matrix" level="document" category="float tables" file="pack-com.mkiv"> + <cd:command name="floatcombination" type="environment" variant="matrix" level="document" category="tables" keywords="float" file="pack-com.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:matrix"/> @@ -120,7 +120,7 @@ </cd:arguments> </cd:command> - <cd:command name="floatcombination" type="environment" level="document" category="float tables" file="pack-com.mkiv"> + <cd:command name="floatcombination" type="environment" level="document" category="tables" keywords="float" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcombination"/> @@ -128,4 +128,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-commandhandler.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-commandhandler.xml index 6accac8657b..b16da06b538 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-commandhandler.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-commandhandler.xml @@ -4,42 +4,42 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="installparameterhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installparameterhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installrootparameterhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installrootparameterhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installparameterhashhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installparameterhashhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installparametersethandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installparametersethandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installstyleandcolorhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installstyleandcolorhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdefinehandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installdefinehandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -47,35 +47,35 @@ </cd:arguments> </cd:command> - <cd:command name="installsetuphandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installsetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installswitchsetuphandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installswitchsetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installautosetuphandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installautosetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installbasicparameterhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installbasicparameterhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installbasicautosetuphandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installbasicautosetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -83,7 +83,7 @@ </cd:arguments> </cd:command> - <cd:command name="installcommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installcommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -91,7 +91,7 @@ </cd:arguments> </cd:command> - <cd:command name="installswitchcommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installswitchcommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -99,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="installautocommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installautocommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -107,7 +107,7 @@ </cd:arguments> </cd:command> - <cd:command name="installsimplecommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installsimplecommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -115,49 +115,49 @@ </cd:arguments> </cd:command> - <cd:command name="installdirectparameterhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installdirectparameterhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectsetuphandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installdirectsetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectparametersethandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installdirectparametersethandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectstyleandcolorhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installdirectstyleandcolorhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectcommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installdirectcommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installsetuponlycommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installsetuponlycommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="relateparameterhandlers" level="system" file="mult-aux.mkiv"> + <cd:command name="relateparameterhandlers" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -166,25 +166,25 @@ </cd:arguments> </cd:command> - <cd:command name="installactionhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="installactionhandler" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installnamespace" level="system" file="mult-aux.mkiv"> + <cd:command name="installnamespace" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installcorenamespace" level="system" file="mult-aux.mkiv"> + <cd:command name="installcorenamespace" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definenamespace" level="system" file="mult-aux.mkiv"> + <cd:command name="definenamespace" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -221,16 +221,16 @@ </cd:arguments> </cd:command> - <cd:command name="listnamespaces" level="system" file="mult-aux.mkiv"/> + <cd:command name="listnamespaces" level="system" category="commandhandler" file="mult-aux.mkiv"/> - <cd:command name="showparentchain" level="system" file="mult-aux.mkiv"> + <cd:command name="showparentchain" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="doifelsecommandhandler" level="system" category="commandhandler" keywords="conditional" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -239,7 +239,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcommandhandlerelse" level="system" file="mult-aux.mkiv"> + <cd:command name="doifcommandhandlerelse" level="system" category="commandhandler" keywords="conditional" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -248,7 +248,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="doifcommandhandler" level="system" category="commandhandler" keywords="conditional" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -256,7 +256,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotcommandhandler" level="system" file="mult-aux.mkiv"> + <cd:command name="doifnotcommandhandler" level="system" category="commandhandler" keywords="conditional" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -264,14 +264,14 @@ </cd:arguments> </cd:command> - <cd:command name="installdefinitionset" level="system" file="mult-aux.mkiv"> + <cd:command name="installdefinitionset" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdefinitionsetmember" level="system" file="mult-aux.mkiv"> + <cd:command name="installdefinitionsetmember" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -280,14 +280,14 @@ </cd:arguments> </cd:command> - <cd:command name="installparentinjector" level="system" file="mult-aux.mkiv"> + <cd:command name="installparentinjector" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installframedcommandhandler" level="system" file="pack-rul.mkiv"> + <cd:command name="installframedcommandhandler" level="system" category="commandhandler" file="pack-rul.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -295,7 +295,7 @@ </cd:arguments> </cd:command> - <cd:command name="installframedautocommandhandler" level="system" file="pack-rul.mkiv"> + <cd:command name="installframedautocommandhandler" level="system" category="commandhandler" file="pack-rul.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -303,7 +303,7 @@ </cd:arguments> </cd:command> - <cd:command name="installsimpleframedcommandhandler" level="system" file="pack-rul.mkiv"> + <cd:command name="installsimpleframedcommandhandler" level="system" category="commandhandler" file="pack-rul.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -311,13 +311,13 @@ </cd:arguments> </cd:command> - <cd:command name="installmacrostack" level="system" file="mult-aux.mkiv"> + <cd:command name="installmacrostack" level="system" category="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="installglobalmacrostack" level="system" file="mult-aux.mkiv"> + <cd:command name="installglobalmacrostack" level="system" category="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-comment.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-comment.xml index a1eb14d23c1..e7349a69e32 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-comment.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-comment.xml @@ -130,27 +130,4 @@ <cd:command name="placecomments" level="document" category="pdf" file="scrn-wid.mkvi"/> - <!-- - - <cd:command name="comment" level="document" category="pdf" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-text-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcomment"/> - </cd:assignments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="comment" type="environment" level="document" category="pdf" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-text-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcomment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml index da821c516cc..c1b2f8cb3ff 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml @@ -554,4 +554,55 @@ </cd:keywords> </cd:define> -</cd:interface>
\ No newline at end of file + <!-- * --> + <!-- \... {...} --> + <!-- --> + <!-- * ORIENTATION --> + + <cd:define name="argument-orientation"> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-orientation"/> + </cd:keywords> + </cd:define> + + <!-- * --> + <!-- \... {...} --> + <!-- --> + <!-- * INSTANCE --> + + <cd:define name="argument-instance"> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-instance"/> + </cd:keywords> + </cd:define> + + <cd:define name="argument-instance-optional"> + <cd:keywords delimiters="braces" optional="yes"> + <cd:resolve name="value-instance"/> + </cd:keywords> + </cd:define> + + <cd:define name="argument-instance-list"> + <cd:keywords delimiters="braces" list="yes"> + <cd:resolve name="value-instance"/> + </cd:keywords> + </cd:define> + + <cd:define name="argument-instance-list-optional"> + <cd:keywords delimiters="braces" list="yes" optional="yes"> + <cd:resolve name="value-instance"/> + </cd:keywords> + </cd:define> + + <!-- * --> + <!-- \... {...} --> + <!-- --> + <!-- * URL --> + + <cd:define name="argument-url"> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:url"/> + </cd:keywords> + </cd:define> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-assignment.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-assignment.xml index 900a754523f..e5d219f0547 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-assignment.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-assignment.xml @@ -27,6 +27,9 @@ <cd:parameter name="ownnumber"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="placeholder"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> </cd:define> @@ -50,6 +53,9 @@ <cd:parameter name="ownnumber"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="placeholder"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> </cd:define> @@ -333,4 +339,4 @@ </cd:assignments> </cd:define> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-definitions.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-definitions.xml index 54e729aa4d0..9f6d461f9a7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-definitions.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-definitions.xml @@ -9,4 +9,4 @@ <cd:interfacefile filename="i-common-value.xml"/> <cd:interfacefile filename="i-common-instance.xml"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml index 3d4864de76e..07ca3ac15bd 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml @@ -182,6 +182,11 @@ <cd:define name="instance-mathmatrix"> <cd:constant value="matrix"/> <cd:constant value="mathmatrix"/> + <cd:constant value="thematrix"/> + </cd:define> + + <cd:define name="instance-simplematrix"> + <cd:constant value="thematrix"/> </cd:define> <cd:define name="instance-mixedcolumns"> @@ -385,7 +390,7 @@ <cd:constant value="overbracketunderbracket"/> </cd:define> - <cd:define name="instance-mathoverextensible"> + <cd:define name="instance-mathovertextextensible"> <!-- top --> <cd:constant value="overleftarrow"/> <cd:constant value="overrightarrow"/> @@ -408,7 +413,7 @@ <cd:constant value="overbrackettext"/> </cd:define> - <cd:define name="instance-mathunderextensible"> + <cd:define name="instance-mathundertextextensible"> <!-- bottom --> <cd:constant value="underleftarrow"/> <cd:constant value="underrightarrow"/> @@ -431,4 +436,4 @@ <cd:constant value="underbrackettext"/> </cd:define> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-keyword.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-keyword.xml index 8469dab2f85..d85325e3c58 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-keyword.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-keyword.xml @@ -809,4 +809,43 @@ </cd:keywords> </cd:define> -</cd:interface>
\ No newline at end of file + <!-- * --> + <!-- \... [...] --> + <!-- --> + <!-- * TRACKER --> + + <cd:define name="keyword-tracker-list"> + <cd:keywords list="yes"> + <cd:resolve name="value-tracker"/> + </cd:keywords> + </cd:define> + + <!-- * --> + <!-- \... [...] --> + <!-- --> + <!-- * DIRECTIVE --> + + <cd:define name="keyword-directive-list"> + <cd:keywords list="yes"> + <cd:resolve name="value-directive"/> + </cd:keywords> + </cd:define> + + <!-- * --> + <!-- \... [...] --> + <!-- --> + <!-- * DATE --> + + <cd:define name="keyword-date-list"> + <cd:keywords list="yes"> + <cd:resolve name="value-date"/> + </cd:keywords> + </cd:define> + + <cd:define name="keyword-date-list-optional"> + <cd:keywords list="yes" optional="yes"> + <cd:resolve name="value-date"/> + </cd:keywords> + </cd:define> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml index 0c0bb2ef356..abcd8a78fdc 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml @@ -191,4 +191,4 @@ </cd:keywords> </cd:define> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml index 253a03ccf2c..210320622c0 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml @@ -174,6 +174,7 @@ <cd:constant type="lastpage"/> <cd:constant type="start"/> <cd:constant type="stop"/> + <cd:constant type="xy"/> </cd:define> <!-- columnbreak = ... --> @@ -360,6 +361,8 @@ <cd:constant type="et"/> <cd:constant type="kr"/> <cd:constant type="jp"/> + <cd:constant type="he"/> + <cd:constant type="yi"/> --> <cd:constant type="cd:language"/> </cd:define> @@ -781,6 +784,8 @@ <cd:constant type="cd:name"/> </cd:define> + <!-- leftfence --> + <cd:define name="value-leftfence"> <!-- <cd:constant type="||"/> @@ -839,6 +844,8 @@ <cd:constant type="cd:character"/> </cd:define> + <!-- rightfence --> + <cd:define name="value-rightfence"> <!-- <cd:constant type="||"/> @@ -897,4 +904,737 @@ <cd:constant type="cd:character"/> </cd:define> + <!-- orientation --> + + <cd:define name="value-orientation"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:define> + + <!-- margindata --> + + <cd:define name="value-margindata"> + <cd:constant type="inleftmargin"/> + <cd:constant type="inrightmargin"/> + <cd:constant type="inoutermargin"/> + <cd:constant type="ininnermargin"/> + <cd:constant type="inleftedge"/> + <cd:constant type="inrightedge"/> + <cd:constant type="inouteredge"/> + <cd:constant type="ininneredge"/> + <cd:constant type="atleftmargin"/> + <cd:constant type="atrightmargin"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inouter"/> + <cd:constant type="ininner"/> + <cd:constant type="inmargin"/> + <cd:constant type="inother"/> + <cd:constant type="margintext"/> + <cd:constant type="cd:name"/> + </cd:define> + + <!-- instance --> + + <cd:define name="value-instance"> + <cd:constant type="metafun"/> + <cd:constant type="minifun"/> + <cd:constant type="extrafun"/> + <cd:constant type="lessfun"/> + <cd:constant type="doublefun"/> + <cd:constant type="binaryfun"/> + <cd:constant type="decimalfun"/> + <cd:constant type="mprun"/> + <cd:constant type="metapost"/> + <cd:constant type="nofun"/> + <cd:constant type="doublepost"/> + <cd:constant type="binarypost"/> + <cd:constant type="decimalpost"/> + <cd:constant type="simplefun"/> + </cd:define> + + <!-- date --> + + <cd:define name="value-date"> + <cd:constant type="year"/> + <cd:constant type="cd:name" prefix="year" method="range"/> + <cd:constant type="y"/> + <cd:constant type="cd:name" prefix="y" method="range"/> + <cd:constant type="yy"/> + <cd:constant type="Y"/> + <cd:constant type="cd:name" prefix="Y" method="range"/> + <cd:constant type="YY"/> + <cd:constant type="month"/> + <cd:constant type="month:mnem"/> + <cd:constant type="month:hebrew"/> + <cd:constant type="month:jalali"/> + <cd:constant type="m"/> + <cd:constant type="m:mnem"/> + <cd:constant type="m:hebrew"/> + <cd:constant type="m:jalali"/> + <cd:constant type="MONTH"/> + <cd:constant type="MONTH:mnem"/> + <cd:constant type="MONTH:hebrew"/> + <cd:constant type="MONTH:jalali"/> + <cd:constant type="mm"/> + <cd:constant type="M"/> + <cd:constant type="day"/> + <cd:constant type="cd:name" prefix="day" method="range"/> + <cd:constant type="day:+"/> + <cd:constant type="day:ord"/> + <cd:constant type="day:++"/> + <cd:constant type="day:highord"/> + <cd:constant type="d"/> + <cd:constant type="cd:name" prefix="d" method="range"/> + <cd:constant type="d:+"/> + <cd:constant type="d:ord"/> + <cd:constant type="d:++"/> + <cd:constant type="d:highord"/> + <cd:constant type="dd"/> + <cd:constant type="dd:+"/> + <cd:constant type="dd:ord"/> + <cd:constant type="dd:++"/> + <cd:constant type="dd:highord"/> + <cd:constant type="D"/> + <cd:constant type="D:+"/> + <cd:constant type="D:ord"/> + <cd:constant type="D:++"/> + <cd:constant type="D:highord"/> + <cd:constant type="weekday"/> + <cd:constant type="weekday:mnem"/> + <cd:constant type="weekday:hebrew"/> + <cd:constant type="weekday:jalali"/> + <cd:constant type="w"/> + <cd:constant type="w:mnem"/> + <cd:constant type="w:hebrew"/> + <cd:constant type="w:jalali"/> + <cd:constant type="WEEKDAY"/> + <cd:constant type="WEEKDAY:mnem"/> + <cd:constant type="WEEKDAY:hebrew"/> + <cd:constant type="WEEKDAY:jalali"/> + <cd:constant type="W"/> + <cd:constant type="referral"/> + <cd:constant type="space"/> + <cd:constant type="\␣"/> + <cd:constant type="cd:text"/> + <cd:constant type="hebrew:to"/> + <cd:constant type="jalali:to"/> + <cd:constant type="jalali:from"/> + </cd:define> + + <!-- tracker --> + + <cd:define name="value-tracker"> + <cd:constant type="afm.features"/> + <cd:constant type="afm.indexing"/> + <cd:constant type="afm.loading"/> + <cd:constant type="attachments.anchors"/> + <cd:constant type="backend"/> + <cd:constant type="backend.details"/> + <cd:constant type="backend.finalizers"/> + <cd:constant type="backend.format"/> + <cd:constant type="backend.info"/> + <cd:constant type="backend.objects"/> + <cd:constant type="backend.pdf.fonts"/> + <cd:constant type="backend.resources"/> + <cd:constant type="backend.spaces"/> + <cd:constant type="backend.swf"/> + <cd:constant type="backend.variables"/> + <cd:constant type="backend.xmp"/> + <cd:constant type="backends.fields"/> + <cd:constant type="backends.javascript"/> + <cd:constant type="backends.pdf.threshold"/> + <cd:constant type="backgrounds.alignments"/> + <cd:constant type="backgrounds.shapes"/> + <cd:constant type="backgrounds.shapes.free"/> + <cd:constant type="backgrounds.shapes.ranges"/> + <cd:constant type="btxrendering"/> + <cd:constant type="buffers.grab"/> + <cd:constant type="buffers.parallel"/> + <cd:constant type="buffers.run"/> + <cd:constant type="buffers.visualize"/> + <cd:constant type="builders.hpack.overflow"/> + <cd:constant type="builders.hpack.quality"/> + <cd:constant type="builders.page"/> + <cd:constant type="builders.paragraphs.adjusting"/> + <cd:constant type="builders.paragraphs.basic"/> + <cd:constant type="builders.paragraphs.expansion"/> + <cd:constant type="builders.paragraphs.expansion.both"/> + <cd:constant type="builders.paragraphs.expansion.verbose"/> + <cd:constant type="builders.paragraphs.lastlinefit"/> + <cd:constant type="builders.paragraphs.protruding"/> + <cd:constant type="builders.paragraphs.solutions.splitters.colors"/> + <cd:constant type="builders.paragraphs.solutions.splitters.optimizer"/> + <cd:constant type="builders.paragraphs.solutions.splitters.splitter"/> + <cd:constant type="builders.post"/> + <cd:constant type="builders.vbox"/> + <cd:constant type="builders.vpack.quality"/> + <cd:constant type="characters.defining"/> + <cd:constant type="chemistry.boundingbox"/> + <cd:constant type="chemistry.boxes"/> + <cd:constant type="chemistry.metapost"/> + <cd:constant type="chemistry.molecules"/> + <cd:constant type="chemistry.structure"/> + <cd:constant type="chemistry.textstack"/> + <cd:constant type="colors.define"/> + <cd:constant type="colors.pgf"/> + <cd:constant type="columnsets.cells"/> + <cd:constant type="columnsets.details"/> + <cd:constant type="columnsets.trace"/> + <cd:constant type="comments.anchors"/> + <cd:constant type="context.define"/> + <cd:constant type="context.files"/> + <cd:constant type="context.stack"/> + <cd:constant type="context.trace"/> + <cd:constant type="delimited.language"/> + <cd:constant type="export.trace"/> + <cd:constant type="export.trace.details"/> + <cd:constant type="export.trace.spacing"/> + <cd:constant type="figures.comments"/> + <cd:constant type="figures.fields"/> + <cd:constant type="figures.inclusion"/> + <cd:constant type="figures.links"/> + <cd:constant type="figures.merging"/> + <cd:constant type="figures.outlines"/> + <cd:constant type="floats.anchoring"/> + <cd:constant type="floats.caching"/> + <cd:constant type="floats.collecting"/> + <cd:constant type="floats.freeregion"/> + <cd:constant type="fonts.addcharacters"/> + <cd:constant type="fonts.automode"/> + <cd:constant type="fonts.cff.charstrings"/> + <cd:constant type="fonts.collecting"/> + <cd:constant type="fonts.composing.define"/> + <cd:constant type="fonts.composing.visualize"/> + <cd:constant type="fonts.defining"/> + <cd:constant type="fonts.designsize"/> + <cd:constant type="fonts.effect"/> + <cd:constant type="fonts.expansion"/> + <cd:constant type="fonts.extend"/> + <cd:constant type="fonts.features"/> + <cd:constant type="fonts.goodies"/> + <cd:constant type="fonts.injections"/> + <cd:constant type="fonts.injections.cursive"/> + <cd:constant type="fonts.injections.marks"/> + <cd:constant type="fonts.injections.spaces"/> + <cd:constant type="fonts.loading"/> + <cd:constant type="fonts.mapfiles"/> + <cd:constant type="fonts.mapping"/> + <cd:constant type="fonts.merge"/> + <cd:constant type="fonts.missing"/> + <cd:constant type="fonts.names"/> + <cd:constant type="fonts.otf.loader.memory"/> + <cd:constant type="fonts.protrusion"/> + <cd:constant type="fonts.rejections"/> + <cd:constant type="fonts.reorderlookups"/> + <cd:constant type="fonts.scaling"/> + <cd:constant type="fonts.slant"/> + <cd:constant type="fonts.specifications"/> + <cd:constant type="fonts.squeeze"/> + <cd:constant type="fonts.stripping"/> + <cd:constant type="fonts.treatments"/> + <cd:constant type="fonts.unicoding"/> + <cd:constant type="fonts.usage"/> + <cd:constant type="fonts.warnings"/> + <cd:constant type="formulas.boxes"/> + <cd:constant type="formulas.framed"/> + <cd:constant type="graphic.runfile"/> + <cd:constant type="graphics.backend"/> + <cd:constant type="graphics.bases"/> + <cd:constant type="graphics.conversion"/> + <cd:constant type="graphics.fonts"/> + <cd:constant type="graphics.inclusion"/> + <cd:constant type="graphics.inheritance"/> + <cd:constant type="graphics.locating"/> + <cd:constant type="graphics.memstreams"/> + <cd:constant type="graphics.pdf"/> + <cd:constant type="graphics.programs"/> + <cd:constant type="graphics.usage"/> + <cd:constant type="hyphenator.steps"/> + <cd:constant type="hyphenator.visualize"/> + <cd:constant type="hyphenators.urls"/> + <cd:constant type="interfaces.namespaces"/> + <cd:constant type="job.datasets"/> + <cd:constant type="job.pagestates"/> + <cd:constant type="languages.labels"/> + <cd:constant type="languages.patterns"/> + <cd:constant type="languages.replacements"/> + <cd:constant type="languages.replacements.details"/> + <cd:constant type="languages.url"/> + <cd:constant type="linecorrection.boxes"/> + <cd:constant type="lines.numbers"/> + <cd:constant type="lines.numbers.show"/> + <cd:constant type="lmx.variables"/> + <cd:constant type="lxml.access"/> + <cd:constant type="lxml.comments"/> + <cd:constant type="lxml.inclusions"/> + <cd:constant type="lxml.loading"/> + <cd:constant type="lxml.manipulations"/> + <cd:constant type="lxml.selectors"/> + <cd:constant type="lxml.setups"/> + <cd:constant type="marks.details"/> + <cd:constant type="marks.get"/> + <cd:constant type="marks.set"/> + <cd:constant type="math.alternates"/> + <cd:constant type="math.analyzing"/> + <cd:constant type="math.classes"/> + <cd:constant type="math.collapsing"/> + <cd:constant type="math.collecting"/> + <cd:constant type="math.defining"/> + <cd:constant type="math.domains"/> + <cd:constant type="math.fallbacks"/> + <cd:constant type="math.families"/> + <cd:constant type="math.fences"/> + <cd:constant type="math.fixing"/> + <cd:constant type="math.goodies"/> + <cd:constant type="math.greek"/> + <cd:constant type="math.italics"/> + <cd:constant type="math.italics.visualize"/> + <cd:constant type="math.kernpairs"/> + <cd:constant type="math.makeup"/> + <cd:constant type="math.normalizing"/> + <cd:constant type="math.openedup"/> + <cd:constant type="math.patching"/> + <cd:constant type="math.processing"/> + <cd:constant type="math.remapping"/> + <cd:constant type="math.showtree"/> + <cd:constant type="math.stackers.texts"/> + <cd:constant type="math.timings"/> + <cd:constant type="math.unstack"/> + <cd:constant type="math.variants"/> + <cd:constant type="math.virtual"/> + <cd:constant type="memory.checking"/> + <cd:constant type="metapost.blobs"/> + <cd:constant type="metapost.btexetex"/> + <cd:constant type="metapost.forcestroke"/> + <cd:constant type="metapost.graphics"/> + <cd:constant type="metapost.lua"/> + <cd:constant type="metapost.nodes"/> + <cd:constant type="metapost.properties"/> + <cd:constant type="metapost.runs"/> + <cd:constant type="metapost.scripts"/> + <cd:constant type="metapost.showlog"/> + <cd:constant type="metapost.svg"/> + <cd:constant type="metapost.svg.colors"/> + <cd:constant type="metapost.svg.path"/> + <cd:constant type="metapost.svg.result"/> + <cd:constant type="metapost.svg.text"/> + <cd:constant type="metapost.terminal"/> + <cd:constant type="metapost.textexts"/> + <cd:constant type="metapost.tracingall"/> + <cd:constant type="metapost.variables"/> + <cd:constant type="mixedcolumns.boxes"/> + <cd:constant type="mixedcolumns.details"/> + <cd:constant type="mixedcolumns.trace"/> + <cd:constant type="modules.loading"/> + <cd:constant type="nodes.areas"/> + <cd:constant type="nodes.boxes"/> + <cd:constant type="nodes.callbacks"/> + <cd:constant type="nodes.characters"/> + <cd:constant type="nodes.destinations"/> + <cd:constant type="nodes.destinations.show"/> + <cd:constant type="nodes.directions"/> + <cd:constant type="nodes.fontrun"/> + <cd:constant type="nodes.frequencies"/> + <cd:constant type="nodes.migrations"/> + <cd:constant type="nodes.references"/> + <cd:constant type="nodes.references.show"/> + <cd:constant type="nodes.rules"/> + <cd:constant type="nodes.shifting"/> + <cd:constant type="nodes.stripping"/> + <cd:constant type="nodes.variants"/> + <cd:constant type="objects"/> + <cd:constant type="otf.actions"/> + <cd:constant type="otf.alternatives"/> + <cd:constant type="otf.analyzing"/> + <cd:constant type="otf.applied"/> + <cd:constant type="otf.baseinit"/> + <cd:constant type="otf.bugs"/> + <cd:constant type="otf.chains"/> + <cd:constant type="otf.cleanups"/> + <cd:constant type="otf.cmap"/> + <cd:constant type="otf.cmap.details"/> + <cd:constant type="otf.compruns"/> + <cd:constant type="otf.contexts"/> + <cd:constant type="otf.cursive"/> + <cd:constant type="otf.details"/> + <cd:constant type="otf.dynamics"/> + <cd:constant type="otf.features"/> + <cd:constant type="otf.kernruns"/> + <cd:constant type="otf.kerns"/> + <cd:constant type="otf.ligatures"/> + <cd:constant type="otf.loading"/> + <cd:constant type="otf.marks"/> + <cd:constant type="otf.markwidth"/> + <cd:constant type="otf.multiples"/> + <cd:constant type="otf.optimizations"/> + <cd:constant type="otf.packing"/> + <cd:constant type="otf.plugins"/> + <cd:constant type="otf.positions"/> + <cd:constant type="otf.preparing"/> + <cd:constant type="otf.sample"/> + <cd:constant type="otf.sample.silent"/> + <cd:constant type="otf.singles"/> + <cd:constant type="otf.skips"/> + <cd:constant type="otf.steps"/> + <cd:constant type="otf.substitutions"/> + <cd:constant type="otf.testruns"/> + <cd:constant type="otf.unicodes"/> + <cd:constant type="otr.forcestrutdepth"/> + <cd:constant type="pagebuilder.injections"/> + <cd:constant type="pagebuilder.insert"/> + <cd:constant type="pages.mark"/> + <cd:constant type="pages.timing"/> + <cd:constant type="paragraphs.anchors"/> + <cd:constant type="parbuilders.keeptogether"/> + <cd:constant type="physics.units"/> + <cd:constant type="profiling.show"/> + <cd:constant type="profiling.trace"/> + <cd:constant type="publications"/> + <cd:constant type="publications.authorhash"/> + <cd:constant type="publications.cite"/> + <cd:constant type="publications.cite.missing"/> + <cd:constant type="publications.cite.references"/> + <cd:constant type="publications.details"/> + <cd:constant type="publications.duplicates"/> + <cd:constant type="publications.match"/> + <cd:constant type="publications.setups"/> + <cd:constant type="publications.sorters"/> + <cd:constant type="publications.strings"/> + <cd:constant type="publications.suffixes"/> + <cd:constant type="references.bookmarks"/> + <cd:constant type="references.destinations"/> + <cd:constant type="references.references"/> + <cd:constant type="regimes.translating"/> + <cd:constant type="resolvers.cache"/> + <cd:constant type="resolvers.containers"/> + <cd:constant type="resolvers.details"/> + <cd:constant type="resolvers.expansions"/> + <cd:constant type="resolvers.globbing"/> + <cd:constant type="resolvers.lib"/> + <cd:constant type="resolvers.libraries"/> + <cd:constant type="resolvers.locating"/> + <cd:constant type="resolvers.methods"/> + <cd:constant type="resolvers.paths"/> + <cd:constant type="resolvers.readfile"/> + <cd:constant type="resolvers.readfile.details"/> + <cd:constant type="resolvers.schemes"/> + <cd:constant type="resolvers.storage"/> + <cd:constant type="resolvers.virtual"/> + <cd:constant type="rules.mp"/> + <cd:constant type="sandbox"/> + <cd:constant type="sandbox.tracecalls"/> + <cd:constant type="sandbox.tracefiles"/> + <cd:constant type="scripts.analyzing"/> + <cd:constant type="scripts.autofeature"/> + <cd:constant type="scripts.details"/> + <cd:constant type="scripts.injections"/> + <cd:constant type="scripts.splitting"/> + <cd:constant type="scripts.splitting.details"/> + <cd:constant type="selectfont.alternatives"/> + <cd:constant type="selectfont.features"/> + <cd:constant type="selectfont.files"/> + <cd:constant type="selectfont.goodies"/> + <cd:constant type="selectfont.register"/> + <cd:constant type="selectfont.typescripts"/> + <cd:constant type="sequencers.details"/> + <cd:constant type="sequencers.used"/> + <cd:constant type="sorters.methods"/> + <cd:constant type="sorters.orders"/> + <cd:constant type="sorters.replacements"/> + <cd:constant type="sorters.tests"/> + <cd:constant type="stacker.resolve"/> + <cd:constant type="streams.collecting"/> + <cd:constant type="streams.flushing"/> + <cd:constant type="structure.sidefloats.pageflush"/> + <cd:constant type="structures.counters"/> + <cd:constant type="structures.details"/> + <cd:constant type="structures.lists"/> + <cd:constant type="structures.notes"/> + <cd:constant type="structures.notes.references"/> + <cd:constant type="structures.pages"/> + <cd:constant type="structures.referencing"/> + <cd:constant type="structures.referencing.analyzing"/> + <cd:constant type="structures.referencing.empty"/> + <cd:constant type="structures.referencing.identifying"/> + <cd:constant type="structures.referencing.importing"/> + <cd:constant type="structures.referencing.show"/> + <cd:constant type="structures.registers"/> + <cd:constant type="structures.sectioning"/> + <cd:constant type="structures.showused"/> + <cd:constant type="structures.tags"/> + <cd:constant type="structures.tags.info"/> + <cd:constant type="system.callbacks"/> + <cd:constant type="system.directives"/> + <cd:constant type="system.dump"/> + <cd:constant type="system.experiments"/> + <cd:constant type="system.jobfiles"/> + <cd:constant type="system.jobstatus"/> + <cd:constant type="system.prepfiles"/> + <cd:constant type="system.randomizer"/> + <cd:constant type="system.randomizer.details"/> + <cd:constant type="system.showcodes"/> + <cd:constant type="system.synctex.visualize"/> + <cd:constant type="system.synctex.xml"/> + <cd:constant type="system.tempfiles"/> + <cd:constant type="system.texstatus"/> + <cd:constant type="tables.natural.widths"/> + <cd:constant type="tables.tabulate.breaks"/> + <cd:constant type="tasks.creation"/> + <cd:constant type="templates.trace"/> + <cd:constant type="tfm.features"/> + <cd:constant type="tfm.loading"/> + <cd:constant type="tokens.compile"/> + <cd:constant type="typesetters.breakpoints"/> + <cd:constant type="typesetters.casing"/> + <cd:constant type="typesetters.characteralign"/> + <cd:constant type="typesetters.characters"/> + <cd:constant type="typesetters.cleaners"/> + <cd:constant type="typesetters.cleaners.autocase"/> + <cd:constant type="typesetters.digits"/> + <cd:constant type="typesetters.directions"/> + <cd:constant type="typesetters.directions.details"/> + <cd:constant type="typesetters.directions.list"/> + <cd:constant type="typesetters.directions.math"/> + <cd:constant type="typesetters.directions.text"/> + <cd:constant type="typesetters.firstlines"/> + <cd:constant type="typesetters.initials"/> + <cd:constant type="typesetters.italics"/> + <cd:constant type="typesetters.kerns.ligatures"/> + <cd:constant type="typesetters.kerns.ligatures.details"/> + <cd:constant type="typesetters.margindata"/> + <cd:constant type="typesetters.margindata.group"/> + <cd:constant type="typesetters.margindata.stack"/> + <cd:constant type="typesetters.nbsp"/> + <cd:constant type="typesetters.periodkerns"/> + <cd:constant type="typesetters.processors"/> + <cd:constant type="typesetters.rubies"/> + <cd:constant type="typesetters.spacing"/> + <cd:constant type="typesetters.suspects"/> + <cd:constant type="typesetters.threshold"/> + <cd:constant type="typesetters.wrappers"/> + <cd:constant type="visualizers.all"/> + <cd:constant type="visualizers.boxes"/> + <cd:constant type="visualizers.depth"/> + <cd:constant type="visualizers.discretionary"/> + <cd:constant type="visualizers.expansion"/> + <cd:constant type="visualizers.fontkern"/> + <cd:constant type="visualizers.glue"/> + <cd:constant type="visualizers.glyph"/> + <cd:constant type="visualizers.hbox"/> + <cd:constant type="visualizers.italic"/> + <cd:constant type="visualizers.justification"/> + <cd:constant type="visualizers.kern"/> + <cd:constant type="visualizers.line"/> + <cd:constant type="visualizers.makeup"/> + <cd:constant type="visualizers.marginkern"/> + <cd:constant type="visualizers.math"/> + <cd:constant type="visualizers.origin"/> + <cd:constant type="visualizers.penalty"/> + <cd:constant type="visualizers.reset"/> + <cd:constant type="visualizers.simple"/> + <cd:constant type="visualizers.simplehbox"/> + <cd:constant type="visualizers.simplevbox"/> + <cd:constant type="visualizers.simplevtop"/> + <cd:constant type="visualizers.space"/> + <cd:constant type="visualizers.strut"/> + <cd:constant type="visualizers.user"/> + <cd:constant type="visualizers.vbox"/> + <cd:constant type="visualizers.vtop"/> + <cd:constant type="visualizers.whatsit"/> + <cd:constant type="vspacing.collect"/> + <cd:constant type="vspacing.forcestrutdepth"/> + <cd:constant type="vspacing.page"/> + <cd:constant type="vspacing.snapping"/> + <cd:constant type="vspacing.spacing"/> + <cd:constant type="vspacing.specials"/> + <cd:constant type="vspacing.synchronizepage"/> + <cd:constant type="vspacing.vbox"/> + <cd:constant type="widgets.attachments"/> + <cd:constant type="xml.entities"/> + <cd:constant type="xml.parse"/> + <cd:constant type="xml.path"/> + <cd:constant type="xml.profile"/> + <cd:constant type="xtable.construct"/> + </cd:define> + + <!-- directive --> + + <cd:define name="value-directive"> + <cd:constant type="attributes.inheritance"/> + <cd:constant type="backend.addtags"/> + <cd:constant type="backend.date"/> + <cd:constant type="backend.format"/> + <cd:constant type="backend.omitextraboxes"/> + <cd:constant type="backend.pdf.forcecidset"/> + <cd:constant type="backend.pdf.threshold"/> + <cd:constant type="backend.trailerid"/> + <cd:constant type="backend.verbosexmp"/> + <cd:constant type="backend.xmp"/> + <cd:constant type="backends.spaces"/> + <cd:constant type="builders.paragraphs.adjusting.kerns"/> + <cd:constant type="builders.paragraphs.solutions.splitters.encapsulate"/> + <cd:constant type="characters.blockstoo"/> + <cd:constant type="characters.spaceafteruppercase"/> + <cd:constant type="chemistry.strictindex"/> + <cd:constant type="chemistry.strictorder"/> + <cd:constant type="colors.cmykrgbmode"/> + <cd:constant type="colors.pgf"/> + <cd:constant type="context.sorthash"/> + <cd:constant type="context.steps.noclose"/> + <cd:constant type="context.steps.nosteps"/> + <cd:constant type="destinations.log"/> + <cd:constant type="destinations.offset"/><!-- 5.0pt --> + <cd:constant type="export.comment"/> + <cd:constant type="export.embed"/> + <cd:constant type="export.lessstate"/> + <cd:constant type="export.math.autoapply"/> + <cd:constant type="export.math.autonumber"/> + <cd:constant type="export.math.autorows"/> + <cd:constant type="export.math.autostrip"/> + <cd:constant type="figures.embedded"/> + <cd:constant type="filters.utf.collapse"/> + <cd:constant type="filters.utf.decompose"/> + <cd:constant type="filters.utf.reorder"/> + <cd:constant type="fontgoodies.mathkerning"/> + <cd:constant type="fonts.autoreload"/> + <cd:constant type="fonts.checksharing"/> + <cd:constant type="fonts.embedall"/> + <cd:constant type="fonts.features.combine"/> + <cd:constant type="fonts.injections.useitalics"/> + <cd:constant type="fonts.mapping.forceligatures"/> + <cd:constant type="fonts.otf.loader.cleanup"/> + <cd:constant type="fonts.otf.loader.force"/> + <cd:constant type="fonts.otf.loader.forcenotdef"/> + <cd:constant type="fonts.otf.loader.syncspace"/> + <cd:constant type="fonts.streamreader"/><!-- 6 --> + <cd:constant type="fonts.streams.compact"/> + <cd:constant type="fonts.svg.cached"/> + <cd:constant type="fonts.usesystemfonts"/> + <cd:constant type="framed.checkmath"/> + <cd:constant type="graphics.autotransform"/> + <cd:constant type="graphics.conversion.cmykprofile"/> + <cd:constant type="graphics.conversion.eps.cleanup.ai"/> + <cd:constant type="graphics.conversion.rgbprofile"/> + <cd:constant type="graphics.extracheck"/> + <cd:constant type="graphics.pdf.recompress"/> + <cd:constant type="graphics.pdf.stripmarked"/> + <cd:constant type="graphics.png.compresslevel"/> + <cd:constant type="graphics.png.purelua"/> + <cd:constant type="graphics.png.recompress"/> + <cd:constant type="hyphenator.flatten"/> + <cd:constant type="hyphenator.optimize"/> + <cd:constant type="hyphenators.method"/> + <cd:constant type="hyphenators.urls.packslashes"/> + <cd:constant type="interaction.identity.preroll"/> + <cd:constant type="job.pack"/> + <cd:constant type="job.save"/> + <cd:constant type="languages.words.dump"/> + <cd:constant type="lmx.cache.files"/> + <cd:constant type="lmx.cache.templates"/> + <cd:constant type="logs.blocked"/> + <cd:constant type="logs.errors"/> + <cd:constant type="logs.target"/> + <cd:constant type="luatex.expanddepth"/><!-- 10000 --> + <cd:constant type="luatex.hashextra"/><!-- 100000 --> + <cd:constant type="luatex.maxinopen"/><!-- 500 --> + <cd:constant type="luatex.maxprintline"/><!-- 10000 --> + <cd:constant type="luatex.maxstrings"/><!-- 500000 --> + <cd:constant type="luatex.nestsize"/><!-- 1000 --> + <cd:constant type="luatex.paramsize"/><!-- 25000 --> + <cd:constant type="luatex.savesize"/><!-- 50000 --> + <cd:constant type="luatex.stacksize"/><!-- 10000 --> + <cd:constant type="lxml.entities.escaped"/> + <cd:constant type="lxml.entities.useelement"/> + <cd:constant type="marks.boxestoo"/> + <cd:constant type="math.checkcoverage"/> + <cd:constant type="math.virtual.optional"/> + <cd:constant type="metapost.lua.tolerant"/> + <cd:constant type="metapost.savetable"/> + <cd:constant type="modules.permitunprefixed"/> + <cd:constant type="mplib.texerrors"/> + <cd:constant type="nodes.basepass"/> + <cd:constant type="nodes.boundaryrun"/> + <cd:constant type="nodes.discrun"/> + <cd:constant type="nodes.keepredundant"/> + <cd:constant type="nodes.processors.force"/> + <cd:constant type="otf.acceptlanguages"/> + <cd:constant type="otf.acceptscripts"/> + <cd:constant type="otf.analyze.useunicodemarks"/> + <cd:constant type="otf.checksofthyphen"/> + <cd:constant type="otf.compact.pairs"/> + <cd:constant type="otf.compact.singles"/> + <cd:constant type="otf.fastdisc"/> + <cd:constant type="otf.forcediscretionaries"/> + <cd:constant type="otf.forcepairadvance"/> + <cd:constant type="otf.keepnames"/> + <cd:constant type="otf.merge.alternates"/> + <cd:constant type="otf.merge.cursives"/> + <cd:constant type="otf.merge.ligatures"/> + <cd:constant type="otf.merge.marks"/> + <cd:constant type="otf.merge.multiples"/> + <cd:constant type="otf.merge.pairs"/> + <cd:constant type="otf.merge.singles"/> + <cd:constant type="otf.merge.substitutions"/> + <cd:constant type="otf.threshold"/> + <cd:constant type="pdf.compact"/> + <cd:constant type="publications.prerollauthor"/> + <cd:constant type="references.bookmarks.preroll"/> + <cd:constant type="references.border"/> + <cd:constant type="references.linkmethod"/> + <cd:constant type="references.sharelinks"/> + <cd:constant type="references.untexurls"/> + <cd:constant type="resolvers.maxreadlevel"/> + <cd:constant type="resolvers.otherwise"/> + <cd:constant type="schemes.cleanmethod"/> + <cd:constant type="schemes.threshold"/> + <cd:constant type="structures.referencing.checkduplicates"/> + <cd:constant type="structures.tags.embed"/> + <cd:constant type="structures.tags.embedmath"/> + <cd:constant type="system.caches.direct"/> + <cd:constant type="system.caches.fast"/> + <cd:constant type="system.callbacks.permitoverloads"/> + <cd:constant type="system.commandlist"/><!-- mtxrun, convert, inkscape, gs, imagemagick, curl, bibtex, pstoedit --> + <cd:constant type="system.commandmode"/><!-- any --> + <cd:constant type="system.compile.cleanup"/> + <cd:constant type="system.compile.strip"/> + <cd:constant type="system.dumpdelta"/> + <cd:constant type="system.dumpfiles"/> + <cd:constant type="system.dumphash"/> + <cd:constant type="system.errorcontext"/><!-- 10 --> + <cd:constant type="system.executionlist"/> + <cd:constant type="system.executionmode"/> + <cd:constant type="system.inputmode"/><!-- any --> + <cd:constant type="system.librarylist"/> + <cd:constant type="system.librarymode"/> + <cd:constant type="system.linesplitmethod"/> + <cd:constant type="system.nolibraries"/> + <cd:constant type="system.nostatistics"/> + <cd:constant type="system.outputmode"/><!-- restricted --> + <cd:constant type="system.profile"/> + <cd:constant type="system.quitonerror"/> + <cd:constant type="system.reportfiles"/> + <cd:constant type="system.rootlist"/> + <cd:constant type="system.showerror"/> + <cd:constant type="system.synctex.compression"/> + <cd:constant type="system.usescitelexer"/> + <cd:constant type="tabulate.linenumbers"/> + <cd:constant type="typesetters.casing.checkkerns"/> + <cd:constant type="typesetters.characteralign.autofont"/> + <cd:constant type="typesetters.directions.onetoo"/> + <cd:constant type="typesetters.directions.removecontrols"/> + <cd:constant type="typesetters.processors.overloadcatcodes"/> + <cd:constant type="visualizers.fraction"/> + <cd:constant type="visualizers.raisepenalties"/> + <cd:constant type="vspacing.removemathskips"/> + <cd:constant type="vspacing.synchronizepage"/> + <cd:constant type="xml.path.keeplastmatch"/> + </cd:define> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-context-modules.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-context-modules.xml index 85194c6ec3d..319ba53df2a 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-context-modules.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-context-modules.xml @@ -37,4 +37,4 @@ <cd:interfacefile filename="i-translate.xml"/> <cd:interfacefile filename="i-visual.xml"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf b/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf Binary files differindex a877fa0eafc..552b8f5eb86 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml index 53741ad5571..a1f53f470d4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml @@ -53,9 +53,13 @@ <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"/> + <!-- + <cd:interfacefile filename="i-contextname.xml"/> + --> <cd:interfacefile filename="i-conversion.xml"/> <cd:interfacefile filename="i-counter.xml"/> <cd:interfacefile filename="i-dataset.xml"/> @@ -104,7 +108,6 @@ <cd:interfacefile filename="i-interactionscreen.xml"/> <cd:interfacefile filename="i-interface.xml"/> <cd:interfacefile filename="i-interlinespace.xml"/> - <cd:interfacefile filename="i-interlinespace.xml"/> <cd:interfacefile filename="i-italiccorrection.xml"/> <cd:interfacefile filename="i-itemgroup.xml"/> <cd:interfacefile filename="i-items.xml"/> @@ -124,6 +127,7 @@ <cd:interfacefile filename="i-logo.xml"/> <cd:interfacefile filename="i-lohi.xml"/> <cd:interfacefile filename="i-lua.xml"/> + <cd:interfacefile filename="i-luatable.xml"/> <cd:interfacefile filename="i-makeup.xml"/> <cd:interfacefile filename="i-marginblock.xml"/> <cd:interfacefile filename="i-margindata.xml"/> @@ -134,6 +138,9 @@ <cd:interfacefile filename="i-mathcases.xml"/> <cd:interfacefile filename="i-mathfence.xml"/> <cd:interfacefile filename="i-mathmatrix.xml"/> + <!-- + <cd:interfacefile filename="i-mathname.xml"/> + --> <cd:interfacefile filename="i-mathornament.xml"/> <cd:interfacefile filename="i-mathradical.xml"/> <cd:interfacefile filename="i-mathstackers.xml"/> @@ -147,6 +154,7 @@ <cd:interfacefile filename="i-object.xml"/> <cd:interfacefile filename="i-offset.xml"/> <cd:interfacefile filename="i-opposite.xml"/> + <cd:interfacefile filename="i-orientation.xml"/> <cd:interfacefile filename="i-ornament.xml"/> <cd:interfacefile filename="i-output.xml"/> <cd:interfacefile filename="i-overlay.xml"/> @@ -169,10 +177,12 @@ <cd:interfacefile filename="i-paragraphs.xml"/> <cd:interfacefile filename="i-parallel.xml"/> <cd:interfacefile filename="i-parbuilder.xml"/> + <cd:interfacefile filename="i-parwrapper.xml"/> <cd:interfacefile filename="i-pdf.xml"/> <cd:interfacefile filename="i-penalty.xml"/> <cd:interfacefile filename="i-periods.xml"/> <cd:interfacefile filename="i-phantom.xml"/> + <cd:interfacefile filename="i-placeholder.xml"/> <cd:interfacefile filename="i-placement.xml"/> <cd:interfacefile filename="i-position.xml"/> <cd:interfacefile filename="i-positionbar.xml"/> @@ -187,7 +197,7 @@ <cd:interfacefile filename="i-register.xml"/> <cd:interfacefile filename="i-renderingwindow.xml"/> <cd:interfacefile filename="i-replacement.xml"/> - <cd:interfacefile filename="i-rotatation.xml"/> + <cd:interfacefile filename="i-rotation.xml"/> <cd:interfacefile filename="i-ruby.xml"/> <cd:interfacefile filename="i-scale.xml"/> <cd:interfacefile filename="i-script.xml"/> @@ -214,6 +224,9 @@ <cd:interfacefile filename="i-table.xml"/> <cd:interfacefile filename="i-tabulation.xml"/> <cd:interfacefile filename="i-tagging.xml"/> + <!-- + <cd:interfacefile filename="i-tex.xml"/> + --> <cd:interfacefile filename="i-textbackground.xml"/> <cd:interfacefile filename="i-textflow.xml"/> <cd:interfacefile filename="i-textrule.xml"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-contextname.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-contextname.xml index 3e289f3f5ca..c1b7d85cbd6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-contextname.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-contextname.xml @@ -2350,4 +2350,4 @@ <cd:command name="zerowidthnobreakspace" level="document" category="characters" file="char-def.lua"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml index b97b638066a..e09bbd73355 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml @@ -16,223 +16,235 @@ </cd:arguments> </cd:command> - <cd:command name="romannumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="romannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Romannumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="Romannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="abjadnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnodotnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="abjadnodotnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnaivenumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="abjadnaivenumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="languagecharacters" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="hebrewnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="languageCharacters" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="yiddishnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="alphabeticnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="languagecharacters" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Alphabeticnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="languageCharacters" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="thainumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="alphabeticnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="devanagarinumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="Alphabeticnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="gurmurkhinumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="thainumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="gujaratinumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="devanagarinumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="tibetannumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="gurmurkhinumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="greeknumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="gujaratinumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Greeknumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="tibetannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="greeknumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="persiannumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="Greeknumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicdecimals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="arabicnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="persiandecimals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="persiannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicexnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="arabicdecimals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="persiandecimals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumeralsp" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="arabicexnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumeralsc" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="koreannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreanparentnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="koreannumeralsp" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreancirclenumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="koreannumeralsc" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chinesenumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="koreanparentnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chinesecapnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="koreancirclenumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chineseallnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="chinesenumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="character" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="chinesecapnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Character" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="chineseallnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="characters" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="character" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Characters" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="Character" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="monthlong" level="style" category="counter" file="core-con.mkiv"> + <cd:command name="characters" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="monthshort" level="style" category="counter" file="core-con.mkiv"> + <cd:command name="Characters" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="convertmonth" level="style" category="counter" file="core-con.mkiv"> + <cd:command name="month" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="month" level="style" category="counter" file="core-con.mkiv"> + <cd:command name="monthlong" level="style" category="counter" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="monthshort" level="style" category="counter" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="convertmonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> @@ -268,6 +280,30 @@ </cd:arguments> </cd:command> + <cd:command name="daylong" level="style" category="counter" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="dayshort" level="style" category="counter" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="DAYLONG" level="style" category="counter" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="DAYSHORT" level="style" category="counter" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + <cd:command name="dayoftheweek" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> @@ -284,7 +320,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseleapyear" level="style" category="counter conditional" file="core-con.mkiv"> + <cd:command name="doifelseleapyear" level="style" category="counter" keywords="conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -292,7 +328,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifleapyearelse" level="style" category="counter conditional" file="core-con.mkiv"> + <cd:command name="doifleapyearelse" level="style" category="counter" keywords="conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -314,51 +350,26 @@ </cd:arguments> </cd:command> - <cd:command name="currentdate" level="document" category="counter language" file="core-con.mkiv"> + <cd:command name="definedate" level="document" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="year"/> - <cd:constant type="month"/> - <cd:constant type="day"/> - <cd:constant type="weekday"/> - <cd:constant type="y"/> - <cd:constant type="yy"/> - <cd:constant type="Y"/> - <cd:constant type="m"/> - <cd:constant type="mm"/> - <cd:constant type="M"/> - <cd:constant type="d"/> - <cd:constant type="dd"/> - <cd:constant type="D"/> - <cd:constant type="w"/> - <cd:constant type="W"/> - <cd:constant type="space"/> - <cd:constant type="\␣"/> - <cd:constant type="month:mnem"/> - <cd:constant type="m:mnem"/> - <cd:constant type="d:ord"/> - <cd:constant type="day:ord"/> - <cd:constant type="dd:ord"/> - <cd:constant type="D:ord"/> - <cd:constant type="cd:text"/> - <cd:constant type="referral"/> - <cd:constant type="day:+"/> - <cd:constant type="day:++"/> - <cd:constant type="d:+"/> - <cd:constant type="d:++"/> - <cd:constant type="dd:+"/> - <cd:constant type="dd:++"/> - <cd:constant type="D:+"/> - <cd:constant type="D:++"/> - <cd:constant type="month:jalali"/> - <cd:constant type="m:jalali"/> - <cd:constant type="jalali:to"/> - <cd:constant type="jalali:from"/> - </cd:keywords> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-date-list"/> </cd:arguments> </cd:command> - <cd:command name="date" level="document" category="counter language" file="core-con.mkiv"> + <cd:command name="currentdate" level="document" category="counter" keywords="language" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-date-list-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="currentdate" variant="name" level="document" category="counter" keywords="language" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="date" level="document" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="d"> @@ -371,9 +382,24 @@ <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="currentdate"/> - </cd:keywords> + <cd:resolve name="keyword-date-list-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="date" variant="name" level="document" category="counter" keywords="language" file="core-con.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="d"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="m"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="y"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> @@ -420,7 +446,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineconversion" variant="list" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="defineconversion" variant="list" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-name"/> @@ -468,6 +494,8 @@ <cd:constant type="abjadnumerals"/> <cd:constant type="abjadnodotnumerals"/> <cd:constant type="abjadnaivenumerals"/> + <cd:constant type="hebrewnumerals"/> + <cd:constant type="yiddishnumerals"/> <cd:constant type="thainumerals"/> <cd:constant type="devanagarinumerals"/> <cd:constant type="gurmurkhinumerals"/> @@ -496,6 +524,8 @@ <cd:constant type="slovenianNumerals"/> <cd:constant type="spanishnumerals"/> <cd:constant type="spanishNumerals"/> + <cd:constant type="russiannumerals"/> + <cd:constant type="russianNumerals"/> <cd:constant type="mathgreek"/> <cd:constant type="set␣0"/> <cd:constant type="set␣1"/> @@ -518,7 +548,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseconversiondefined" level="system" category="counter conditional" file="core-con.mkiv"> + <cd:command name="doifelseconversiondefined" level="system" category="counter" keywords="conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -526,7 +556,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifconversiondefinedelse" level="system" category="counter conditional" file="core-con.mkiv"> + <cd:command name="doifconversiondefinedelse" level="system" category="counter" keywords="conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -534,7 +564,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseconversionnumber" level="system" category="counter conditional" file="core-con.mkiv"> + <cd:command name="doifelseconversionnumber" level="system" category="counter" keywords="conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -543,7 +573,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifconversionnumberelse" level="system" category="counter conditional" file="core-con.mkiv"> + <cd:command name="doifconversionnumberelse" level="system" category="counter" keywords="conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -607,25 +637,37 @@ </cd:arguments> </cd:command> - <cd:command name="sloveniannumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="sloveniannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="slovenianNumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="slovenianNumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="spanishnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="spanishnumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="spanishNumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="spanishNumerals" level="style" category="counter language" file="core-con.mkiv"> + <cd:command name="russiannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="russianNumerals" level="style" category="counter" keywords="language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> @@ -649,8 +691,58 @@ </cd:arguments> </cd:command> - <cd:command name="actualyear" level="style" category="system" file="core-con.mkiv" /> - <cd:command name="actualmonth" level="style" category="system" file="core-con.mkiv" /> - <cd:command name="actualday" level="style" category="system" file="core-con.mkiv" /> + <cd:command name="actualyear" level="style" category="system" keywords="system" category="counter" file="core-con.lua"/> + + <cd:command name="actualmonth" level="style" category="system" keywords="system" category="counter" file="core-con.lua"/> + + <cd:command name="actualday" level="style" category="system" keywords="system" category="counter" file="core-con.lua"/> + + <cd:command name="lchexnumber" level="style" category="counter" file="syst-con.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="uchexnumber" level="style" category="counter" file="syst-con.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="lchexnumbers" level="style" category="counter" file="syst-con.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="uchexnumbers" level="style" category="counter" file="syst-con.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="hexnumber" level="style" category="counter" file="syst-con.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="octnumber" level="style" category="counter" file="syst-con.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="hexstringtonumber" level="style" category="counter" file="syst-con.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="octstringtonumber" level="style" category="counter" file="syst-con.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-counter.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-counter.xml index ec841a59736..f3e622e5f0a 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-counter.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-counter.xml @@ -26,6 +26,9 @@ <cd:parameter name="start"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="number"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="counter"> <cd:constant type="cd:name"/> </cd:parameter> @@ -111,7 +114,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecounter" level="system" category="counter conditional" file="strc-num.mkiv"> + <cd:command name="doifelsecounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -119,7 +122,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcounterelse" level="system" category="counter conditional" file="strc-num.mkiv"> + <cd:command name="doifcounterelse" level="system" category="counter" keywords="conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -127,14 +130,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifcounter" level="system" category="counter conditional" file="strc-num.mkiv"> + <cd:command name="doifcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotcounter" level="system" category="counter conditional" file="strc-num.mkiv"> + <cd:command name="doifnotcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -360,7 +363,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv"> + <cd:command name="doifelsedefinedcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -368,7 +371,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdefinedcounterelse" level="system" category="counter conditional" file="strc-num.mkiv"> + <cd:command name="doifdefinedcounterelse" level="system" category="counter" keywords="conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -376,14 +379,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifdefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv"> + <cd:command name="doifdefinedcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifundefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv"> + <cd:command name="doifundefinedcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -514,4 +517,4 @@ --> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-database.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-database.xml index a81cd75f8a3..e974b2d644c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-database.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-database.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definedatabase" level="style" file="m-database.mkiv"> + <cd:command name="definedatabase" level="style" category="tables" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupdatabase" level="style" file="m-database.mkiv"> + <cd:command name="setupdatabase" level="style" category="tables" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -64,21 +64,21 @@ </cd:arguments> </cd:command> - <cd:command name="processdatabasebuffer" level="document" file="m-database.mkiv"> + <cd:command name="processdatabasebuffer" level="document" category="tables" keywords="buffer" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-buffer"/> </cd:arguments> </cd:command> - <cd:command name="processdatabasefile" level="document" file="m-database.mkiv"> + <cd:command name="processdatabasefile" level="document" category="tables" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="defineseparatedlist" level="style" file="m-database.mkiv"> + <cd:command name="defineseparatedlist" level="style" category="tables" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -87,26 +87,26 @@ </cd:arguments> </cd:command> - <cd:command name="processseparatedlist" level="document" file="m-database.mkiv"> + <cd:command name="processseparatedlist" level="document" category="tables" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="separatedlist" type="environment" generated="yes" variant="instance" level="document" file="m-database.mkiv"> + <cd:command name="separatedlist" type="environment" generated="yes" variant="instance" level="document" category="tables" file="m-database.mkiv"> <cd:sequence> <cd:instance value="separatedlist"/> </cd:sequence> </cd:command> - <cd:command name="separatedlist" type="environment" level="document" file="m-database.mkiv"> + <cd:command name="separatedlist" type="environment" level="document" category="tables" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupseparatedlist" level="style" file="m-database.mkiv"> + <cd:command name="setupseparatedlist" level="style" category="tables" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -115,4 +115,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-dataset.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-dataset.xml index c006454d3d6..afb8f8fa3e6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-dataset.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-dataset.xml @@ -48,4 +48,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-define.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-define.xml index 91975e75271..f37645cf1af 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-define.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-define.xml @@ -20,4 +20,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-delimitedtext.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-delimitedtext.xml index ce1767b1c48..3d881a97261 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-delimitedtext.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-delimitedtext.xml @@ -157,86 +157,6 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="quotation" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="quotation" type="environment" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="quote" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="quote" type="environment" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="blockquote" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="blockquote" type="environment" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="speech" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="aside" type="environment" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="aside" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="speech" type="environment" level="document" category="language" file="typo-del.mkiv"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - --> - <cd:command name="setupquotation" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:assignments list="yes"> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-description.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-description.xml index 9d71bd1a109..aa66532a0f1 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-description.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-description.xml @@ -139,18 +139,14 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupdescriptions" level="style" category="structure" file="strc-des.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupdescription"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupdescriptions" level="style" category="structure" file="strc-des.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupdescription"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command name="description" type="environment" generated="yes" variant="example" level="document" category="structure" file="strc-des.mkvi"> <cd:sequence> @@ -183,4 +179,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-digits.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-digits.xml index c917bf0d417..159745b6540 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-digits.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-digits.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setdigitsmanipulation" level="system" file="typo-dig.mkiv"> + <cd:command name="setdigitsmanipulation" level="system" category="symbols" keywords="fonts" file="typo-dig.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -13,14 +13,14 @@ </cd:arguments> </cd:command> - <cd:command name="resetdigitsmanipulation" level="system" file="typo-dig.mkiv"/> + <cd:command name="resetdigitsmanipulation" level="system" category="symbols" keywords="fonts" file="typo-dig.mkiv"/> - <cd:command name="equaldigits" level="document" file="typo-dig.mkiv"> + <cd:command name="equaldigits" level="document" category="symbols" keywords="fonts" file="typo-dig.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="dummydigit" level="document" file="typo-dig.mkiv"/> + <cd:command name="dummydigit" level="document" category="symbols" keywords="fonts" file="typo-dig.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-dimension.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-dimension.xml index 1980687ab5f..bb7c3bfa700 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-dimension.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-dimension.xml @@ -64,4 +64,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml index 87e64e4572d..721e7c60e60 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupdirections" level="style" category="language alignment" file="typo-dir.mkiv"> + <cd:command name="setupdirections" level="style" category="language" keywords="alignment" file="typo-dir.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="bidi"> @@ -30,26 +30,26 @@ </cd:arguments> </cd:command> - <cd:command name="setdirection" level="style" category="language alignment" file="typo-dir.mkiv"> + <cd:command name="setdirection" level="style" category="language" keywords="alignment" file="typo-dir.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="resetdirection" level="style" category="language alignment" file="typo-dir.mkiv"/> + <cd:command name="resetdirection" level="style" category="language" keywords="alignment" file="typo-dir.mkiv"/> <!-- - <cd:command name="lefttorightmark" level="system" category="language alignment" file="typo-dir.mkiv"/> + <cd:command name="lefttorightmark" level="system" category="language" keywords="alignment" file="typo-dir.mkiv"/> - <cd:command name="righttoleftmark" level="system" category="language alignment" file="typo-dir.mkiv"/> + <cd:command name="righttoleftmark" level="system" category="language" keywords="alignment" file="typo-dir.mkiv"/> - <cd:command name="lrm" level="system" category="language alignment" file="typo-dir.mkiv"/> + <cd:command name="lrm" level="system" category="language" keywords="alignment" file="typo-dir.mkiv"/> - <cd:command name="rlm" level="system" category="language alignment" file="typo-dir.mkiv"/> + <cd:command name="rlm" level="system" category="language" keywords="alignment" file="typo-dir.mkiv"/> --> - <cd:command name="showdirsinmargin" level="document" category="alignment" file="supp-dir.mkiv"/> + <cd:command name="showdirsinmargin" level="document" category="alignment" keywords="alignment" file="supp-dir.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-document.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-document.xml index 178f7e9fec5..3ea0d0eeb18 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-document.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-document.xml @@ -164,6 +164,26 @@ <cd:command name="document" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupdocument"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="document" type="environment" generated="yes" variant="example" level="document" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupdocument"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="definedocument" level="style" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupdocument"/> </cd:assignments> @@ -172,6 +192,7 @@ <cd:command name="setupdocument" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="before"> <cd:constant type="cd:command"/> @@ -200,6 +221,7 @@ <cd:command name="presetdocument" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> + <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> <cd:inherit name="setupdocument"/> </cd:assignments> @@ -248,4 +270,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-dummy.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-dummy.xml index 47d005e206d..1ee66cdac95 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-dummy.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-dummy.xml @@ -4,55 +4,55 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="getdummyparameters" level="system" file="mult-aux.mkiv"> + <cd:command name="getdummyparameters" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="dummyparameter" level="system" file="mult-aux.mkiv"> + <cd:command name="dummyparameter" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="directdummyparameter" level="system" file="mult-aux.mkiv"> + <cd:command name="directdummyparameter" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setdummyparameter" level="system" file="mult-aux.mkiv"> + <cd:command name="setdummyparameter" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="letdummyparameter" level="system" file="mult-aux.mkiv"> + <cd:command name="letdummyparameter" level="system" category="commandhandler" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="usedummystyleandcolor" level="system" category="fonts colors" file="mult-aux.mkiv"> + <cd:command name="usedummystyleandcolor" level="system" category="commandhandler" keywords="fonts colors" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="usedummystyleparameter" level="system" category="fonts" file="mult-aux.mkiv"> + <cd:command name="usedummystyleparameter" level="system" category="commandhandler" keywords="fonts" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="usedummycolorparameter" level="system" category="colors" file="mult-aux.mkiv"> + <cd:command name="usedummycolorparameter" level="system" category="commandhandler" keywords="colors" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-enumeration.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-enumeration.xml index 0f286b8b531..ab10e0bf159 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-enumeration.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-enumeration.xml @@ -226,4 +226,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-export.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-export.xml index 3c3afff2b35..07156c95bf7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-export.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-export.xml @@ -74,4 +74,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-field.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-field.xml index 7a67786f97d..5d4aeb101a8 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-field.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-field.xml @@ -133,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefieldcategory" level="system" category="pdf conditional" file="scrn-fld.mkvi"> + <cd:command name="doifelsefieldcategory" level="system" category="pdf" keywords="conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -141,7 +141,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffieldcategoryelse" level="system" category="pdf conditional" file="scrn-fld.mkvi"> + <cd:command name="doiffieldcategoryelse" level="system" category="pdf" keywords="conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -187,7 +187,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefieldbody" level="system" category="pdf conditional" file="scrn-fld.mkvi"> + <cd:command name="doifelsefieldbody" level="system" category="pdf" keywords="conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -195,7 +195,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffieldbodyelse" level="system" category="pdf conditional" file="scrn-fld.mkvi"> + <cd:command name="doiffieldbodyelse" level="system" category="pdf" keywords="conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -245,7 +245,7 @@ </cd:arguments> </cd:command> - <cd:command name="fitfieldframed" level="document" category="pdf background rules" file="scrn-fld.mkvi"> + <cd:command name="fitfieldframed" level="document" category="pdf" keywords="background rules" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -263,7 +263,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldlabelframed" level="style" category="pdf background" file="scrn-fld.mkvi"> + <cd:command name="setupfieldlabelframed" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -272,7 +272,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldcontentframed" level="style" category="pdf background" file="scrn-fld.mkvi"> + <cd:command name="setupfieldcontentframed" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -282,7 +282,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldtotalframed" level="style" category="pdf background" file="scrn-fld.mkvi"> + <cd:command name="setupfieldtotalframed" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -310,7 +310,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfield" level="style" category="pdf background" file="scrn-fld.mkvi"> + <cd:command name="setupfield" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -332,7 +332,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfields" level="style" category="pdf background" file="scrn-fld.mkvi"> + <cd:command name="setupfields" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -380,4 +380,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-file.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-file.xml index bf12e5825f1..671f637abb5 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-file.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-file.xml @@ -16,21 +16,21 @@ </cd:arguments> </cd:command> - <cd:command name="doiffile" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doiffile" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotfile" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifnotfile" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefile" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifelsefile" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffileelse" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doiffileelse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -72,7 +72,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepath" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifelsepath" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-true"/> @@ -80,7 +80,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpathelse" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifpathelse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-true"/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefileexists" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifelsefileexists" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -96,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffileexistselse" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doiffileexistselse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -104,7 +104,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepathexists" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifelsepathexists" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-true"/> @@ -112,7 +112,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpathexistselse" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifpathexistselse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-true"/> @@ -120,7 +120,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseparentfile" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifelseparentfile" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -128,7 +128,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifparentfileelse" level="system" category="structure conditional" file="file-ini.mkvi"> + <cd:command name="doifparentfileelse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -156,7 +156,7 @@ <cd:command name="splitoffroot" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="doifelseinputfile" level="system" category="structure conditional" file="file-job.mkvi"> + <cd:command name="doifelseinputfile" level="system" category="structure" keywords="conditional" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -164,7 +164,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinputfileelse" level="system" category="structure conditional" file="file-job.mkvi"> + <cd:command name="doifinputfileelse" level="system" category="structure" keywords="conditional" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -239,13 +239,13 @@ </cd:arguments> </cd:command> - <cd:command name="loadluafile" level="system" category="structure lua" file="file-job.mkvi"> + <cd:command name="loadluafile" level="system" category="structure" keywords="lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadcldfile" level="system" category="structure lua" file="file-job.mkvi"> + <cd:command name="loadcldfile" level="system" category="structure" keywords="lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> @@ -263,13 +263,13 @@ </cd:arguments> </cd:command> - <cd:command name="loadluafileonce" level="system" category="structure lua" file="file-job.mkvi"> + <cd:command name="loadluafileonce" level="system" category="structure" keywords="lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadcldfileonce" level="system" category="structure lua" file="file-job.mkvi"> + <cd:command name="loadcldfileonce" level="system" category="structure" keywords="lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> @@ -293,7 +293,7 @@ </cd:arguments> </cd:command> - <cd:command name="readjobfile" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="readjobfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -301,7 +301,7 @@ </cd:arguments> </cd:command> - <cd:command name="readlocfile" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="readlocfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -309,7 +309,7 @@ </cd:arguments> </cd:command> - <cd:command name="readsysfile" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="readsysfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -317,7 +317,7 @@ </cd:arguments> </cd:command> - <cd:command name="readfixfile" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="readfixfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-file"/> @@ -326,7 +326,7 @@ </cd:arguments> </cd:command> - <cd:command name="readsetfile" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="readsetfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-file"/> @@ -335,7 +335,7 @@ </cd:arguments> </cd:command> - <cd:command name="readfile" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="readfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -349,7 +349,7 @@ </cd:arguments> </cd:command> - <cd:command name="readtexfile" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="readtexfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -357,7 +357,7 @@ </cd:arguments> </cd:command> - <cd:command name="readxmlfile" level="system" category="structure conditional xml" file="file-res.mkvi"> + <cd:command name="readxmlfile" level="system" category="structure" keywords="conditional xml" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -365,7 +365,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselocfile" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="doifelselocfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -373,7 +373,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflocfileelse" level="system" category="structure conditional" file="file-res.mkvi"> + <cd:command name="doiflocfileelse" level="system" category="structure" keywords="conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -407,4 +407,10 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="usefontpath" level="system" category="structure" keywords="fonts" file="font-ini.mklx"> + <cd:arguments> + <cd:resolve name="keyword-path-list"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-filler.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-filler.xml index d9a43378e07..2e425a3f766 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-filler.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-filler.xml @@ -127,98 +127,6 @@ </cd:arguments> </cd:command> - <cd:command name="definelinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name"/> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplinefiller"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="setuplinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:parameter name="location"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant type="both" default="yes"/> - </cd:parameter> - <cd:parameter name="scope"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant type="local" default="yes"/> - </cd:parameter> - <cd:parameter name="mp"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="height"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="depth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="threshold"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="rulethickness"> - <cd:constant type="cd:dimension"/> - </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="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="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="setuplinefillers" level="style" category="rules metapost" file="node-rul.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setuplinefiller"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="linefiller" type="environment" level="style" category="rules metapost" file="node-rul.mkiv"> - <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 name="setlinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> - <cd:arguments> - <cd:keywords> - <cd:constant type="filler"/> - <cd:constant type="cd:name"/> - </cd:keywords> - </cd:arguments> - </cd:command> + <cd:command name="dotfill" level="document" category="rules" file="spac-flr.mkiv"/> </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fillinline.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fillinline.xml index eb2f9d6ae9e..614a9bc990e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-fillinline.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fillinline.xml @@ -40,4 +40,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fillinrule.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fillinrule.xml index d73b70ff983..9802b4fbb76 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-fillinrule.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fillinrule.xml @@ -63,4 +63,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-firstline.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-firstline.xml index b22035651e2..052d135d1ab 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-firstline.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-firstline.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefirstline" level="style" category="fonts colors" file="typo-fln.mkiv"> + <cd:command name="definefirstline" level="style" category="fonts" keywords="colors" file="typo-fln.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfirstline" level="style" category="fonts colors" file="typo-fln.mkiv"> + <cd:command name="setupfirstline" level="style" category="fonts" keywords="colors" file="typo-fln.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -36,17 +36,17 @@ </cd:arguments> </cd:command> - <cd:command name="setfirstline" level="document" category="fonts colors" file="typo-fln.mkiv"> + <cd:command name="setfirstline" level="document" category="fonts" keywords="colors" file="typo-fln.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="applytofirstcharacter" level="system" category="fonts colors" file="typo-fln.mkiv"> + <cd:command name="applytofirstcharacter" level="system" category="fonts" keywords="colors" file="typo-fln.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml index f5daafcf1b0..7283ae5ac9b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml @@ -28,7 +28,7 @@ </cd:assignments> </cd:define> - <cd:command name="definefittingpage" level="style" category="background layout" file="page-app.mkiv"> + <cd:command name="definefittingpage" level="style" category="layout" keywords="background" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -38,14 +38,14 @@ </cd:arguments> </cd:command> - <cd:command name="setupfittingpage" level="style" category="background layout" file="page-app.mkiv"> + <cd:command name="setupfittingpage" level="style" category="layout" keywords="background" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="assignment-setupfittingpage"/> </cd:arguments> </cd:command> - <cd:command name="fittingpage" type="environment" level="document" category="background layout" file="page-app.mkiv"> + <cd:command name="fittingpage" type="environment" level="document" category="layout" keywords="background" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" category="background layout" file="page-app.mkiv"> + <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" category="layout" keywords="background" file="page-app.mkiv"> <cd:sequence> <cd:instance value="fittingpage"/> </cd:sequence> @@ -68,36 +68,16 @@ </cd:instances> </cd:command> - <!-- - - <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: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:arguments> - </cd:command> - - --> - - <cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv"> + <cd:command name="setupTEXpage" level="style" category="layout" keywords="background" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="assignment-setupfittingpage"/> </cd:arguments> </cd:command> - <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv"> + <cd:command name="setupMPpage" level="style" category="layout" keywords="background metapost" file="meta-fig.mkiv"> <cd:arguments> <cd:resolve name="assignment-setupfittingpage"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml index 7714e5ccc23..a29fc7b9d50 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml @@ -239,7 +239,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupfloatcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -363,7 +363,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -372,7 +372,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaptions" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -383,7 +383,7 @@ --> - <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -452,9 +452,6 @@ <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> - <cd:parameter name="headcommand"> - <cd:constant type="cd:command"/> - </cd:parameter> <cd:parameter name="inbetween"> <cd:constant type="cd:command"/> </cd:parameter> @@ -505,13 +502,17 @@ <cd:parameter name="maxwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> <cd:inherit name="setupcounter"/> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaptions" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -520,9 +521,33 @@ </cd:arguments> </cd:command> + <cd:command name="placefloatcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="title"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="bookmark"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="marking"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="list"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + </cd:assignments> + <cd:resolve name="assignment-userdata-list-optional"/> + </cd:arguments> + </cd:command> + <!-- - <cd:command name="definefloatframed" level="style" category="structure background" file="strc-flt.mkvi"> + <cd:command name="definefloatframed" level="style" category="structure" keywords="background" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -534,7 +559,7 @@ --> - <cd:command name="setupfloatframed" level="style" category="structure background" file="strc-flt.mkvi"> + <cd:command name="setupfloatframed" level="style" category="structure" keywords="background" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -642,244 +667,48 @@ </cd:arguments> </cd:command> - <cd:command name="doifelserightpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifelserightpagefloat" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifrightpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifrightpagefloatelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelseoddpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifelseoddpagefloat" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifoddpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifoddpagefloatelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemainfloatbody" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifelsemainfloatbody" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifmainfloatbodyelse" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifmainfloatbodyelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <!-- - - <cd:command name="placefigure" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placefigure" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="figuretext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistoffigures" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistoffigures" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placetable" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placetable" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tabletext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistoftables" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistoftables" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placegraphic" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placegraphic" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="graphictext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistofgraphics" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistofgraphics" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placeintermezzo" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placeintermezzo" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="intermezzotext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistofintermezzi" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistofintermezzi" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placechemical" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placechemical" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistofchemicals" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistofchemicals" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - <cd:command name="setuplocalfloats" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes"> @@ -914,7 +743,7 @@ <cd:command name="forcelocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="setupfloatsplitting" level="style" category="structure counter" file="tabl-tsp.mkiv"> + <cd:command name="setupfloatsplitting" level="style" category="structure" keywords="counter" file="tabl-tsp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -947,7 +776,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotinsidesplitfloat" level="system" category="structure conditional" file="tabl-tsp.mkiv"> + <cd:command name="doifnotinsidesplitfloat" level="system" category="structure" keywords="conditional" file="tabl-tsp.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> </cd:arguments> @@ -999,6 +828,11 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="width"> + <cd:constant type="fit" default="yes"/> + <cd:constant type="frame"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fontfamily.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fontfamily.xml index e20346319d2..e5683d21ab6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-fontfamily.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fontfamily.xml @@ -222,4 +222,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fonts.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fonts.xml index 721bfca6313..a32aa1672e4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-fonts.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fonts.xml @@ -210,6 +210,7 @@ </cd:parameter> <cd:parameter name="dimensions"> <cd:constant type="cd:number"/> + <cd:constant type="strut"/> </cd:parameter> <cd:parameter name="boundingbox"> <cd:constant type="yes"/> @@ -291,7 +292,11 @@ <cd:constant type="yes" default="yes"/> <cd:constant type="no"/> </cd:parameter> - <cd:parameter name="cd:name"> + <cd:parameter name="uppercasing"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="lowercasing"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> </cd:parameter> @@ -302,6 +307,13 @@ <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> </cd:parameter> + <cd:parameter name="metapost"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="cd:name"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -322,7 +334,7 @@ </cd:arguments> </cd:command> - <cd:command name="addfeature" category="fonts" level="style" file="font-fea.mkvi"> + <cd:command name="addfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -422,14 +434,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentfonthasfeature" level="system" category="fonts conditional" file="font-fea.mkvi"> + <cd:command name="doifelsecurrentfonthasfeature" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifcurrentfonthasfeatureelse" level="system" category="fonts conditional" file="font-fea.mkvi"> + <cd:command name="doifcurrentfonthasfeatureelse" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -437,14 +449,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefontfeature" level="system" category="fonts conditional" file="font-fea.mkvi"> + <cd:command name="doifelsefontfeature" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiffontfeatureelse" level="system" category="fonts conditional" file="font-fea.mkvi"> + <cd:command name="doiffontfeatureelse" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -452,7 +464,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifunknownfontfeature" level="system" category="fonts conditional" file="font-fea.mkvi"> + <cd:command name="doifunknownfontfeature" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -557,7 +569,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefontsynonym" level="system" category="fonts conditional" file="font-fil.mkvi"> + <cd:command name="doifelsefontsynonym" level="system" category="fonts" keywords="conditional" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -565,7 +577,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontsynonymelse" level="system" category="fonts conditional" file="font-fil.mkvi"> + <cd:command name="doiffontsynonymelse" level="system" category="fonts" keywords="conditional" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -745,22 +757,18 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupbodyfontenvironment" level="style" category="fonts" file="font-ini.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:keywords> - <cd:constant type="default"/> - <cd:constant type="cd:dimension"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="definebodyfontenvironment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupbodyfontenvironment" level="style" category="fonts" file="font-ini.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:keywords> + <cd:constant type="default"/> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="definebodyfontenvironment"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command name="processbodyfontenvironmentlist" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> @@ -1119,6 +1127,12 @@ <cd:command name="setsuperiors" level="style" category="fonts" file="font-pre.mkiv"/> + <cd:command name="setfractions" level="style" category="fonts" file="font-pre.mkiv"/> + + <cd:command name="uppercasing" level="style" category="fonts" file="font-pre.mkiv"/> + + <cd:command name="lowercasing" level="style" category="fonts" file="font-pre.mkiv"/> + <cd:command name="tinyfont" level="style" category="fonts" file="font-pre.mkiv"/> <cd:command name="infofont" level="style" category="fonts" file="font-pre.mkiv"/> @@ -1139,8 +1153,6 @@ <cd:command name="mono" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="monobold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="slanted" level="document" category="fonts" file="font-pre.mkiv"/> <cd:command name="italic" level="document" category="fonts" file="font-pre.mkiv"/> @@ -1403,14 +1415,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseitalic" level="system" category="fonts conditional" file="font-sym.mkvi"> + <cd:command name="doifelseitalic" level="system" category="fonts" keywords="conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifitalicelse" level="system" category="fonts conditional" file="font-sym.mkvi"> + <cd:command name="doifitalicelse" level="system" category="fonts" keywords="conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> @@ -1489,7 +1501,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefontchar" level="system" category="fonts conditional" file="font-sym.mkvi"> + <cd:command name="doifelsefontchar" level="system" category="fonts" keywords="conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-number"/> @@ -1498,7 +1510,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontcharelse" level="system" category="fonts conditional" file="font-sym.mkvi"> + <cd:command name="doiffontcharelse" level="system" category="fonts" keywords="conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-number"/> @@ -1515,7 +1527,7 @@ <cd:command name="showfontdata" level="document" category="fonts" file="font-tra.mkiv"/> - <cd:command name="doifelsefontpresent" level="system" category="fonts conditional" file="font-tra.mkiv"> + <cd:command name="doifelsefontpresent" level="system" category="fonts" keywords="conditional" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-true"/> @@ -1523,7 +1535,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontpresentelse" level="system" category="fonts conditional" file="font-tra.mkiv"> + <cd:command name="doiffontpresentelse" level="system" category="fonts" keywords="conditional" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-true"/> @@ -1748,11 +1760,36 @@ </cd:arguments> </cd:command> - <!-- question for ws: maybe move to i-file with ... level="system" category="structure" ... --> + <cd:command name="defineexpansion" level="style" category="fonts" file="hand-ini.mkx"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupexpansion"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupexpansion" level="style" category="fonts" file="hand-ini.mkx"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="step"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="stretch"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="shrink"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="addfontpath" level="style" category="fonts" file="font-ini.mkvi"> + <cd:command name="setexpansion" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> - <cd:resolve name="keyword-path-list"/> + <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-form.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-form.xml index fcb4979d02b..fac86741202 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-form.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-form.xml @@ -20,4 +20,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-formula.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-formula.xml index 72693fb6cc7..2530275c343 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-formula.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-formula.xml @@ -207,34 +207,6 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="spformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="sdformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mpformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mdformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> - - --> - <cd:command name="defineformulaalternative" level="system" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fraction.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fraction.xml index 33252dde2d0..6e6a9103012 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-fraction.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fraction.xml @@ -45,6 +45,7 @@ <cd:constant type="yes"/> <cd:constant type="no"/> <cd:constant type="auto" default="yes"/> + <cd:constant type="hidden"/> </cd:parameter> <cd:parameter name="left"> <cd:constant type="cd:number"/> @@ -100,73 +101,6 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="frac" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="xfrac" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="xxfrac" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="tfrac" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="sfrac" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="dfrac" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="binom" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="dbinom" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="tbinom" level="document" category="mathematics" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - - --> - <cd:command name="splitfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> @@ -202,4 +136,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml index 5e96ba80d2e..ad8080a9d47 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineframed" level="style" category="background rules" file="pack-rul.mkiv"> + <cd:command name="defineframed" level="style" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframed" level="style" category="background rules" file="pack-rul.mkiv"> + <cd:command name="setupframed" level="style" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -103,6 +103,9 @@ <cd:constant type="frame"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:resolve name="cd:color"/> + </cd:parameter> <cd:parameter name="component"> <cd:constant type="cd:name"/> </cd:parameter> @@ -225,23 +228,36 @@ <cd:constant type="cd:color"/> </cd:parameter> --> + <cd:parameter name="anchoring"> + <cd:resolve name="value-orientation"/> + </cd:parameter> + <cd:parameter name="xanchor"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="yanchor"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="linedirection"> + <cd:constant type="normal" default="yes"/> + <cd:constant type="reverse"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="frameddimension" level="system" category="background rules" file="pack-rul.mkiv"> + <cd:command name="frameddimension" level="system" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="framedparameter" level="system" category="background rules" file="pack-rul.mkiv"> + <cd:command name="framedparameter" level="system" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="framed" level="document" category="background rules" file="pack-rul.mkiv"> + <cd:command name="framed" level="document" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -250,7 +266,7 @@ </cd:arguments> </cd:command> - <cd:command name="framed" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> + <cd:command name="framed" generated="yes" variant="instance" level="document" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:sequence> <cd:instance value="framed"/> </cd:sequence> @@ -265,7 +281,7 @@ </cd:instances> </cd:command> - <cd:command name="normalframedwithsettings" level="system" category="background rules" file="pack-rul.mkiv"> + <cd:command name="normalframedwithsettings" level="system" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupframed"/> @@ -274,7 +290,7 @@ </cd:arguments> </cd:command> - <cd:command name="framed" type="environment" level="document" category="background rules" file="pack-rul.mkiv"> + <cd:command name="framed" type="environment" level="document" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -283,7 +299,7 @@ </cd:arguments> </cd:command> - <cd:command name="fastlocalframed" level="system" category="background rules" file="pack-rul.mkiv"> + <cd:command name="fastlocalframed" level="system" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -293,7 +309,7 @@ </cd:arguments> </cd:command> - <cd:command name="localframed" level="system" category="background rules" file="pack-rul.mkiv"> + <cd:command name="localframed" level="system" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -303,14 +319,14 @@ </cd:arguments> </cd:command> - <cd:command name="directlocalframed" level="system" category="background rules" file="pack-rul.mkiv"> + <cd:command name="directlocalframed" level="system" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="localframedwithsettings" level="system" category="background rules" file="pack-rul.mkiv"> + <cd:command name="localframedwithsettings" level="system" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -320,7 +336,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeframed" level="document" category="background rules" file="pack-rul.mkiv"> + <cd:command name="placeframed" level="document" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -330,7 +346,7 @@ </cd:arguments> </cd:command> - <cd:command name="inframed" level="document" category="background rules" file="pack-rul.mkiv"> + <cd:command name="inframed" level="document" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -339,20 +355,7 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="unframed" level="document" category="background rules" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="definemathframed" level="style" category="background rules mathematics" file="pack-rul.mkiv"> + <cd:command name="definemathframed" level="style" category="rules" keywords="background mathematics" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -362,7 +365,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathframed" level="style" category="background rules mathematics" file="pack-rul.mkiv"> + <cd:command name="setupmathframed" level="style" category="rules" keywords="background mathematics" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -371,7 +374,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathframed" generated="yes" variant="instance" level="document" category="background rules mathematics" file="pack-rul.mkiv"> + <cd:command name="mathframed" generated="yes" variant="instance" level="document" category="rules" keywords="background mathematics" file="pack-rul.mkiv"> <cd:sequence> <cd:instance value="mathframed"/> </cd:sequence> @@ -386,38 +389,7 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="mframed" level="document" category="background rules mathematics" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inmframed" level="document" category="background rules mathematics" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="mcframed" level="document" category="background rules mathematics" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="defineformulaframed" level="style" category="background rules mathematics" file="math-for.mkiv"> + <cd:command name="defineformulaframed" level="style" category="rules" keywords="background mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -427,7 +399,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupformulaframed" level="style" category="background rules mathematics" file="math-for.mkiv"> + <cd:command name="setupformulaframed" level="style" category="rules" keywords="background mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -436,7 +408,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineframedtext" level="style" category="background rules" file="pack-rul.mkiv"> + <cd:command name="defineframedtext" level="style" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -446,7 +418,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedtext" level="style" category="background rules" file="pack-rul.mkiv"> + <cd:command name="setupframedtext" level="style" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -487,7 +459,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedtexts" level="style" category="background rules" file="pack-rul.mkiv"> + <cd:command name="setupframedtexts" level="style" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -496,7 +468,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedtext" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> + <cd:command name="framedtext" generated="yes" variant="instance" level="document" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:sequence> <cd:instance value="framedtext"/> </cd:sequence> @@ -511,7 +483,7 @@ </cd:instances> </cd:command> - <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> + <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:sequence> <cd:instance value="framedtext"/> </cd:sequence> @@ -531,34 +503,7 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="framedtext" level="document" category="background rules" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="framedtext" type="environment" level="document" category="background rules" file="pack-rul.mkiv"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant type="middle"/> - <cd:constant type="none"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="defineframedcontent" level="style" category="background rules" file="pack-rul.mkiv"> + <cd:command name="defineframedcontent" level="style" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -568,7 +513,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedcontent" level="style" category="background rules" file="pack-rul.mkiv"> + <cd:command name="setupframedcontent" level="style" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -599,7 +544,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedcontent" type="environment" level="system" category="background rules" file="pack-rul.mkiv"> + <cd:command name="framedcontent" type="environment" level="system" category="rules" keywords="background" file="pack-rul.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -608,35 +553,35 @@ </cd:arguments> </cd:command> - <cd:command name="installleftframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> + <cd:command name="installleftframerenderer" level="system" category="rules" keywords="background" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installrightframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> + <cd:command name="installrightframerenderer" level="system" category="rules" keywords="background" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installtopframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> + <cd:command name="installtopframerenderer" level="system" category="rules" keywords="background" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installbottomframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> + <cd:command name="installbottomframerenderer" level="system" category="rules" keywords="background" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifelseframed" level="system" category="background rules"> + <cd:command name="doifelseframed" level="system" category="rules" keywords="background conditional" file="pack-rul.mkxl"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> @@ -644,4 +589,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-framedtable.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-framedtable.xml index 51699b5bc4d..4bea7ab9e5c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-framedtable.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-framedtable.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineframedtable" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:command name="defineframedtable" level="style" category="tables" keywords="background rules" file="tabl-frm.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="setupframedtable" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:command name="setupframedtable" level="style" category="tables" keywords="background rules" file="tabl-frm.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedtablerow" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:command name="setupframedtablerow" level="style" category="tables" keywords="background rules" file="tabl-frm.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedtablecolumn" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:command name="setupframedtablecolumn" level="style" category="tables" keywords="background rules" file="tabl-frm.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords> @@ -58,7 +58,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedtable" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:command name="framedtable" type="environment" level="document" category="tables" keywords="background rules" file="tabl-frm.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -67,7 +67,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedrow" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:command name="framedrow" type="environment" level="document" category="tables" keywords="background rules" file="tabl-frm.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedcell" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:command name="framedcell" type="environment" level="document" category="tables" keywords="background rules" file="tabl-frm.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -83,4 +83,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml index 924616474af..518706f35cb 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml @@ -85,6 +85,11 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="cmyk"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="auto"/> + </cd:parameter> <cd:parameter name="arguments"> <cd:constant type="cd:text"/> </cd:parameter> @@ -250,18 +255,14 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupexternalfigures" level="style" category="graphics" file="grph-inc.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupexternalfigure"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupexternalfigures" level="style" category="graphics" file="grph-inc.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupexternalfigure"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command name="useexternalfigure" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> @@ -318,7 +319,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefigure" level="system" category="graphics conditional" file="grph-inc.mkiv"> + <cd:command name="doifelsefigure" level="system" category="graphics" keywords="conditional" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -326,7 +327,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffigureelse" level="system" category="graphics conditional" file="grph-inc.mkiv"> + <cd:command name="doiffigureelse" level="system" category="graphics" keywords="conditional" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -478,7 +479,7 @@ </cd:arguments> </cd:command> - <cd:command name="typesetbuffer" level="document" category="graphics buffer" file="grph-fig.mkiv"> + <cd:command name="typesetbuffer" level="document" category="graphics" keywords="buffer" file="grph-fig.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="*"/> @@ -490,7 +491,16 @@ </cd:arguments> </cd:command> - <cd:command name="definetypesetting" level="style" category="graphics structure" file="grph-fig.mkiv"> + <cd:command name="typesetbufferonly" level="document" category="graphics" keywords="buffer" file="grph-fig.mkiv"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="*"/> + <cd:constant type="cd:buffer"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="definetypesetting" level="style" category="graphics" keywords="structure" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text-optional"/> @@ -500,7 +510,7 @@ </cd:arguments> </cd:command> - <cd:command name="typesetfile" level="document" category="graphics structure" file="grph-fig.mkiv"> + <cd:command name="typesetfile" level="document" category="graphics" keywords="structure" file="grph-fig.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -546,4 +556,26 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="includesvgfile" level="document" category="graphics" file="grph-inc.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-file"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="offset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="includesvgbuffer" level="document" category="graphics" file="grph-inc.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-buffer"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="offset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-help.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-help.xml index 6e8612c5a53..ea8f0bc9481 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-help.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-help.xml @@ -49,14 +49,14 @@ </cd:instances> </cd:command> - <cd:command name="doifelsehelp" level="system" category="pdf conditional" file="scrn-hlp.mkvi"> + <cd:command name="doifelsehelp" level="system" category="pdf" keywords="conditional" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifhelpelse" level="system" category="pdf conditional" file="scrn-hlp.mkvi"> + <cd:command name="doifhelpelse" level="system" category="pdf" keywords="conditional" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> @@ -86,4 +86,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-hemistich.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-hemistich.xml index a508c51f857..0fbe5e86302 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-hemistich.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-hemistich.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehemistich" level="style" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:command name="definehemistich" level="style" category="whitespace" keywords="fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphemistich" level="style" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:command name="setuphemistich" level="style" category="whitespace" keywords="fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="hemistiches" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:command name="hemistiches" level="document" category="whitespace" keywords="fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -58,7 +58,7 @@ </cd:arguments> </cd:command> - <cd:command name="hemistiches" variant="assignment" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:command name="hemistiches" variant="assignment" level="document" category="whitespace" keywords="fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuphemistich"/> @@ -68,7 +68,7 @@ </cd:arguments> </cd:command> - <cd:command name="hemistich" generated="yes" variant="instance" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:command name="hemistich" generated="yes" variant="instance" level="document" category="whitespace" keywords="fonts" file="m-hemistich.mkiv"> <cd:sequence> <cd:instance value="hemistich"/> </cd:sequence> @@ -78,7 +78,7 @@ </cd:arguments> </cd:command> - <cd:command name="hemistichescaesura" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:command name="hemistichescaesura" level="document" category="whitespace" keywords="fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:keywords delimiters="braces"> @@ -89,4 +89,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-highlight.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-highlight.xml index 9da39818ee2..46b53e24c25 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-highlight.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-highlight.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehighlight" level="style" category="fonts colors" file="core-sys.mkiv"> + <cd:command name="definehighlight" level="style" category="fonts" keywords="colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphighlight" level="style" category="fonts colors" file="core-sys.mkiv"> + <cd:command name="setuphighlight" level="style" category="fonts" keywords="colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="highlight" generated="yes" variant="example" level="document" category="fonts colors" file="core-sys.mkiv"> + <cd:command name="highlight" generated="yes" variant="example" level="document" category="fonts" keywords="colors" file="core-sys.mkiv"> <cd:sequence> <cd:variable value="highlight"/> </cd:sequence> @@ -41,24 +41,24 @@ </cd:arguments> </cd:command> - <cd:command name="highlight" level="document" category="fonts colors" file="core-sys.mkiv"> + <cd:command name="highlight" level="document" category="fonts" keywords="colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="highlight" type="environment" level="document" category="fonts colors" file="core-sys.mkiv"> + <cd:command name="highlight" type="environment" level="document" category="fonts" keywords="colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="directhighlight" level="document" category="fonts colors" file="core-sys.mkiv"> + <cd:command name="directhighlight" level="document" category="fonts" keywords="colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-hspace.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-hspace.xml index 31c21586487..222317468c4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-hspace.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-hspace.xml @@ -87,8 +87,6 @@ <cd:command name="removeunwantedspaces" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="thinspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="negthinspace" level="style" category="whitespace" file="spac-hor.mkiv"/> <cd:command name="enspace" level="style" category="whitespace" file="spac-hor.mkiv"/> @@ -111,11 +109,11 @@ </cd:arguments> </cd:command> - <cd:command name="leftskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"/> + <cd:command name="leftskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl"/> - <cd:command name="rightskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"/> + <cd:command name="rightskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl"/> - <cd:command name="dosetleftskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="dosetleftskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-leftskip"/> @@ -123,7 +121,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosetrightskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="dosetrightskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-rightskip"/> @@ -131,7 +129,7 @@ </cd:arguments> </cd:command> - <cd:command name="doadaptleftskip" level="system" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="doadaptleftskip" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-leftskip"/> @@ -139,7 +137,7 @@ </cd:arguments> </cd:command> - <cd:command name="doadaptrightskip" level="system" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="doadaptrightskip" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-rightskip"/> @@ -147,7 +145,7 @@ </cd:arguments> </cd:command> - <cd:command name="activatespacehandler" level="system" category="whitespace" file="spac-hor.mkiv"> + <cd:command name="activatespacehandler" level="system" category="whitespace" file="spac-hor.mkxl"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="on"/> @@ -161,10 +159,32 @@ </cd:arguments> </cd:command> - <cd:command name="quads" level="style" category="whitespace" file="spac-hor.mkiv"> + <cd:command name="quads" level="style" category="whitespace" file="spac-hor.mkxl"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> + <cd:command name="interwordspacebefore" level="system" category="whitespace" file="spac-hor.mkxl"/> + + <cd:command name="interwordspaceafter" level="system" category="whitespace" file="spac-hor.mkxl"/> + + <cd:command name="interwordspacesbefore" level="system" category="whitespace" file="spac-hor.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="interwordspacesafter" level="system" category="whitespace" file="spac-hor.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="interwordspaces" level="system" category="whitespace" file="spac-hor.mkxl"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-hyphenation.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-hyphenation.xml index 75cdbae7529..19a91072b7f 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-hyphenation.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-hyphenation.xml @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="definehypenationfeatures" level="style" category="language" file="lang-hyp.mkiv"> + <cd:command name="definehyphenationfeatures" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -261,4 +261,16 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="dohyphens" level="style" category="language" file="lang-ini.mkxl"/> + + <cd:command name="nohyphens" level="style" category="language" file="lang-ini.mkxl"/> + + <cd:command name="usehyphensparameter" level="system" category="language" file="lang-ini.mkxl"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + + <cd:command name="compounddiscretionary" level="system" category="language" file="lang-mis.mkxl"/> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-imposition.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-imposition.xml index 98fdcf25310..ad05424ce08 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-imposition.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-imposition.xml @@ -11,7 +11,7 @@ </cd:arguments> </cd:command> - <cd:command name="invokepageheandler" level="system" category="layout" file="page-imp.mkiv"> + <cd:command name="invokepagehandler" level="system" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> @@ -79,4 +79,4 @@ <cd:command name="arrangedpages" type="environment" begin="push" end="pop" level="system" category="layout" file="page-imp.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-indent.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-indent.xml index ed91b9193b0..0117cbb10cc 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-indent.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-indent.xml @@ -88,4 +88,11 @@ <cd:command name="indentation" type="environment" begin="push" end="pop" level="system" category="whitespace" file="spac-hor.mkiv"/> + <cd:command name="doifelseindented" level="system" category="whitespace" keywords="conditional" file="supp-box.lua"> + <cd:arguments> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-indentedtext.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-indentedtext.xml index 8d19c321f99..4921115a5a3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-indentedtext.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-indentedtext.xml @@ -69,4 +69,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-injector.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-injector.xml index 3728d7bb863..2ba2a5da24e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-injector.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-injector.xml @@ -70,4 +70,4 @@ --> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-insertion.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-insertion.xml index c8c4ed7217a..d3398614b1e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-insertion.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-insertion.xml @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseinsertion" level="system" category="structure conditional" file="page-ins.mkiv"> + <cd:command name="doifelseinsertion" level="system" category="structure" keywords="conditional" file="page-ins.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinsertionelse" level="system" category="structure conditional" file="page-ins.mkiv"> + <cd:command name="doifinsertionelse" level="system" category="structure" keywords="conditional" file="page-ins.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -45,4 +45,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-interaction.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-interaction.xml index 2496e5d9451..14151a4d407 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-interaction.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-interaction.xml @@ -143,18 +143,18 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselocation" level="system" category="pdf conditional" file="scrn-ini.mkvi"> + <cd:command name="doifelselocation" level="system" category="pdf" keywords="conditional" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiflocationelse" level="system" category="pdf conditional" file="scrn-ini.mkvi"> + <cd:command name="doiflocationelse" level="system" category="pdf" keywords="conditional" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-interactionbar.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-interactionbar.xml index e03d2a0719c..8981c6e2b37 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-interactionbar.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-interactionbar.xml @@ -97,4 +97,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-interactionmenu.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-interactionmenu.xml index 32fac36f9c7..26b7eabe81d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-interactionmenu.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-interactionmenu.xml @@ -277,4 +277,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-interface.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-interface.xml index 66b48535e46..6434eb61d2a 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-interface.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-interface.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defaultinterface" level="system" file="mult-ini.mkiv"/> + <cd:command name="defaultinterface" level="system" category="interface" file="mult-ini.mkiv"/> - <cd:command name="currentinterface" level="system" file="mult-ini.mkiv"/> + <cd:command name="currentinterface" level="system" category="interface" file="mult-ini.mkiv"/> - <cd:command name="currentresponses" level="system" file="mult-ini.mkiv"/> + <cd:command name="currentresponses" level="system" category="interface" file="mult-ini.mkiv"/> - <cd:command name="interface" type="environment" level="system" file="mult-ini.mkiv"> + <cd:command name="interface" type="environment" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="all"/> @@ -19,53 +19,53 @@ </cd:arguments> </cd:command> - <cd:command name="defineinterfaceconstant" level="system" file="mult-ini.mkiv"> + <cd:command name="defineinterfaceconstant" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defineinterfacevariable" level="system" file="mult-ini.mkiv"> + <cd:command name="defineinterfacevariable" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defineinterfaceelement" level="system" file="mult-ini.mkiv"> + <cd:command name="defineinterfaceelement" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definefileconstant" level="system" file="mult-ini.mkiv"> + <cd:command name="definefileconstant" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definesystemconstant" level="system" file="mult-ini.mkiv"> + <cd:command name="definesystemconstant" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definemessageconstant" level="system" file="mult-ini.mkiv"> + <cd:command name="definemessageconstant" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definesystemvariable" level="system" file="mult-ini.mkiv"> + <cd:command name="definesystemvariable" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacemessage" level="system" file="mult-ini.mkiv"> + <cd:command name="setinterfacemessage" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="setmessagetext" level="system" file="mult-ini.mkiv"> + <cd:command name="setmessagetext" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -87,9 +87,9 @@ </cd:arguments> </cd:command> - <cd:command name="currentmessagetext" level="system" file="mult-ini.mkiv"/> + <cd:command name="currentmessagetext" level="system" category="tracker" file="mult-ini.mkiv"/> - <cd:command name="getmessage" level="system" file="mult-ini.mkiv"> + <cd:command name="getmessage" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -99,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsemessage" level="system" file="mult-ini.mkiv"> + <cd:command name="doifelsemessage" level="system" category="tracker" keywords="conditional" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmessageelse" level="system" file="mult-ini.mkiv"> + <cd:command name="doifmessageelse" level="system" category="tracker" keywords="conditional" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -123,7 +123,7 @@ </cd:arguments> </cd:command> - <cd:command name="showmessage" level="system" file="mult-ini.mkiv"> + <cd:command name="showmessage" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -134,32 +134,32 @@ </cd:arguments> </cd:command> - <cd:command name="writestatus" level="system" file="mult-ini.mkiv"> + <cd:command name="writestatus" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="message" level="system" file="mult-ini.mkiv"> + <cd:command name="message" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="inlinemessage" level="system" file="mult-ini.mkiv"> + <cd:command name="inlinemessage" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="displaymessage" level="system" file="mult-ini.mkiv"> + <cd:command name="displaymessage" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showwarning" level="system" file="mult-ini.mkiv"> + <cd:command name="showwarning" level="system" category="tracker" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -170,33 +170,32 @@ </cd:arguments> </cd:command> - <cd:command name="setinterfaceconstant" level="system" file="mult-ini.mkiv"> + <cd:command name="setinterfaceconstant" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacevariable" level="system" file="mult-ini.mkiv"> + <cd:command name="setinterfacevariable" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfaceelement" level="system" file="mult-ini.mkiv"> + <cd:command name="setinterfaceelement" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacecommand" level="system" file="mult-ini.mkiv"> + <cd:command name="setinterfacecommand" level="system" category="interface" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-interlinespace.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-interlinespace.xml index 94911afb9d5..e0fbe0dca15 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-interlinespace.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-interlinespace.xml @@ -173,4 +173,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-ipsum.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-ipsum.xml index b3fb7cfdd48..83dc8f0d09d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-ipsum.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-ipsum.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineipsum" level="style" file="m-ipsum.mkiv"> + <cd:command name="defineipsum" level="style" category="language" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupipsum" level="style" file="m-ipsum.mkiv"> + <cd:command name="setupipsum" level="style" category="language" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="ipsum" level="document" file="m-ipsum.mkiv"> + <cd:command name="ipsum" level="document" category="language" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -72,10 +72,10 @@ </cd:arguments> </cd:command> - <cd:command name="directipsum" level="document" file="m-ipsum.mkiv"> + <cd:command name="directipsum" level="document" category="language" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-italiccorrection.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-italiccorrection.xml index 2d406bdf5a6..4522634fcaf 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-italiccorrection.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-italiccorrection.xml @@ -29,4 +29,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml index a3271d12f72..81fc3ba5a8f 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml @@ -163,6 +163,8 @@ <cd:parameter name="placestopper"> <cd:constant type="yes" default="yes"/> <cd:constant type="no"/> + <cd:constant type="display"/> + <cd:constant type="inline"/> </cd:parameter> <cd:parameter name="style"> <cd:resolve name="value-style"/> @@ -194,7 +196,7 @@ <cd:parameter name="packcriterium"> <cd:constant type="cd:number"/> </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:define> @@ -254,6 +256,7 @@ <cd:constant type="inmargin"/> <cd:constant type="atmargin"/> <cd:constant type="intext"/> + <cd:constant type="headintext"/> <cd:constant type="loose"/> <cd:constant type="fit"/> <cd:constant type="nofit"/> @@ -352,6 +355,8 @@ <cd:parameter name="placestopper"> <cd:constant type="yes" default="yes"/> <cd:constant type="no"/> + <cd:constant type="display"/> + <cd:constant type="inline"/> </cd:parameter> <cd:parameter name="style"> <cd:resolve name="value-style"/> @@ -380,7 +385,10 @@ <cd:parameter name="grid"> <cd:inherit name="definegridsnapping"/> </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:parameter name="packcriterium"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:define> @@ -394,7 +402,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" level="style" category="structure counter" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" level="style" category="structure" keywords="counter" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -406,7 +414,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" variant="assignment" level="style" category="structure counter" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" variant="assignment" level="style" category="structure" keywords="counter" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -416,7 +424,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroups" level="style" category="structure counter" file="strc-itm.mkvi"> + <cd:command name="setupitemgroups" level="style" category="structure" keywords="counter" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -426,7 +434,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" generated="yes" variant="instance" level="style" category="structure counter" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" generated="yes" variant="instance" level="style" category="structure" keywords="counter" file="strc-itm.mkvi"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="itemgroup"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-items.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-items.xml index ab50b669d46..6ff396bed8e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-items.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-items.xml @@ -82,4 +82,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-javascript.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-javascript.xml index e97c5109c8f..1c3f11f63a4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-javascript.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-javascript.xml @@ -48,4 +48,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-kerning.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-kerning.xml index 64a2513b960..af7ca0474e9 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-kerning.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-kerning.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"> + <cd:command name="definecharacterkerning" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"> + <cd:command name="setupcharacterkerning" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"> + <cd:command name="setcharacterkerning" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -47,9 +47,9 @@ </cd:arguments> </cd:command> - <cd:command name="resetcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"/> + <cd:command name="resetcharacterkerning" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv"/> - <cd:command name="characterkerning" generated="yes" variant="example" level="document" category="fonts whitespace" file="typo-krn.mkiv"> + <cd:command name="characterkerning" generated="yes" variant="example" level="document" category="fonts" keywords="whitespace" file="typo-krn.mkiv"> <cd:sequence> <cd:variable value="characterkerning"/> </cd:sequence> @@ -59,21 +59,21 @@ </cd:arguments> </cd:command> - <cd:command name="kerncharacters" level="document" category="fonts whitespace" file="typo-krn.mkiv"> + <cd:command name="kerncharacters" level="document" category="fonts" keywords="whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="letterspacing" level="document" category="fonts whitespace" file="typo-krn.mkiv"> + <cd:command name="letterspacing" level="document" category="fonts" keywords="whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="stretched" level="document" category="fonts whitespace" file="typo-krn.mkiv"> + <cd:command name="stretched" level="document" category="fonts" keywords="whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupstretched"/> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupstretched" level="style" category="fonts whitespace" file="typo-krn.mkiv"> + <cd:command name="setupstretched" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacterkerning"/> @@ -90,7 +90,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:command name="defineperiodkerning" level="style" category="fonts" keywords="whitespace" file="typo-pnc.mkic"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -100,7 +100,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:command name="setupperiodkerning" level="style" category="fonts" keywords="whitespace" file="typo-pnc.mkic"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="setperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:command name="setperiodkerning" level="style" category="fonts" keywords="whitespace" file="typo-pnc.mkic"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -120,6 +120,6 @@ </cd:arguments> </cd:command> - <cd:command name="resetperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"/> + <cd:command name="resetperiodkerning" level="style" category="fonts" keywords="whitespace" file="typo-pnc.mkic"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-label.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-label.xml index a1d36ef4364..9faf850a54f 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-label.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-label.xml @@ -221,4 +221,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-labeltext.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-labeltext.xml index 7ad6b6ba824..6609f86a9a9 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-labeltext.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-labeltext.xml @@ -135,389 +135,4 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="setuplabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presetlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copylabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="labeltext" type="environment" flevel="style" category="language" ile="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="labellanguage" level="system" category="language" file="lang-lab.mkiv"/> - - <cd:command name="labeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="labeltexts" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="leftlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="rightlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="setupheadtext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presetheadtext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copyheadtext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="headtext" type="environment" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="headlanguage" level="system" category="language" file="lang-lab.mkiv"/> - - <cd:command name="headtext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="headtexts" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="leftheadtext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="rightheadtext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="setupmathlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presetmathlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copymathlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="mathlabeltext" type="environment" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="mathlabellanguage" level="system" category="language" file="lang-lab.mkiv"/> - - <cd:command name="mathlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="mathlabeltexts" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="leftmathlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="rightmathlabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="setuptaglabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presettaglabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copytaglabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="taglabeltext" type="environment" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="taglabellanguage" level="system" category="language" file="lang-lab.mkiv"/> - - <cd:command name="taglabeltext" level="style" category="language" file="lang-lab.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="setupunittext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presetunittext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copyunittext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="unittext" type="environment" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="unitlanguage" level="system" category="language" file="phys-dim.mkiv"/> - - <cd:command name="unittext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="setupoperatortext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presetoperatortext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copyoperatortext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="operatortext" type="environment" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="operatorlanguage" level="system" category="language" file="phys-dim.mkiv"/> - - <cd:command name="operatortext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="setupprefixtext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presetprefixtext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copyprefixtext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="prefixtext" type="environment" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="prefixlanguage" level="system" category="language" file="phys-dim.mkiv"/> - - <cd:command name="prefixtext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="setupsuffixtext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presetsuffixtext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copysuffixtext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="suffixtext" type="environment" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="suffixlanguage" level="system" category="language" file="phys-dim.mkiv"/> - - <cd:command name="suffixtext" level="style" category="language" file="phys-dim.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="setupbtxlabeltext" level="style" category="language" file="publ-ini.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="presetbtxlabeltext" level="style" category="language" file="publ-ini.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-userdata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="copybtxlabeltext" level="style" category="language" file="publ-ini.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="assignment-labeldata-list"/> - </cd:arguments> - </cd:command> - - <cd:command name="btxlabeltext" type="environment" level="style" category="language" file="publ-ini.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:resolve name="keyword-key"/> - </cd:arguments> - </cd:command> - - <cd:command name="btxlabellanguage" level="system" category="language" file="publ-ini.mkiv"/> - - <cd:command name="btxlabeltext" level="style" category="language" file="publ-ini.mkiv"> - <cd:arguments> - <cd:resolve name="argument-key"/> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-language.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-language.xml index de8835a790a..9bb92c7227c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-language.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-language.xml @@ -134,7 +134,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselanguage" level="system" category="language conditional" file="lang-ini.mkiv"> + <cd:command name="doifelselanguage" level="system" category="language" keywords="conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -142,7 +142,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflanguageelse" level="system" category="language conditional" file="lang-ini.mkiv"> + <cd:command name="doiflanguageelse" level="system" category="language" keywords="conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -150,7 +150,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepatterns" level="system" category="language conditional" file="lang-ini.mkiv"> + <cd:command name="doifelsepatterns" level="system" category="language" keywords="conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -158,7 +158,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpatternselse" level="system" category="language conditional" file="lang-ini.mkiv"> + <cd:command name="doifpatternselse" level="system" category="language" keywords="conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-layer.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-layer.xml index 77aaf7d52d2..3b1af0d00f3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-layer.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-layer.xml @@ -283,7 +283,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayerdata" level="system" category="background conditional" file="pack-lyr.mkiv"> + <cd:command name="doifelselayerdata" level="system" category="background" keywords="conditional" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -291,7 +291,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayerdataelse" level="system" category="background conditional" file="pack-lyr.mkiv"> + <cd:command name="doiflayerdataelse" level="system" category="background" keywords="conditional" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -303,7 +303,7 @@ <cd:command name="layerheight" level="system" category="background" file="pack-lyr.mkiv"/> - <cd:command name="setMPlayer" level="document" category="background metapost" file="pack-lyr.mkiv"> + <cd:command name="setMPlayer" level="document" category="background" keywords="metapost" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -314,7 +314,7 @@ </cd:arguments> </cd:command> - <cd:command name="getMPlayer" level="document" category="background metapost" file="pack-lyr.mkiv"> + <cd:command name="getMPlayer" level="document" category="background" keywords="metapost" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -324,4 +324,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml index 0d256e967db..b4a830f9807 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml @@ -225,7 +225,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayoutdefined" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doifelselayoutdefined" level="system" category="layout" keywords="conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -233,7 +233,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayoutdefinedelse" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doiflayoutdefinedelse" level="system" category="layout" keywords="conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -262,21 +262,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseoddpage" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doifelseoddpage" level="system" category="layout" keywords="conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifoddpageelse" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doifoddpageelse" level="system" category="layout" keywords="conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifbothsidesoverruled" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doifbothsidesoverruled" level="system" category="layout" keywords="conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -284,7 +284,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifbothsides" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doifbothsides" level="system" category="layout" keywords="conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -292,7 +292,7 @@ </cd:arguments> </cd:command> - <cd:command name="rightorleftpageaction" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="rightorleftpageaction" level="system" category="layout" keywords="conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -364,6 +364,7 @@ <cd:constant type="nc"/> <cd:constant type="sp"/> <cd:constant type="in"/> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> @@ -372,14 +373,14 @@ <cd:command name="spread" type="environment" level="document" category="layout" file="page-spr.mkiv"/> - <cd:command name="doifelsetopofpage" level="system" category="layout conditional" file="page-ini.mkiv"> + <cd:command name="doifelsetopofpage" level="system" category="layout" keywords="conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiftopofpageelse" level="system" category="layout conditional" file="page-ini.mkiv"> + <cd:command name="doiftopofpageelse" level="system" category="layout" keywords="conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-linefiller.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-linefiller.xml index ab53e64b028..74803cbe5a3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-linefiller.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-linefiller.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:command name="definelinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:command name="setuplinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -29,9 +29,14 @@ <cd:constant type="local" default="yes"/> <cd:constant type="global"/> </cd:parameter> - <cd:parameter name="color"> - <cd:constant type="cd:color"/> + <cd:parameter name="mp"> + <cd:constant type="cd:name"/> </cd:parameter> + <!-- + cd:parameter name="method"> + <cd:constant type="cd:number"/> + </cd:parameter + --> <cd:parameter name="height"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -47,9 +52,15 @@ <cd:parameter name="rulethickness"> <cd:constant type="cd:dimension"/> </cd:parameter> - <!-- cd:parameter name="method"> - <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="color"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="textstyle"> <cd:resolve name="value-style"/> </cd:parameter> @@ -59,20 +70,11 @@ <cd:parameter name="align"> <cd:inherit name="setupalign"/> </cd:parameter> - <cd:parameter name="mp"> - <cd:constant type="cd:name"/> - </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:assignments> </cd:arguments> </cd:command> - <cd:command name="setuplinefillers" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:command name="setuplinefillers" level="style" category="rules" keywords="metapost" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -81,7 +83,7 @@ </cd:arguments> </cd:command> - <cd:command name="linefiller" type="environment" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:command name="linefiller" type="environment" level="style" category="rules" keywords="metapost" file="node-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -93,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:command name="setlinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -102,4 +104,28 @@ </cd:arguments> </cd:command> + <cd:command name="linefillerhbox" level="document" category="rules" keywords="metapost boxes" file="node-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="linefillervbox" level="document" category="rules" keywords="metapost boxes" file="node-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="linefillervtop" level="document" category="rules" keywords="metapost boxes" file="node-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="string-boxoptions"/> + <cd:content/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-linenumber.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-linenumber.xml index 3dc562e6838..9a53a42cb49 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-linenumber.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-linenumber.xml @@ -140,7 +140,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesamelinereference" level="system" category="structure conditional" file="page-lin.mkvi"> + <cd:command name="doifelsesamelinereference" level="system" category="structure" keywords="conditional" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -148,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsamelinereferenceelse" level="system" category="structure conditional" file="page-lin.mkvi"> + <cd:command name="doifsamelinereferenceelse" level="system" category="structure" keywords="conditional" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -169,4 +169,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-lines.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-lines.xml index 50078627675..7b6a76565d6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-lines.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-lines.xml @@ -4,33 +4,39 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="noflines" level="system" file="supp-box.mkiv"/> + <cd:command name="noflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv"/> - <cd:command name="getnoflines" level="system" file="supp-box.mkiv"> + <cd:command name="getnoflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getroundednoflines" level="system" file="supp-box.mkiv"> + <cd:command name="getroundednoflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getrawnoflines" level="system" file="supp-box.mkiv"> + <cd:command name="getrawnoflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="determinenoflines" level="system" file="supp-box.mkiv"> + <cd:command name="determinenoflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definelines" level="style" file="spac-lin.mkiv"> + <cd:command name="noflinesinbox" level="system" category="boxes" file="supp-box.lua"> + <cd:arguments> + <cd:resolve name="string-box"/> + </cd:arguments> + </cd:command> + + <cd:command name="definelines" level="style" category="structure" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -40,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplines" level="style" file="spac-lin.mkiv"> + <cd:command name="setuplines" level="style" category="structure" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -84,11 +90,15 @@ <cd:parameter name="right"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="indentlist" list="yes"> + <cd:constant type="cd:dimension"/> + <cd:constant type="*"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="lines" type="environment" generated="yes" variant="instance" level="document" file="spac-lin.mkiv"> + <cd:command name="lines" type="environment" generated="yes" variant="instance" level="document" category="structure" file="spac-lin.mkiv"> <cd:sequence> <cd:instance value="lines"/> </cd:sequence> @@ -102,22 +112,10 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="lines" type="environment" level="document" file="spac-lin.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplines"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="emptylines" level="document" file="spac-lin.mkiv"> + <cd:command name="emptylines" level="document" category="whitespace" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-linetable.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-linetable.xml index a515f40fd18..ac622472b96 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-linetable.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-linetable.xml @@ -112,7 +112,7 @@ <cd:command name="linetablebody" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"/> - <cd:command name="processlinetablebuffer" level="document" category="tables buffer" file="tabl-ltb.mkiv"> + <cd:command name="processlinetablebuffer" level="document" category="tables" keywords="buffer" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> @@ -162,4 +162,4 @@ --> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-linewidth.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-linewidth.xml index 6d9043a1fae..e276572af99 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-linewidth.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-linewidth.xml @@ -17,4 +17,4 @@ <cd:command name="linewidth" level="style" category="layout" file="pack-rul.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-list.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-list.xml index a3ae226767e..7b207b32352 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-list.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-list.xml @@ -101,10 +101,11 @@ <cd:parameter name="pagecommand"> <cd:constant type="cd:oneargument"/> </cd:parameter> - <cd:parameter name="pagenumber"> + <cd:parameter name="pagenumber" list="yes"> <cd:constant type="yes" default="yes"/> <cd:constant type="no"/> <cd:constant type="always"/> + <cd:constant type="realpage"/> </cd:parameter> <cd:parameter name="headnumber"> <cd:constant type="yes" default="yes"/> @@ -309,7 +310,7 @@ --> - <cd:command name="doifelselist" level="system" category="structure conditional" file="strc-lst.mkvi"> + <cd:command name="doifelselist" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-list"/> <cd:resolve name="argument-true"/> @@ -317,7 +318,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflistelse" level="system" category="structure conditional" file="strc-lst.mkvi"> + <cd:command name="doiflistelse" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-list"/> <cd:resolve name="argument-true"/> @@ -504,34 +505,6 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="setupcontent" level="style" category="structure" file="strc-lst.mkvi"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placecontent" level="document" category="structure" file="strc-lst.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completecontent" level="document" category="structure" file="strc-lst.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - <cd:command name="structurelistuservariable" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> @@ -544,28 +517,28 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsestructurelisthaspage" level="system" category="structure conditional" file="strc-lst.mkvi"> + <cd:command name="doifelsestructurelisthaspage" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifstructurelisthaspageelse" level="system" category="structure conditional" file="strc-lst.mkvi"> + <cd:command name="doifstructurelisthaspageelse" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsestructurelisthasnumber" level="system" category="structure conditional" file="strc-lst.mkvi"> + <cd:command name="doifelsestructurelisthasnumber" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifstructurelisthasnumberelse" level="system" category="structure conditional" file="strc-lst.mkvi"> + <cd:command name="doifstructurelisthasnumberelse" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> @@ -680,4 +653,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml index 3208555e079..d345d76c865 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml @@ -7,6 +7,11 @@ <cd:command name="TeX" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="TEX" level="document" category="symbols" file="cont-log.mkiv"/> + <!-- + <cd:command name="TeXprefix" level="document" category="symbols" file="cont-log.mkiv"/> + <cd:command name="TeXsuffix" level="document" category="symbols" file="cont-log.mkiv"/> + --> + <cd:command name="Context" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="ConTeXt" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="CONTEXT" level="document" category="symbols" file="cont-log.mkiv"/> @@ -23,12 +28,16 @@ <cd:command name="MKII" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="MKIV" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="MKVI" level="document" category="symbols" file="cont-log.mkiv"/> + <cd:command name="MKXL" level="document" category="symbols" file="cont-log.mkiv"/> + <cd:command name="MKLX" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="MKIX" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="MKXI" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="MPII" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="MPIV" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="MPVI" level="document" category="symbols" file="cont-log.mkiv"/> + <cd:command name="MPXL" level="document" category="symbols" file="cont-log.mkiv"/> + <cd:command name="MPLX" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="PPCHTeX" level="document" category="symbols" file="cont-log.mkiv"/> <cd:command name="PPCHTEX" level="document" category="symbols" file="cont-log.mkiv"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-lohi.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-lohi.xml index c174a9f5496..035c7b23b18 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-lohi.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-lohi.xml @@ -226,4 +226,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-lua.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-lua.xml index c7f114251be..4246225073f 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-lua.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-lua.xml @@ -172,6 +172,13 @@ </cd:sequence> </cd:command> + <cd:command name="setctxluafunction" level="system" category="lua" file="luat-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + <cd:command name="ctxfunction" type="environment" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> @@ -184,10 +191,50 @@ </cd:arguments> </cd:command> + <cd:command name="installctxfunction" level="system" category="lua" file="luat-ini.mkiv"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="ctxfunction" generated="yes" variant="example" level="system" category="lua" file="luat-ini.mkiv"> <cd:sequence> <cd:variable value="ctxfunction"/> </cd:sequence> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="installctxscanner" level="system" category="lua" file="luat-ini.mkiv"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="ctxscanner" generated="yes" variant="example" level="system" category="lua" file="luat-ini.mkiv"> + <cd:sequence> + <cd:variable value="ctxscanner"/> + </cd:sequence> + </cd:command> + + <cd:command name="installprotectedctxfunction" level="system" category="lua" file="luat-ini.mkiv"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="installprotectedctxscanner" level="system" category="lua" file="luat-ini.mkiv"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="resetctxscanner" level="system" category="lua" file="luat-ini.mkiv"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-luatable.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-luatable.xml new file mode 100644 index 00000000000..a2eb74d82bc --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-luatable.xml @@ -0,0 +1,76 @@ +<?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="newluatable" level="system" category="lua" file="cldf-int.mkxl"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + + <cd:command name="useluatable" level="system" category="lua" file="cldf-int.mkxl"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + + <cd:command name="disposeluatable" level="system" category="lua" file="cldf-lmt.lua"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + + <cd:command name="inspectluatable" level="system" category="lua" file="cldf-lmt.lua"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + + <cd:command name="showluatables" level="system" category="lua" file="cldf-lmt.lua"/> + + <cd:command name="setluatable" level="system" category="lua" file="cldf-lmt.lua"> + <cd:arguments> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="getfromluatable" level="system" category="lua" file="cldf-lmt.lua"> + <cd:arguments> + <cd:csname/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="idxfromluatable" level="system" category="lua" file="cldf-lmt.lua"> + <cd:arguments> + <cd:csname/> + <cd:resolve name="string-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="setdatavalue" level="system" category="lua" file="cldf-int.mkxl"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + <cd:command name="getdatavalue" level="system" category="lua" file="cldf-int.mkxl"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="thedatavalue" level="system" category="lua" file="cldf-int.mkxl"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml index dc2bd9ad486..15c327f6b90 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-makeup.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemakeup" level="style" category="structure layout" file="page-mak.mkvi"> + <cd:command name="definemakeup" level="style" category="structure" keywords="layout" file="page-mak.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmakeup" level="style" category="structure layout" file="page-mak.mkvi"> + <cd:command name="setupmakeup" level="style" category="structure" keywords="layout" file="page-mak.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="makeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> + <cd:command name="makeup" type="environment" level="document" category="structure" keywords="layout" file="page-mak.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -122,7 +122,7 @@ </cd:arguments> </cd:command> - <cd:command name="makeup" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-mak.mkvi"> + <cd:command name="makeup" type="environment" generated="yes" variant="instance" level="document" category="structure" keywords="layout" file="page-mak.mkvi"> <cd:sequence> <cd:instance value="makeup"/> <cd:string value="makeup"/> @@ -137,40 +137,4 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="standardmakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmakeup"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="textmakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmakeup"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="pagemakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmakeup"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="middlemakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmakeup"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-marginblock.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-marginblock.xml index 0d0e3c2b4c4..0443a234e4b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-marginblock.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-marginblock.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemarginblock" level="style" category="structure layout" file="page-mbk.mkvi"> + <cd:command name="definemarginblock" level="style" category="structure" keywords="layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmarginblock" level="style" category="structure layout" file="page-mbk.mkvi"> + <cd:command name="setupmarginblock" level="style" category="structure" keywords="layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -67,7 +67,7 @@ <!-- - <cd:command name="setupmarginblocks" level="style" category="structure layout" file="page-mbk.mkvi"> + <cd:command name="setupmarginblocks" level="style" category="structure" keywords="layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -78,10 +78,10 @@ --> - <cd:command name="marginblock" type="environment" level="document" category="structure layout" file="page-mbk.mkvi"> + <cd:command name="marginblock" type="environment" level="document" category="structure" keywords="layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-margindata.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-margindata.xml index a157aaf9ca5..006101afa51 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-margindata.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-margindata.xml @@ -165,269 +165,4 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="inleftmargin" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inrightmargin" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inoutermargin" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="ininnermargin" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inleftedge" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inrightedge" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="ininneredge" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inouteredge" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="atleftmargin" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="atrightmargin" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inleft" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inright" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="ininner" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inouter" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inmargin" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inother" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="margintext" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="marginword" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="margintitle" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="inothermargin" level="document" category="structure" file="typo-mar.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="reference"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:inherit name="setupmargindata"/> - </cd:assignments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmarginframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-marker.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-marker.xml index 2db8a9de129..8dc6ba97849 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-marker.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-marker.xml @@ -30,4 +30,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-marking.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-marking.xml index 914922cf2d6..8eb17f6edd3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-marking.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-marking.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemarking" level="style" file="strc-mar.mkiv"> + <cd:command name="definemarking" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-mark-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmarking" level="style" file="strc-mar.mkiv"> + <cd:command name="setupmarking" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark-list-optional"/> <cd:assignments list="yes"> @@ -36,27 +36,30 @@ </cd:arguments> </cd:command> - <cd:command name="relatemarking" level="system" file="strc-mar.mkiv"> + <cd:command name="relatemarking" level="system" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="setmarking" level="style" file="strc-mar.mkiv"> + <cd:command name="setmarking" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="resetmarking" level="system" file="strc-mar.mkiv"> + <cd:command name="resetmarking" level="system" category="structure" file="strc-mar.mkiv"> <cd:arguments> - <cd:resolve name="keyword-mark"/> + <cd:keywords> + <cd:constant type="all"/> + <cd:constant type="cd:mark"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="synchronizemarking" level="system" file="strc-mar.mkiv"> + <cd:command name="synchronizemarking" level="system" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="keyword-number"/> @@ -66,7 +69,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsemarking" level="system" category="conditional" file="strc-mar.mkiv"> + <cd:command name="doifelsemarking" level="system" category="structure" keywords="conditional" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="argument-mark"/> <cd:resolve name="argument-true"/> @@ -74,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmarkingelse" level="system" category="conditional" file="strc-mar.mkiv"> + <cd:command name="doifmarkingelse" level="system" category="structure" keywords="conditional" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="argument-mark"/> <cd:resolve name="argument-true"/> @@ -82,12 +85,13 @@ </cd:arguments> </cd:command> - <cd:command name="getmarking" level="style" file="strc-mar.mkiv"> + <cd:command name="getmarking" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> <cd:constant type="page" default="yes"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords optional="yes"> <cd:resolve name="value-markposition"/> @@ -95,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchonemark" level="style" file="strc-mar.mkiv"> + <cd:command name="fetchonemark" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> @@ -104,19 +108,19 @@ </cd:arguments> </cd:command> - <cd:command name="fetchtwomarks" level="style" file="strc-mar.mkiv"> + <cd:command name="fetchtwomarks" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="fetchallmarks" level="style" file="strc-mar.mkiv"> + <cd:command name="fetchallmarks" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="fetchmark" level="style" file="strc-mar.mkiv"> + <cd:command name="fetchmark" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> @@ -125,12 +129,13 @@ </cd:arguments> </cd:command> - <cd:command name="fetchmarking" level="style" file="strc-mar.mkiv"> + <cd:command name="fetchmarking" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> <cd:constant type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords> <cd:resolve name="value-markposition"/> @@ -138,12 +143,13 @@ </cd:arguments> </cd:command> - <cd:command name="fetchonemarking" level="style" file="strc-mar.mkiv"> + <cd:command name="fetchonemarking" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> <cd:constant type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords> <cd:resolve name="value-markposition"/> @@ -151,24 +157,26 @@ </cd:arguments> </cd:command> - <cd:command name="fetchtwomarkings" level="style" file="strc-mar.mkiv"> + <cd:command name="fetchtwomarkings" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> <cd:constant type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="fetchallmarkings" level="style" file="strc-mar.mkiv"> + <cd:command name="fetchallmarkings" level="style" category="structure" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> <cd:constant type="page"/> <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml index 888d2bac509..1f2255cef99 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml @@ -111,9 +111,9 @@ <cd:constant type="normal"/> </cd:parameter> <cd:parameter name="collapsing"> - <cd:constant type="1"/> + <cd:constant type="1" default="yes"/> <cd:constant type="2"/> - <cd:constant type="3" default="yes"/> + <cd:constant type="3"/> <cd:constant type="none"/> <cd:constant type="reset"/> </cd:parameter> @@ -567,4 +567,4 @@ <cd:command name="unstackscripts" level="document" category="mathematics" file="math-ini.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathalignment.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathalignment.xml index 325b288c7ac..725797cfafe 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathalignment.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathalignment.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathalignment" level="style" category="mathematics alignment" file="math-ali.mkiv"> + <cd:command name="definemathalignment" level="style" category="mathematics" keywords="alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathalignment" level="style" category="mathematics alignment" file="math-ali.mkiv"> + <cd:command name="setupmathalignment" level="style" category="mathematics" keywords="alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -53,7 +53,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" level="document" category="mathematics alignment" file="math-ali.mkiv"> + <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" level="document" category="mathematics" keywords="alignment" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathalignment"/> </cd:sequence> @@ -67,24 +67,4 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="mathalignment" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathalignment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="align" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathalignment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathcases.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathcases.xml index 837f2b78281..1736f09b716 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathcases.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathcases.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathcases" level="style" category="mathematics alignment" file="math-ali.mkiv"> + <cd:command name="definemathcases" level="style" category="mathematics" keywords="alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathcases" level="style" category="mathematics alignment" file="math-ali.mkiv"> + <cd:command name="setupmathcases" level="style" category="mathematics" keywords="alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathcases" type="environment" generated="yes" variant="instance" level="document" category="mathematics alignment" file="math-ali.mkiv"> + <cd:command name="mathcases" type="environment" generated="yes" variant="instance" level="document" category="mathematics" keywords="alignment" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathcases"/> </cd:sequence> @@ -55,24 +55,4 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="mathcases" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathcases"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="cases" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathcases"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathmatrix.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathmatrix.xml index 581a6928ac7..3b8076407c4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathmatrix.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathmatrix.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathmatrix" level="style" category="mathematics tables" file="math-ali.mkiv"> + <cd:command name="definemathmatrix" level="style" category="mathematics" keywords="tables" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathmatrix" level="style" category="mathematics tables" file="math-ali.mkiv"> + <cd:command name="setupmathmatrix" level="style" category="mathematics" keywords="tables" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -56,7 +56,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" level="document" category="mathematics tables" file="math-ali.mkiv"> + <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathmatrix"/> </cd:sequence> @@ -70,36 +70,22 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="mathmatrix" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathmatrix"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="matrix" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathmatrix"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="mathmatrix" generated="yes" level="document" category="mathematics tables" file="math-ali.mkiv"> + <cd:command name="mathmatrix" generated="yes" variant="instance" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv"> <cd:sequence> - <cd:variable value="mathmatrix"/> + <cd:instance value="mathmatrix"/> </cd:sequence> <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathmatrix"/> + </cd:assignments> <cd:content/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-simplematrix"/> + </cd:instances> </cd:command> - <cd:command name="matrices" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> + <cd:command name="matrices" type="environment" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> @@ -131,20 +117,20 @@ </cd:arguments> </cd:command> - <cd:command name="bordermatrix" level="document" category="mathematics tables" file="math-pln.mkiv"> + <cd:command name="bordermatrix" level="document" category="mathematics" keywords="tables" file="math-pln.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bbordermatrix" level="document" category="mathematics tables" file="math-pln.mkiv"> + <cd:command name="bbordermatrix" level="document" category="mathematics" keywords="tables" file="math-pln.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bordermatrix" type="environment" level="document" category="mathematics tables" file="math-pln.mkiv"/> + <cd:command name="bordermatrix" type="environment" level="document" category="mathematics" keywords="tables" file="math-pln.mkiv"/> - <cd:command name="bbordermatrix" type="environment" level="document" category="mathematics tables" file="math-pln.mkiv"/> + <cd:command name="bbordermatrix" type="environment" level="document" category="mathematics" keywords="tables" file="math-pln.mkiv"/> </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathname.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathname.xml index 63dab099192..161dcf00cc0 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathname.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathname.xml @@ -4,1088 +4,1088 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="mathhash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mathhash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mathdollar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mathdollar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mathpercent" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mathpercent" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mathampersand" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mathampersand" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lparent" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lparent" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rparent" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rparent" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ast" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ast" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mathhyphen" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mathhyphen" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="colon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="colon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lt" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lt" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gt" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gt" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lbracket" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="backslash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="backslash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rbracket" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Hat" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Hat" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="grave" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="grave" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lbrace" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lbrace" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rbrace" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rbrace" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="yen" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="yen" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="S" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="S" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ddot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ddot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="pm" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="pm" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="acute" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="acute" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="P" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="P" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="centerdot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="centerdot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="times" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="times" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eth" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eth" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="div" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="div" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lambdabar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lambdabar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="hat" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="hat" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="check" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="check" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="breve" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="breve" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="dot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="dot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ring" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ring" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="tilde" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="tilde" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="widehat" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="widehat" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="widetilde" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="widetilde" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="not" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="not" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Alpha" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Alpha" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Beta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Beta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Gamma" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Gamma" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Delta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Delta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Epsilon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Epsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Zeta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Zeta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Eta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Eta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Theta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Theta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Iota" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Iota" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Kappa" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Kappa" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Lambda" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Lambda" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Mu" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Mu" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Nu" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Nu" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Xi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Xi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Omicron" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Omicron" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Pi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Pi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Rho" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Rho" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Sigma" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Sigma" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Tau" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Tau" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Upsilon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Upsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Phi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Phi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Chi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Chi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Psi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Psi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Omega" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Omega" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="alpha" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="alpha" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="beta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="beta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gamma" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gamma" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="delta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="delta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="varepsilon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="varepsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="zeta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="zeta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="theta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="theta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="iota" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="iota" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="kappa" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="kappa" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lambda" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lambda" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mu" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mu" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nu" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nu" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="xi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="xi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="omicron" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="omicron" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="pi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="pi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rho" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rho" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="varsigma" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="varsigma" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sigma" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sigma" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="tau" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="tau" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="upsilon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="upsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="varphi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="varphi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="chi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="chi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="psi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="psi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="omega" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="omega" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="varTheta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="varTheta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="phi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="phi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="varpi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="varpi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="digamma" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="digamma" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="varkappa" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="varkappa" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="epsilon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="epsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="backepsilon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="backepsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bullet" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bullet" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="prime" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="prime" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="doubleprime" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="doubleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="tripleprime" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="tripleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="reversedprime" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="reversedprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="reverseddoubleprime" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="reverseddoubleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="reversedtripleprime" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="reversedtripleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="quadrupleprime" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="quadrupleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="invisibletimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="invisibletimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="positivesign" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="positivesign" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="negativesign" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="negativesign" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="vec" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="vec" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="dddot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="dddot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigsquare" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigsquare" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigdiamond" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigdiamond" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="actuarial" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="actuarial" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="complexes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="complexes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Eulerconst" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Eulerconst" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Plankconst" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Plankconst" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Im" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Im" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ell" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ell" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="naturalnumbers" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="naturalnumbers" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="wp" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="wp" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="primes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="primes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rationals" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rationals" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Re" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Re" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="reals" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="reals" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="integers" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="integers" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ohm" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ohm" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mho" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mho" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="turnediota" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="turnediota" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Angstrom" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Angstrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Finv" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Finv" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="aleph" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="aleph" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="beth" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="beth" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gimel" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gimel" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="daleth" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="daleth" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Game" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Game" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sansLturned" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sansLturned" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sansLmirrored" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sansLmirrored" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Yup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Yup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="differentialD" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="differentialD" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="differentiald" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="differentiald" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="exponentiale" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="exponentiale" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="imaginaryi" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="imaginaryi" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="imaginaryj" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="imaginaryj" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="PropertyLine" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="PropertyLine" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="upand" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="upand" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="uparrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="uparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="downarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="downarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="updownarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="updownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nwarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nwarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="searrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="searrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="swarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="swarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftwavearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftwavearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightwavearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightwavearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="twoheadleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="twoheadleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="twoheaduparrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="twoheaduparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="twoheadrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="twoheadrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="twoheaddownarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="twoheaddownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftarrowtail" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightarrowtail" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mapsfrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mapsup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mapsup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mapsto" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mapsto" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mapsdown" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mapsdown" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="updownarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="updownarrowbar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="hookleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="hookleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="hookrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="hookrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="looparrowleft" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="looparrowleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="looparrowright" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="looparrowright" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftrightsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftrightsquigarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="downzigzagarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="downzigzagarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Lsh" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Lsh" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Rsh" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Rsh" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Ldsh" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Ldsh" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Rdsh" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Rdsh" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="linefeed" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="linefeed" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="carriagereturn" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="carriagereturn" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="curvearrowleft" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="curvearrowleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="curvearrowright" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="curvearrowright" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="barovernorthwestarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="barovernorthwestarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="barleftarrowrightarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="barleftarrowrightarrowbar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftharpoonup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftharpoonup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftharpoondown" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftharpoondown" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="upharpoonleft" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="upharpoonleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightharpoonup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightharpoonup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightharpoondown" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightharpoondown" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="downharpoonright" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="downharpoonright" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="downharpoonleft" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="downharpoonleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightleftarrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightleftarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="updownarrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="updownarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftrightarrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftrightarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftleftarrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftleftarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="upuparrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="upuparrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightrightarrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightrightarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="downdownarrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="downdownarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftrightharpoons" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftrightharpoons" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightleftharpoons" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightleftharpoons" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nLeftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nLeftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nLeftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nLeftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nRightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nRightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Leftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Leftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Uparrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Uparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Downarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Downarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Leftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Leftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Updownarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Updownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Nwarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Nwarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Nearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Nearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Searrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Searrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Swarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Swarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Lleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Lleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Rrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Rrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftsquigarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nHuparrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nHuparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nHdownarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nHdownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftdasharrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftdasharrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="updasharrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="updasharrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="downdasharrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="downdasharrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="barleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="barleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightarrowbar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftwhitearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="upwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="upwhitearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightwhitearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="downwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="downwhitearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="whitearrowupfrombar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="whitearrowupfrombar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circleonrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circleonrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="downuparrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="downuparrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightthreearrows" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightthreearrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nvleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nvleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nvrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nvrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nvleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nvleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nVleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nVleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nVrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nVrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nVleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nVleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftarrowtriangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightarrowtriangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftrightarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftrightarrowtriangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="forall" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="forall" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="complement" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="complement" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="partial" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="partial" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="exists" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="exists" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nexists" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nexists" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="emptyset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="emptyset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nabla" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nabla" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="in" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="in" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="prod" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="prod" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="coprod" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="coprod" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sum" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sum" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="mp" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="mp" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="dotplus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="dotplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="diagup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="diagup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="diagdown" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="diagdown" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ast" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ast" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circ" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circ" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="propto" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="propto" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="infty" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="infty" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="angle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="angle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="measuredangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="measuredangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sphericalangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sphericalangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="divides" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="divides" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nparallel" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nparallel" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="cap" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="cap" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="cup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="cup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="oint" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="oint" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="oiint" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="oiint" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="oiiint" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="oiiint" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="intclockwise" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="intclockwise" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ointclockwise" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ointclockwise" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ointctrclockwise" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ointctrclockwise" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="therefore" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="therefore" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="because" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="because" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="colon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="colon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="squaredots" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="squaredots" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="dotminus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="dotminus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="minuscolon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="minuscolon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="backsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="backsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="wr" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="wr" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eqsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eqsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="simeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="simeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsimeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsimeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="approxnEq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="approxnEq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="approx" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="approx" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="napprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="napprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="approxeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="approxeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="asymp" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="asymp" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Bumpeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Bumpeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="doteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="doteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="fallingdotseq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="fallingdotseq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="risingdotseq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="risingdotseq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="colonequals" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="colonequals" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="equalscolon" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="equalscolon" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eqcirc" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eqcirc" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="wedgeeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="wedgeeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="veeeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="veeeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="stareq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="stareq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="triangleq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="triangleq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="definedeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="definedeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="measuredeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="measuredeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="questionedeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="questionedeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="equiv" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="equiv" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nequiv" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nequiv" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="geqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="geqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lneqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gneqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ll" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ll" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gg" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gg" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="between" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="between" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nasymp" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nasymp" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nless" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nless" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ngtr" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ngtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nleq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nleq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ngeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ngeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lesssim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lesssim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gtrsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gtrsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nlesssim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nlesssim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ngtrsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ngtrsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lessgtr" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lessgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gtrless" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gtrless" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nlessgtr" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nlessgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ngtrless" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ngtrless" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="prec" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="prec" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succ" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succ" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="preccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="preccurlyeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succcurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succcurlyeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="precsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="precsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nprec" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nprec" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsucc" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsucc" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="subset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="subset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="supset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="supset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsubset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsubset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsupset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsupset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="subseteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="subseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="supseteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="supseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsubseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsupseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="subsetneq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="subsetneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="supsetneq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="supsetneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="uplus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="uplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sqsubset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sqsubset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sqsupset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sqsupset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sqsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sqsubseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sqsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sqsupseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sqcap" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sqcap" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sqcup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sqcup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="oplus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="oplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ominus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ominus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="otimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="otimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="oslash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="oslash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="odot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="odot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circledcirc" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circledcirc" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circledast" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circledast" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circledequals" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circledequals" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circleddash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circleddash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="boxplus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="boxplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="boxminus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="boxminus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="boxtimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="boxtimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="boxdot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="boxdot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="vdash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="vdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="dashv" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="dashv" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="top" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="top" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="models" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="models" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="vDash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="vDash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Vdash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Vdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Vvdash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Vvdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="VDash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="VDash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nvdash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nvdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nvDash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nvDash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nVdash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nVdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nVDash" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nVDash" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="multimap" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="multimap" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="intercal" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="intercal" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="veebar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="veebar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="barwedge" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="barwedge" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigwedge" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigwedge" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigvee" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigvee" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigcap" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigcap" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigcup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigcup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="diamond" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="diamond" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="star" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="star" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="divideontimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="divideontimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ltimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ltimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rtimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rtimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leftthreetimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leftthreetimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rightthreetimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rightthreetimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="curlyvee" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="curlyvee" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="curlywedge" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="curlywedge" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Subset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Subset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Supset" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Supset" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="pitchfork" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="pitchfork" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lessdot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lessdot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gtrdot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gtrdot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lesseqgtr" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lesseqgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gtreqless" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gtreqless" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eqless" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eqless" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eqgtr" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eqgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="curlyeqprec" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="curlyeqprec" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="curlyeqsucc" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="curlyeqsucc" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="npreccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="npreccurlyeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsucccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsucccurlyeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsqsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsqsubseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nsqsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nsqsupseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sqsubsetneq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sqsubsetneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sqsupsetneq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sqsupsetneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lnsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lnsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gnsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gnsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="precnsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="precnsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succnsim" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succnsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ntriangleright" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ntriangleright" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ntriangleleft" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ntriangleleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ntrianglelefteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ntrianglelefteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ntrianglerighteq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ntrianglerighteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="vdots" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="vdots" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="cdots" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="cdots" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="udots" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="udots" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ddots" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ddots" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lceil" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lceil" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rceil" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rceil" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lfloor" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lfloor" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rfloor" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rfloor" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="ulcorner" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="ulcorner" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="urcorner" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="urcorner" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="llcorner" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="llcorner" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lrcorner" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lrcorner" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="frown" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="frown" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="smile" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="smile" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lmoustache" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lmoustache" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rmoustache" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rmoustache" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="overbracket" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="overbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="underbracket" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="underbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="overparent" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="overparent" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="underparent" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="underparent" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="overbrace" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="overbrace" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="underbrace" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="underbrace" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circledR" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circledR" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="circledS" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="circledS" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="blacksquare" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="blacksquare" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="blacktriangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="blacktriangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="blacktriangleright" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="blacktriangleright" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="triangleright" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="triangleright" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="blacktriangledown" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="blacktriangledown" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="blacktriangleleft" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="blacktriangleleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="triangleleft" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="triangleleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lozenge" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lozenge" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigcirc" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigcirc" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigstar" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigstar" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="spadesuit" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="spadesuit" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="heartsuit" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="heartsuit" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="diamondsuit" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="diamondsuit" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="clubsuit" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="clubsuit" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="blacklozenge" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="blacklozenge" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="flat" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="flat" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="natural" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="natural" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="sharp" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="sharp" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="checkmark" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="checkmark" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="maltese" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="maltese" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="llbracket" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="llbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rrbracket" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rrbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="langle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="langle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="llangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="llangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rrangle" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rrangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lgroup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lgroup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rgroup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rgroup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="longleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="longleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="longrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="longrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="longleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="longleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Longleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Longleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Longrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Longrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Longleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Longleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="longmapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="longmapsfrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="longmapsto" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="longmapsto" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Longmapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Longmapsfrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Longmapsto" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Longmapsto" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="longrightsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="longrightsquigarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Mapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Mapsfrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Mapsto" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Mapsto" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Uuparrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Uuparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="Ddownarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="Ddownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="dashedleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="dashedleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="dashedrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="dashedrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="dottedrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="dottedrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="twoheadrightarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="twoheadrightarrowtail" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="nwsearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="nwsearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="neswarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="neswarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lhooknwarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lhooknwarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rhooknearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rhooknearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lhooksearrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lhooksearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rhookswarrow" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rhookswarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigodot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigodot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigoplus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigoplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigotimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigotimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigudot" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigudot" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="biguplus" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="biguplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigsqcap" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigsqcap" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigsqcup" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigsqcup" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="bigtimes" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="bigtimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="amalg" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="amalg" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="coloncolonequals" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="coloncolonequals" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eqeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eqeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eqeqeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eqeqeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="leqslant" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="leqslant" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="geqslant" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="geqslant" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lessapprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lessapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gtrapprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gtrapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lneq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="rneq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="rneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lnapprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lnapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gnapprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gnapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="lesseqqgtr" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="lesseqqgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="gtreqqless" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="gtreqqless" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eqslantless" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eqslantless" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="eqslantgtr" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="eqslantgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="preceq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="preceq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succeq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="precneq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="precneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succneq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="preceqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="preceqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succeqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succeqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="precneqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="precneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succneqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="precapprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="precapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succapprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="precnapprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="precnapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="succnapprox" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="succnapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="subseteqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="subseteqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="supseteqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="supseteqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="subsetneqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="subsetneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="supsetneqq" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="supsetneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="backprime" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="backprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="imath" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="imath" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="jmath" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="jmath" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="vartheta" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="vartheta" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="varkappa" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="varkappa" level="document" category="mathematics" keywords="character" file="char-def.lua"/> - <cd:command name="varrho" level="document" category="character mathematics" file="char-def.lua"/> + <cd:command name="varrho" level="document" category="mathematics" keywords="character" file="char-def.lua"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathornament.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathornament.xml index 70100b8e4f5..11f630c6523 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathornament.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathornament.xml @@ -43,4 +43,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathradical.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathradical.xml index a7ba93b7512..9a29ad82bfb 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathradical.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathradical.xml @@ -53,4 +53,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathstackers.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathstackers.xml index 561936b9c28..b5adfbc60a9 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathstackers.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathstackers.xml @@ -105,6 +105,18 @@ <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> </cd:parameter> + <cd:parameter name="lt"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rt"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="lb"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rb"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -354,844 +366,6 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="xrel" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xequal" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xLeftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xRightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xLeftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xmapsto" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xhookleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xhookrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightoverleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftrightharpoons" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightleftharpoons" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtriplerel" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrel" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mequal" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mLeftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mRightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mLeftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mmapsto" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mhookleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mhookrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightoverleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftrightharpoons" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightleftharpoons" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtriplerel" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftarrowfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightarrowfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftrightarrowfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="etwoheadrightarrowfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftharpoondownfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftharpoonupfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightharpoondownfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightharpoonupfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbarfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbarfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbracefill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbracefill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverparentfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderparentfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbracketfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbracketfill" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trel" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tequal" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tmapsto" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tLeftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tRightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tLeftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="thookleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="thookrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightoverleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftrightharpoons" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightleftharpoons" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttriplerel" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="cleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="crightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="crightoverleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="undertwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="undertwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbar" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbrace" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underparent" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbracket" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overtwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overtwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbar" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbrace" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overparent" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbracket" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebar" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebrace" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doubleparent" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebracket" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbarunderbar" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbraceunderbrace" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overparentunderparent" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbracketunderbracket" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbartext" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbracetext" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overparenttext" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbrackettext" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbartext" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbracetext" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underparenttext" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbrackettext" level="document" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - --> - <cd:command name="singlebond" level="document" category="mathematics" file="math-stc.mkvi"/> <cd:command name="doublebond" level="document" category="mathematics" file="math-stc.mkvi"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-metapost.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-metapost.xml index 1c8fd2d0b9c..f79fe9f2f6c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-metapost.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-metapost.xml @@ -4,40 +4,40 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="MPdefinitions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPdefinitions" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> - <cd:resolve name="argument-name-optional"/> + <cd:resolve name="argument-instance-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPextensions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPextensions" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> - <cd:resolve name="argument-name-list-optional"/> + <cd:resolve name="argument-instance-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPinitializations" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"/> + <cd:command name="MPinitializations" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"/> - <cd:command name="MPinclusions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPinclusions" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> </cd:keywords> - <cd:resolve name="argument-name-optional"/> + <cd:resolve name="argument-instance-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPinclusions" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPinclusions" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> </cd:keywords> - <cd:resolve name="argument-name-optional"/> + <cd:resolve name="argument-instance-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="defineMPinstance" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="defineMPinstance" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -47,12 +47,13 @@ </cd:arguments> </cd:command> - <cd:command name="setupMPinstance" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="setupMPinstance" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="format"> <cd:constant type="metafun" default="yes"/> + <cd:constant type="minifun"/> <cd:constant type="mpost"/> </cd:parameter> <cd:parameter name="initializations"> @@ -83,19 +84,19 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPinstance" level="system" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="resetMPinstance" level="system" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="processMPfigurefile" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="processMPfigurefile" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="MPdrawing" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPdrawing" type="environment" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="-"/> @@ -103,85 +104,85 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"/> + <cd:command name="resetMPdrawing" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"/> - <cd:command name="getMPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"/> + <cd:command name="getMPdrawing" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"/> - <cd:command name="MPdrawing" level="system" type="environment" begin="push" end="pop" category="graphics metapost" file="meta-ini.mkiv"/> + <cd:command name="MPdrawing" level="system" type="environment" begin="push" end="pop" category="graphics" keywords="metapost" file="meta-ini.mkiv"/> - <cd:command name="MPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPdrawing" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPclip" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPclip" type="environment" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPfontsizehskip" level="system" category="graphics metapost fonts" file="meta-ini.mkiv"> + <cd:command name="MPfontsizehskip" level="system" category="graphics" keywords="metapost fonts" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="setupMPvariables" level="style" file="meta-ini.mkiv"> + <cd:command name="setupMPvariables" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="setMPvariables" level="style" file="meta-ini.mkiv"> + <cd:command name="setMPvariables" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="setMPvariable" level="style" file="meta-ini.mkiv"> + <cd:command name="setMPvariable" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="MPrawvar" level="system" file="meta-ini.mkiv"> + <cd:command name="MPrawvar" level="system" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="MPvariable" level="style" file="meta-ini.mkiv"> + <cd:command name="MPvariable" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="MPvar" level="style" file="meta-ini.mkiv"> + <cd:command name="MPvar" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="useMPvariables" level="style" file="meta-ini.mkiv"> + <cd:command name="useMPvariables" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-key-list"/> </cd:arguments> </cd:command> - <cd:command name="uniqueMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="uniqueMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="uniqueMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="uniqueMPgraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -192,14 +193,14 @@ </cd:arguments> </cd:command> - <cd:command name="useMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="useMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="useMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="useMPgraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -210,14 +211,14 @@ </cd:arguments> </cd:command> - <cd:command name="usableMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="usableMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="reuseMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="reuseMPgraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -228,14 +229,14 @@ </cd:arguments> </cd:command> - <cd:command name="reusableMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="reusableMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="reusableMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="reusableMPgraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -246,14 +247,14 @@ </cd:arguments> </cd:command> - <cd:command name="uniqueMPpagegraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="uniqueMPpagegraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="uniqueMPpagegraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="uniqueMPpagegraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -264,19 +265,19 @@ </cd:arguments> </cd:command> - <cd:command name="processMPbuffer" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="processMPbuffer" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="runMPbuffer" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="runMPbuffer" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPenvironment" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPenvironment" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -286,72 +287,72 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPenvironment" level="style" category="graphics" file="meta-ini.mkiv"/> + <cd:command name="resetMPenvironment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"/> - <cd:command name="useMPenvironmentbuffer" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="useMPenvironmentbuffer" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="MPcode" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPcode" type="environment" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> - <cd:resolve name="argument-name-optional"/> + <cd:resolve name="argument-instance-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPcode" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPcode" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> - <cd:resolve name="argument-name-optional"/> + <cd:resolve name="argument-instance-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPrun" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPrun" type="environment" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="useMPrun" level="document" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="useMPrun" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="useMPlibrary" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="useMPlibrary" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setMPtext" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="setMPtext" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="MPtext" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPtext" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPstring" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPstring" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPbetex" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="MPbetex" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseMPgraphic" level="style" category="graphics metapost conditional" file="meta-ini.mkiv"> + <cd:command name="doifelseMPgraphic" level="style" category="graphics" keywords="metapost conditional" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -359,7 +360,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifMPgraphicelse" level="style" category="graphics metapost conditional" file="meta-ini.mkiv"> + <cd:command name="doifMPgraphicelse" level="style" category="graphics" keywords="metapost conditional" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -367,20 +368,20 @@ </cd:arguments> </cd:command> - <cd:command name="staticMPfigure" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="staticMPfigure" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="staticMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="staticMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="usestaticMPfigure" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="usestaticMPfigure" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupscale"/> @@ -389,7 +390,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupMPgraphics" level="style" category="graphics metapost" file="meta-ini.mkiv"> + <cd:command name="setupMPgraphics" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -403,4 +404,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml index 701375237ed..7d888a50f11 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemixedcolumns" level="style" category="structure layout" file="page-mix.mkiv"> + <cd:command name="definemixedcolumns" level="style" category="columns" keywords="structure layout" file="page-mix.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmixedcolumns" level="style" category="structure layout" file="page-mix.mkiv"> + <cd:command name="setupmixedcolumns" level="style" category="columns" keywords="structure layout" file="page-mix.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -96,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="mixedcolumns" type="environment" level="document" category="structure layout" file="page-mix.mkiv"> + <cd:command name="mixedcolumns" type="environment" level="document" category="columns" keywords="structure layout" file="page-mix.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-mix.mkiv"> + <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" level="document" category="columns" keywords="structure layout" file="page-mix.mkiv"> <cd:sequence> <cd:instance value="mixedcolumns"/> </cd:sequence> @@ -119,19 +119,7 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="boxedcolumns" type="environment" level="document" category="structure layout" file="page-mix.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmixedcolumns"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="setupcolumns" level="style" category="structure layout" file="page-smp.mkiv"> + <cd:command name="setupcolumns" level="style" category="columns" keywords="structure layout" file="page-smp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupmixedcolumns"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-modes.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-modes.xml index 8b35da6f84e..4b9c5afaa01 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-modes.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-modes.xml @@ -93,7 +93,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsemode" level="style" category="structure conditional" file="core-env.mkiv"> + <cd:command name="doifelsemode" level="style" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -101,7 +101,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmodeelse" level="style" category="structure conditional" file="core-env.mkiv"> + <cd:command name="doifmodeelse" level="style" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -109,14 +109,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifmode" level="style" category="structure conditional" file="core-env.mkiv"> + <cd:command name="doifmode" level="style" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotmode" level="style" category="structure conditional" file="core-env.mkiv"> + <cd:command name="doifnotmode" level="style" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -135,7 +135,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseallmodes" level="style" category="structure conditional" file="core-env.mkiv"> + <cd:command name="doifelseallmodes" level="style" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -143,7 +143,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifallmodeselse" level="style" category="structure conditional" file="core-env.mkiv"> + <cd:command name="doifallmodeselse" level="style" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -151,7 +151,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifallmodes" level="style" category="structure conditional" file="core-env.mkiv"> + <cd:command name="doifallmodes" level="style" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -159,7 +159,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotallmodes" level="style" category="structure conditional" file="core-env.mkiv"> + <cd:command name="doifnotallmodes" level="style" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -213,4 +213,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-modules.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-modules.xml index 03ed005e2a5..8e12f416022 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-modules.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-modules.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="usemodule" level="style" file="file-mod.mkvi"> + <cd:command name="usemodule" level="style" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -24,7 +24,7 @@ <!-- - <cd:command name="usemodules" level="style" file="file-mod.mkvi"> + <cd:command name="usemodules" level="style" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -44,7 +44,7 @@ --> - <cd:command name="usetexmodule" level="style" file="file-mod.mkvi"> + <cd:command name="usetexmodule" level="style" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -62,19 +62,19 @@ </cd:arguments> </cd:command> - <cd:command name="module" type="environment" level="system" file="file-mod.mkvi"> + <cd:command name="module" type="environment" level="system" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="module" type="environment" variant="string" level="system" file="file-mod.mkvi"> + <cd:command name="module" type="environment" variant="string" level="system" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="setupmodule" level="system" file="file-mod.mkvi"> + <cd:command name="setupmodule" level="system" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="keyword-file-optional"/> <cd:assignments list="yes"> @@ -89,38 +89,38 @@ </cd:arguments> </cd:command> - <cd:command name="moduleparameter" level="system" file="file-mod.mkvi"> + <cd:command name="moduleparameter" level="system" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="currentmoduleparameter" level="system" file="file-mod.mkvi"> + <cd:command name="currentmoduleparameter" level="system" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="moduletestsection" type="environment" level="system" file="file-mod.mkvi"/> + <cd:command name="moduletestsection" type="environment" level="system" category="structure" file="file-mod.mkvi"/> - <cd:command name="fetchruntinecommand" level="system" file="file-mod.mkvi"> + <cd:command name="fetchruntinecommand" level="system" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="luaenvironment" level="system" file="file-mod.mkvi"> + <cd:command name="luaenvironment" level="system" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useluamodule" level="system" file="file-mod.mkvi"> + <cd:command name="useluamodule" level="system" category="structure" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-narrow.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-narrow.xml index a229a2112bd..53584ce7cf5 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-narrow.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-narrow.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definenarrower" level="style" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="definenarrower" level="style" category="whitespace" keywords="layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnarrower" level="style" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="setupnarrower" level="style" category="whitespace" keywords="layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrower" type="environment" level="document" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="narrower" type="environment" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="left" prefix="cd:sign" method="none"/> @@ -61,7 +61,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrower" type="environment" generated="yes" variant="example" level="document" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="narrower" type="environment" generated="yes" variant="example" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv"> <cd:sequence> <cd:variable value="narrower"/> </cd:sequence> @@ -79,7 +79,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" level="document" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" variant="name" level="document" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" variant="name" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords list="yes" optional="yes"> @@ -104,7 +104,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" variant="assignment" level="document" category="whitespace layout" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" variant="assignment" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnarrower"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-naturaltable.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-naturaltable.xml index ac9ea9383cb..db7918c68f7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-naturaltable.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-naturaltable.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupTABLE" level="style" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="setupTABLE" level="style" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="r"/> @@ -123,7 +123,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLE" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -131,7 +131,15 @@ </cd:arguments> </cd:command> - <cd:command name="TD" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnested" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupTABLE"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="TD" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -160,7 +168,7 @@ </cd:arguments> </cd:command> - <cd:command name="TR" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TR" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -168,7 +176,7 @@ </cd:arguments> </cd:command> - <cd:command name="TC" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TC" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -176,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="TX" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TX" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -184,7 +192,7 @@ </cd:arguments> </cd:command> - <cd:command name="TY" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TY" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -192,7 +200,7 @@ </cd:arguments> </cd:command> - <cd:command name="TH" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TH" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -200,7 +208,7 @@ </cd:arguments> </cd:command> - <cd:command name="TN" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TN" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -208,7 +216,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEhead" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -216,7 +224,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEnext" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -224,7 +232,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEbody" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -232,7 +240,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEfoot" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -240,7 +248,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineTABLEsetup" level="style" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="defineTABLEsetup" level="style" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -249,19 +257,19 @@ </cd:arguments> </cd:command> - <cd:command name="TDs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TDs" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TRs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TRs" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TABLE" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -269,7 +277,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEhead" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -277,7 +285,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEnext" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -285,7 +293,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEbody" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -293,7 +301,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEfoot" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -301,4 +309,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml index ee1ac5a3181..bd1ebca2417 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="definenotation" level="system" category="structure notes" file="strc-not.mkvi"> + <cd:command name="definenotation" level="system" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -18,7 +18,7 @@ --> - <cd:command name="setupnotation" level="style" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setupnotation" level="style" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -193,7 +193,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnotations" level="style" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setupnotations" level="style" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -202,7 +202,7 @@ </cd:arguments> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -214,7 +214,7 @@ </cd:instances> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -226,7 +226,7 @@ </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -239,7 +239,7 @@ </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance:assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -251,7 +251,7 @@ </cd:instances> </cd:command> - <cd:command name="definenote" level="style" category="structure notes" file="strc-not.mkvi"> + <cd:command name="definenote" level="style" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -261,7 +261,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnote" level="style" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setupnote" level="style" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -404,7 +404,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnotes" level="style" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setupnotes" level="style" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -413,7 +413,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfootnotes" level="style" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setupfootnotes" level="style" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupnote"/> @@ -421,7 +421,7 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setnote" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -429,14 +429,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setnote" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> </cd:command> - <cd:command name="setnotetext" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setnotetext" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -444,14 +444,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnotetext" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="setnotetext" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> </cd:command> - <cd:command name="placenotes" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="placenotes" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:assignments list="yes" optional="yes"> @@ -460,13 +460,13 @@ </cd:arguments> </cd:command> - <cd:command name="localnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="localnotes" type="environment" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="placelocalnotes" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="placelocalnotes" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -475,13 +475,13 @@ </cd:arguments> </cd:command> - <cd:command name="postponenotes" level="style" category="structure notes" file="strc-not.mkvi"/> + <cd:command name="postponenotes" level="style" category="structure" keywords="notes" file="strc-not.mkvi"/> - <cd:command name="flushnotes" level="style" category="structure notes" file="strc-not.mkvi"/> + <cd:command name="flushnotes" level="style" category="structure" keywords="notes" file="strc-not.mkvi"/> - <cd:command name="postponingnotes" type="environment" category="structure notes" file="strc-not.mkvi"/> + <cd:command name="postponingnotes" type="environment" category="structure" keywords="notes" file="strc-not.mkvi" file="strc-not.mkvi"/> - <cd:command name="doifelsenoteonsamepage" level="system" category="structure notes conditional" file="strc-not.mkvi"> + <cd:command name="doifelsenoteonsamepage" level="system" category="structure" keywords="notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -489,7 +489,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnoteonsamepageelse" level="system" category="structure notes conditional" file="strc-not.mkvi"> + <cd:command name="doifnoteonsamepageelse" level="system" category="structure" keywords="notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -497,70 +497,41 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotescollected" level="system" category="structure notes conditional" file="strc-not.mkvi"> + <cd:command name="doifnotescollected" level="system" category="structure" keywords="notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="notesymbol" level="system" category="structure notes" file="strc-not.mkvi"> + <cd:command name="notesymbol" level="system" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-optional"/> </cd:arguments> </cd:command> - <cd:command name="note" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="note" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <!-- - - <cd:command name="footnote" type="environment" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-constructiondata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="footnote" type="environment" level="document" category="structure notes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="footnote" level="document" category="structure notes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="footnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-constructiondata-list"/> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="footnotetext" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="footnotetext" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="footnotetext" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="footnotetext" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> </cd:command> - <cd:command name="placefootnotes" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="placefootnotes" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> @@ -568,9 +539,9 @@ </cd:arguments> </cd:command> - <cd:command name="localfootnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi"/> + <cd:command name="localfootnotes" type="environment" level="document" category="structure" keywords="notes" file="strc-not.mkvi"/> - <cd:command name="placelocalfootnotes" level="document" category="structure notes" file="strc-not.mkvi"> + <cd:command name="placelocalfootnotes" level="document" category="structure" keywords="notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> @@ -578,36 +549,7 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="endnote" type="environment" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-constructiondata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="endnote" type="environment" level="document" category="structure notes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="endnote" level="document" category="structure notes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="endnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-constructiondata-list"/> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="definelinenote" level="style" category="structure notes" file="strc-lnt.mkvi"> + <cd:command name="definelinenote" level="style" category="structure" keywords="notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -617,7 +559,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinenote" level="style" category="structure notes" file="strc-lnt.mkvi"> + <cd:command name="setuplinenote" level="style" category="structure" keywords="notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -636,12 +578,15 @@ <cd:parameter name="compressdistance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="compressstopper"> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="linenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> + <cd:command name="linenote" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:instance value="linenote"/> </cd:sequence> @@ -653,7 +598,7 @@ </cd:instances> </cd:command> - <cd:command name="startlinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> + <cd:command name="startlinenote" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="start"/> <cd:instance value="linenote"/> @@ -667,7 +612,7 @@ </cd:instances> </cd:command> - <cd:command name="stoplinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> + <cd:command name="stoplinenote" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="stop"/> <cd:instance value="linenote"/> @@ -680,43 +625,20 @@ </cd:instances> </cd:command> - <cd:command name="fromlinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> + <cd:command name="fromlinenote" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="tolinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> + <cd:command name="tolinenote" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <!-- - - <cd:command name="linenote" level="document" category="structure notes" file="strc-lnt.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="startlinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="stoplinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference"/> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="definetextnote" level="style" category="structure notes" file="strc-tnt.mkiv"> + <cd:command name="definetextnote" level="style" category="structure" keywords="notes" file="strc-tnt.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -726,7 +648,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptextnote" level="style" category="structure notes" file="strc-tnt.mkiv"> + <cd:command name="setuptextnote" level="style" category="structure" keywords="notes" file="strc-tnt.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -750,7 +672,7 @@ </cd:arguments> </cd:command> - <cd:command name="textnote" generated="yes" level="document" category="structure notes" file="strc-tnt.mkiv"> + <cd:command name="textnote" generated="yes" variant="example" level="document" category="structure" keywords="notes" file="strc-tnt.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptextnote"/> @@ -759,4 +681,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-object.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-object.xml index 2083c357280..b5768d01264 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-object.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-object.xml @@ -93,7 +93,7 @@ <cd:command name="defaultobjectpage" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="doifelseobjectfound" level="system" category="pdf conditional" file="pack-obj.mkiv"> + <cd:command name="doifelseobjectfound" level="system" category="pdf" keywords="conditional" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -102,7 +102,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifobjectfoundelse" level="system" category="pdf conditional" file="pack-obj.mkiv"> + <cd:command name="doifobjectfoundelse" level="system" category="pdf" keywords="conditional" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseobjectreferencefound" level="system" category="pdf conditional" file="pack-obj.mkiv"> + <cd:command name="doifelseobjectreferencefound" level="system" category="pdf" keywords="conditional" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -120,7 +120,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifobjectreferencefoundelse" level="system" category="pdf conditional" file="pack-obj.mkiv"> + <cd:command name="doifobjectreferencefoundelse" level="system" category="pdf" keywords="conditional" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -129,4 +129,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-offset.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-offset.xml index 15a162b1a8a..eca889a35f9 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-offset.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-offset.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupoffsetbox" level="style" category="layout" file="pack-box.mkiv"> + <cd:command name="setupoffsetbox" level="style" category="boxes" keywords="layout" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="x"> @@ -44,7 +44,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupoffset" level="style" category="layout" file="pack-box.mkiv"> + <cd:command name="setupoffset" level="style" category="boxes" keywords="layout" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupoffsetbox"/> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="offsetbox" level="system" category="layout" file="pack-box.mkiv"> + <cd:command name="offsetbox" level="system" category="boxes" keywords="layout" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffsetbox"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="offset" level="document" category="layout" file="pack-box.mkiv"> + <cd:command name="offset" level="document" category="boxes" keywords="layout" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffset"/> @@ -71,4 +71,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-opposite.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-opposite.xml index 3ed22559f3f..3f32f3c2bc6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-opposite.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-opposite.xml @@ -26,4 +26,4 @@ <cd:command name="opposite" type="environment" level="document" category="layout" file="page-fac.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-orientation.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-orientation.xml new file mode 100644 index 00000000000..8749bf278a6 --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-orientation.xml @@ -0,0 +1,69 @@ +<?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="defineorientation" level="style" category="alignment" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuporientation"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuporientation" level="style" category="alignment" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="orientation"> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="normal" default="yes"/> + </cd:parameter> + <cd:parameter name="horizontal"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="normal" default="yes"/> + </cd:parameter> + <cd:parameter name="vertical"> + <cd:constant type="line"/> + <cd:constant type="top"/> + <cd:constant type="middle"/> + <cd:constant type="bottom"/> + <cd:constant type="normal" default="yes"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="theorientation" level="system" category="alignment" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="argument-orientation"/> + </cd:arguments> + </cd:command> + + <cd:command name="autoorientation" level="system" category="alignment" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="argument-orientation"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifelseorientation" level="system" category="alignment" keywords="conditional" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="argument-orientation"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-ornament.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-ornament.xml index 847fda4e634..7bc6d9f4e7b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-ornament.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-ornament.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="ornamenttext" variant="collector" level="document" category="background fonts colors" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="collector" level="document" category="background" keywords="fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="ornamenttext" variant="layer" level="document" category="background fonts colors" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="layer" level="document" category="background" keywords="fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -44,7 +44,7 @@ </cd:arguments> </cd:command> - <cd:command name="ornamenttext" variant="direct" level="document" category="background fonts colors" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="direct" level="document" category="background" keywords="fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="argument-text"/> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineornament" variant="collector" level="style" category="background fonts colors" file="pack-box.mkiv"> + <cd:command name="defineornament" variant="collector" level="style" category="background" keywords="fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineornament" variant="layer" level="style" category="background fonts colors" file="pack-box.mkiv"> + <cd:command name="defineornament" variant="layer" level="style" category="background" keywords="fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -90,7 +90,7 @@ </cd:arguments> </cd:command> - <cd:command name="ornament" generated="yes" variant="example" level="document" category="background fonts colors" file="pack-box.mkiv"> + <cd:command name="ornament" generated="yes" variant="example" level="document" category="background" keywords="fonts colors" file="pack-box.mkiv"> <cd:sequence> <cd:variable value="ornament"/> </cd:sequence> @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-output.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-output.xml index 28b5b379985..c5b9f796df3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-output.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-output.xml @@ -46,4 +46,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-overlay.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-overlay.xml index 40d0bda93eb..55773c62505 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-overlay.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-overlay.xml @@ -12,9 +12,9 @@ </cd:arguments> </cd:command> - <cd:command name="overlaycolor" level="system" category="background colors" file="pack-rul.mkiv"/> + <cd:command name="overlaycolor" level="system" category="background colors" keywords="background colors" file="pack-rul.mkiv"/> - <cd:command name="overlaylinecolor" level="system" category="background colors" file="pack-rul.mkiv"/> + <cd:command name="overlaylinecolor" level="system" category="background colors" keywords="background colors" file="pack-rul.mkiv"/> <cd:command name="overlaywidth" level="system" category="background" file="pack-rul.mkiv"/> @@ -26,7 +26,7 @@ <cd:command name="overlaylinewidth" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="doifelseoverlay" level="system" category="background conditional" file="pack-rul.mkiv"> + <cd:command name="doifelseoverlay" level="system" category="background" keywords="conditional" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifoverlayelse" level="system" category="background conditional" file="pack-rul.mkiv"> + <cd:command name="doifoverlayelse" level="system" category="background" keywords="conditional" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -42,4 +42,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagebreak.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagebreak.xml index 9972800ecdf..a6a5a8697d3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagebreak.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagebreak.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagebreak" level="style" file="page-brk.mkiv"> + <cd:command name="definepagebreak" level="style" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -13,7 +13,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagebreak" level="document" file="page-brk.mkiv"> + <cd:command name="pagebreak" level="document" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:resolve name="value-pagebreak"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="page" level="document" file="page-brk.mkiv"> + <cd:command name="page" level="document" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="pagebreak"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="definecolumnbreak" level="style" file="page-brk.mkiv"> + <cd:command name="definecolumnbreak" level="style" category="structure" keywords="columns" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="columnbreak" level="document" file="page-brk.mkiv"> + <cd:command name="columnbreak" level="document" category="structure" keywords="columns" file="page-brk.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:resolve name="value-columnbreak"/> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="column" level="document" file="page-brk.mkiv"> + <cd:command name="column" level="document" category="structure" keywords="columns" file="page-brk.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="columnbreak"/> @@ -56,7 +56,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepagechecker" level="style" file="page-brk.mkiv"> + <cd:command name="definepagechecker" level="style" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagechecker" level="style" file="page-brk.mkiv"> + <cd:command name="setuppagechecker" level="style" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="checkpage" level="document" file="page-brk.mkiv"> + <cd:command name="checkpage" level="document" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -104,32 +104,32 @@ </cd:arguments> </cd:command> - <cd:command name="testpage" level="document" file="page-brk.mkiv"> + <cd:command name="testpage" level="document" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> </cd:arguments> </cd:command> - <cd:command name="testpageonly" level="system" file="page-brk.mkiv"> + <cd:command name="testpageonly" level="system" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> </cd:arguments> </cd:command> - <cd:command name="testpagesync" level="system" file="page-brk.mkiv"> + <cd:command name="testpagesync" level="system" category="structure" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> </cd:arguments> </cd:command> - <cd:command name="testcolumn" level="document" file="page-brk.mkiv"> + <cd:command name="testcolumn" level="document" category="structure" keywords="columns" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagecolumns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagecolumns.xml index 07ab20abba8..abeedb8b8c2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagecolumns.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagecolumns.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagecolumns" level="style" category="structure layout" file="page-pcl.mkiv"> + <cd:command name="definepagecolumns" level="style" category="columns" keywords="structure layout" file="page-pcl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagecolumns" level="style" category="structure layout" file="page-pcl.mkiv"> + <cd:command name="setuppagecolumns" level="style" category="columns" keywords="structure layout" file="page-pcl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -67,13 +67,13 @@ </cd:arguments> </cd:command> - <cd:command name="pagecolumns" type="environment" variant="name" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:command name="pagecolumns" type="environment" variant="name" level="document" category="columns" keywords="structure layout" file="page-pcl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="pagecolumns" type="environment" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:command name="pagecolumns" type="environment" level="document" category="columns" keywords="structure layout" file="page-pcl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppagecolumns"/> @@ -81,7 +81,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagecolumns" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:command name="pagecolumns" type="environment" generated="yes" variant="instance" level="document" category="columns" keywords="structure layout" file="page-pcl.mkiv"> <cd:sequence> <cd:instance value="pagecolumns"/> </cd:sequence> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagecomment.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagecomment.xml index 75b9056a8d1..8e72c42a9fc 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagecomment.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagecomment.xml @@ -37,4 +37,4 @@ <cd:command name="pagecomment" type="environment" level="document" category="pdf" file="page-com.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagefigure.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagefigure.xml index 0e8af435f83..5eba4ff2826 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagefigure.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagefigure.xml @@ -32,4 +32,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml index 8b2cd86b900..be394ba5a2d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="definepagegrid" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="definepagegrid" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -18,7 +18,7 @@ --> - <cd:command name="definecolumnset" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="definecolumnset" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -30,7 +30,7 @@ <!-- - <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setuppagegrid" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -76,7 +76,7 @@ --> - <cd:command name="setupcolumnset" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setupcolumnset" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -124,7 +124,7 @@ <!-- - <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:sequence> <cd:variable value="pagegrid"/> </cd:sequence> @@ -135,7 +135,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="pagegrid" type="environment" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -146,7 +146,7 @@ --> - <cd:command name="columnset" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="columnset" type="environment" generated="yes" variant="example" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:sequence> <cd:variable value="columnset"/> </cd:sequence> @@ -157,7 +157,7 @@ </cd:arguments> </cd:command> - <cd:command name="columnset" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="columnset" type="environment" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -168,7 +168,7 @@ <!-- - <cd:command name="setpagegrid" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="setpagegrid" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="c"> @@ -186,7 +186,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepagegridspan" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="definepagegridspan" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -198,7 +198,7 @@ --> - <cd:command name="definecolumnsetspan" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="definecolumnsetspan" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -210,7 +210,7 @@ <!-- - <cd:command name="setuppagegridspan" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setuppagegridspan" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -236,7 +236,7 @@ --> - <cd:command name="setupcolumnsetspan" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setupcolumnsetspan" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -262,7 +262,7 @@ <!-- - <cd:command name="pagegridspan" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="pagegridspan" type="environment" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -273,7 +273,7 @@ --> - <cd:command name="columnsetspan" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="columnsetspan" type="environment" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -306,7 +306,7 @@ <!-- - <cd:command name="pagegridspanwidth" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="pagegridspanwidth" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> @@ -314,7 +314,7 @@ --> - <cd:command name="columnsetspanwidth" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="columnsetspanwidth" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> @@ -322,7 +322,7 @@ <!-- - <cd:command name="definepagegridarea" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="definepagegridarea" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -334,7 +334,7 @@ --> - <cd:command name="definecolumnsetarea" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="definecolumnsetarea" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -346,7 +346,7 @@ <!-- - <cd:command name="setuppagegridarea" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setuppagegridarea" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -386,7 +386,7 @@ --> - <cd:command name="setupcolumnsetarea" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setupcolumnsetarea" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -426,7 +426,7 @@ <!-- - <cd:command name="setuppagegridareatext" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setuppagegridareatext" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> @@ -435,7 +435,7 @@ --> - <cd:command name="setupcolumnsetareatext" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setupcolumnsetareatext" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> @@ -444,7 +444,7 @@ <!-- - <cd:command name="setuppagegridlines" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setuppagegridlines" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -455,7 +455,7 @@ --> - <cd:command name="setupcolumnsetlines" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setupcolumnsetlines" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -466,7 +466,7 @@ <!-- - <cd:command name="setuppagegridstart" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setuppagegridstart" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -477,7 +477,7 @@ --> - <cd:command name="setupcolumnsetstart" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="setupcolumnsetstart" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -486,4 +486,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pageinjection.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pageinjection.xml index f2ded298e88..e98272cd516 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pageinjection.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pageinjection.xml @@ -86,4 +86,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagelayout.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagelayout.xml index 3aadda0ffb7..06afe400df7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagelayout.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagelayout.xml @@ -38,4 +38,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagemarks.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagemarks.xml index 4d41bbfdd2a..654db57e654 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagemarks.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagemarks.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="markpage" level="style" file="page-ini.mkiv"> + <cd:command name="markpage" level="style" category="structure" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -13,19 +13,19 @@ </cd:arguments> </cd:command> - <cd:command name="markedpages" level="style" file="page-ini.mkiv"> + <cd:command name="markedpages" level="style" category="structure" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="markpages" type="environment" level="style" file="page-ini.mkiv"> + <cd:command name="markpages" type="environment" level="style" category="structure" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemarkedpage" level="style" category="conditional" file="page-ini.mkiv"> + <cd:command name="doifelsemarkedpage" level="style" category="structure" keywords="conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -33,4 +33,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml index 91c0d8f5948..ae3f38cd369 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml @@ -20,7 +20,7 @@ </cd:assignments> </cd:define> - <cd:command name="setuprealpagenumber" level="system" category="counter" file="strc-pag.mkiv"> + <cd:command name="setuprealpagenumber" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> @@ -28,13 +28,13 @@ </cd:arguments> </cd:command> - <cd:command name="setupuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"> + <cd:command name="setupuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"> <cd:arguments> <cd:resolve name="assignment-setupuserpagenumber"/> </cd:arguments> </cd:command> - <cd:command name="setupsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"> + <cd:command name="setupsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagenumber" level="style" category="counter" file="strc-pag.mkiv"> + <cd:command name="setuppagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"> <cd:arguments> <cd:resolve name="assignment-setupuserpagenumber"/> </cd:arguments> @@ -54,13 +54,13 @@ --> - <cd:command name="resetuserpagenumber" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="resetuserpagenumber" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="resetsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="resetsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="resetpagenumber" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="resetpagenumber" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="setuppagenumbering" level="style" category="counter" file="strc-pag.mkiv"> + <cd:command name="setuppagenumbering" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -102,6 +102,7 @@ <cd:constant type="inmargin"/> <cd:constant type="atmargin"/> <cd:constant type="marginedge"/> + <cd:constant type="none"/> </cd:parameter> <cd:parameter name="style"> <cd:resolve name="value-style"/> @@ -113,74 +114,74 @@ </cd:arguments> </cd:command> - <cd:command name="firstrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstrealpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="firstuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="firstsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="lastrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastrealpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="lastuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="lastsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="prevrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevrealpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="prevuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="prevsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="nextrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextrealpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="nextuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="nextsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="firstrealpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstrealpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="firstuserpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstuserpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="firstsubpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstsubpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="prevrealpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevrealpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="prevuserpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevuserpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="prevsubpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevsubpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="nextrealpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextrealpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="nextuserpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextuserpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="nextsubpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextsubpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="lastrealpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastrealpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="lastuserpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastuserpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="lastsubpage" level="system" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastsubpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="realpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="realpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="userpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="userpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="subpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="subpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="pagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="pagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="prefixedpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prefixedpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="incrementpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="incrementpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="incrementsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="incrementsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="decrementpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="decrementpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="decrementsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="decrementsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="completepagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="completepagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> - <cd:command name="placepagenumber" level="style" category="counter" file="strc-pag.mkiv"/> + <cd:command name="placepagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pageselection.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pageselection.xml index 082f53b6de0..5432ca34e84 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pageselection.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pageselection.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="insertpages" level="document" file="page-sel.mkvi"> + <cd:command name="insertpages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-number-list-optional"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="filterpages" level="document" file="page-sel.mkvi"> + <cd:command name="filterpages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:keywords list="yes"> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="copypages" level="document" file="page-sel.mkvi"> + <cd:command name="copypages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="combinepages" level="document" file="page-sel.mkvi"> + <cd:command name="combinepages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -132,7 +132,7 @@ </cd:arguments> </cd:command> - <cd:command name="slicepages" level="document" file="page-sel.mkvi"> + <cd:command name="slicepages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -178,4 +178,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pageshift.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pageshift.xml index 01e014a28ab..c0b167464d6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pageshift.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pageshift.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepageshift" level="style" file="page-imp.mkiv"> + <cd:command name="definepageshift" level="style" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -15,7 +15,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppageshift" level="style" file="page-imp.mkiv"> + <cd:command name="setuppageshift" level="style" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="page" default="yes"/> @@ -26,4 +26,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagestate.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagestate.xml index e705ba7e715..699b1fcdaf2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagestate.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagestate.xml @@ -4,18 +4,25 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="signalrightpage" level="system" file="spac-pag.mkiv"/> + <cd:command name="signalrightpage" level="system" category="twopassdata" file="spac-pag.mkiv"/> - <cd:command name="doifelserightpage" level="system" file="spac-pag.mkiv"> + <cd:command name="doifelserightpage" level="system" category="twopassdata" keywords="conditional" file="spac-pag.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="rightpageorder" level="system" file="spac-pag.mkiv"/> + <cd:command name="doifrightpageelse" level="system" category="twopassdata" keywords="conditional" file="spac-pag.mkiv"> + <cd:arguments> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="rightpageorder" level="system" category="twopassdata" file="spac-pag.mkiv"/> - <cd:command name="definepagestate" level="system" file="core-dat.mkiv"> + <cd:command name="definepagestate" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -25,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagestate" level="system" file="core-dat.mkiv"> + <cd:command name="setuppagestate" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -37,7 +44,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpagestate" level="system" file="core-dat.mkiv"> + <cd:command name="setpagestate" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -47,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagestaterealpage" level="system" file="core-dat.mkiv"> + <cd:command name="pagestaterealpage" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -57,7 +64,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpagestaterealpageno" level="system" file="core-dat.mkiv"> + <cd:command name="setpagestaterealpageno" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -67,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagestaterealpageorder" level="system" file="core-dat.mkiv"> + <cd:command name="pagestaterealpageorder" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -77,19 +84,19 @@ </cd:arguments> </cd:command> - <cd:command name="autopagestaterealpage" level="system" file="core-dat.mkiv"> + <cd:command name="autopagestaterealpage" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setautopagestaterealpageno" level="system" file="core-dat.mkiv"> + <cd:command name="setautopagestaterealpageno" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="autopagestaterealpageorder" level="system" file="core-dat.mkiv"> + <cd:command name="autopagestaterealpageorder" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pairedbox.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pairedbox.xml index a5a0b9b5f62..b7f9b24d819 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pairedbox.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pairedbox.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepairedbox" level="style" file="pack-com.mkiv"> + <cd:command name="definepairedbox" level="style" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppairedbox" level="style" file="pack-com.mkiv"> + <cd:command name="setuppairedbox" level="style" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -70,7 +70,7 @@ </cd:arguments> </cd:command> - <cd:command name="placepairedbox" level="document" file="pack-com.mkiv"> + <cd:command name="placepairedbox" level="document" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -81,7 +81,7 @@ </cd:arguments> </cd:command> - <cd:command name="placepairedbox" type="environment" level="document" file="pack-com.mkiv"> + <cd:command name="placepairedbox" type="environment" level="document" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -90,7 +90,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppairedbox" generated="yes" variant="instance" level="style" file="pack-com.mkiv"> + <cd:command name="setuppairedbox" generated="yes" variant="instance" level="style" category="tables" file="pack-com.mkiv"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="pairedbox"/> @@ -105,7 +105,7 @@ </cd:instances> </cd:command> - <cd:command name="placepairedbox" generated="yes" variant="instance" level="document" file="pack-com.mkiv"> + <cd:command name="placepairedbox" generated="yes" variant="instance" level="document" category="tables" file="pack-com.mkiv"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -122,7 +122,7 @@ </cd:instances> </cd:command> - <cd:command name="placepairedbox" type="environment" generated="yes" variant="instance" level="document" file="pack-com.mkiv"> + <cd:command name="placepairedbox" type="environment" generated="yes" variant="instance" level="document" category="tables" file="pack-com.mkiv"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -137,48 +137,18 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="setuplegend" level="document" file="pack-com.mkiv"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:inherit name="setuppairedbox"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placelegend" level="document" file="pack-com.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppairedbox"/> - </cd:assignments> - <cd:content/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelegend" type="environment" level="document" file="pack-com.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppairedbox"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="placeontopofeachother" level="document" file="pack-com.mkiv"> + <cd:command name="placeontopofeachother" level="document" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="placesidebyside" level="document" file="pack-com.mkiv"> + <cd:command name="placesidebyside" level="document" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-papersize.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-papersize.xml index 8156235bddb..4b92bda9a35 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-papersize.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-papersize.xml @@ -300,4 +300,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-paragraph.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-paragraph.xml index b253f404b47..c729f76d487 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-paragraph.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-paragraph.xml @@ -68,4 +68,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphnumber.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphnumber.xml index 6d35f11a04c..1a3c7cb4245 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphnumber.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphnumber.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupparagraphnumbering" level="style" category="structure counter" file="page-par.mkiv"> + <cd:command name="setupparagraphnumbering" level="style" category="structure" keywords="counter" file="page-par.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -26,4 +26,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml index e2fc9116e76..bbbbe1bf2e0 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml @@ -166,4 +166,4 @@ <cd:command name="paragraphscell" type="environment" level="document" category="tables" file="tabl-mis.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-parallel.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-parallel.xml index 3f7154c9f4b..365e4beb6e9 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-parallel.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-parallel.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineparallel" level="style" file="buff-par.mkvi"> + <cd:command name="defineparallel" level="style" category="columns" keywords="structure" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="setupparallel" level="style" file="buff-par.mkvi"> + <cd:command name="setupparallel" level="style" category="columns" keywords="structure" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeparallel" level="document" file="buff-par.mkvi"> + <cd:command name="placeparallel" level="document" category="columns" keywords="structure" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseparallel" level="style" category="conditional" file="buff-par.mkvi"> + <cd:command name="doifelseparallel" level="style" category="columns" keywords="structure conditional" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces" list="yes"> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifparallelelse" level="style" category="conditional" file="buff-par.mkvi"> + <cd:command name="doifparallelelse" level="style" category="columns" keywords="structure conditional" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces" list="yes"> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="resetparallel" level="style" file="buff-par.mkvi"> + <cd:command name="resetparallel" level="style" category="columns" keywords="structure" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -76,10 +76,10 @@ </cd:arguments> </cd:command> - <cd:command name="parallel" type="environment" generated="yes" variant="example" level="document" file="buff-par.mkvi"> + <cd:command name="parallel" type="environment" generated="yes" variant="example" level="document" category="columns" keywords="structure" file="buff-par.mkvi"> <cd:sequence> <cd:variable value="parallel"/> </cd:sequence> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-parbuilder.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-parbuilder.xml index 95621fce03e..243e4c9bd36 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-parbuilder.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-parbuilder.xml @@ -32,4 +32,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-parwrapper.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-parwrapper.xml new file mode 100644 index 00000000000..2cb5ee0717d --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-parwrapper.xml @@ -0,0 +1,80 @@ +<?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="freezeparagraphproperties" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="defrostparagraphproperties" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="updateparagraphproperties" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="updateparagraphpenalties" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="updateparagraphdemerits" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="updateparagraphshapes" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="setparagraphfreezing" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="forgetparagraphfreezing" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="registerparwrapper" level="system" category="whitespace" file="spac-par.mkxl"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="registerparwrapperreverse" level="system" category="whitespace" file="spac-par.mkxl"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="directparwrapper" level="system" category="whitespace" file="spac-par.mkxl"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="forgetparwrapper" level="system" category="whitespace" file="spac-par.mkxl"/> + + <cd:command name="unregisterparwrapper" level="system" category="whitespace" file="spac-par.mkxl"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifelseparwrapper" level="system" category="whitespace" file="spac-par.mkxl"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="showparwrapperstate" level="system" category="whitespace" file="spac-par.mkxl"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="getparwrapper" level="system" category="whitespace" file="spac-par.lmt"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="lastparwrapper" level="system" category="whitespace" file="spac-par.lmt"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pdf.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pdf.xml index fc83777a1f4..1d835158f37 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pdf.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pdf.xml @@ -128,4 +128,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-penalty.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-penalty.xml index d69c196f993..527a5167023 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-penalty.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-penalty.xml @@ -26,4 +26,4 @@ <cd:command name="setdefaultpenalties" level="system" category="layout" file="spac-ver.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-periods.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-periods.xml index 5cded3b1c6a..2fd4e8d3812 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-periods.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-periods.xml @@ -40,4 +40,4 @@ <cd:command name="unknown" level="document" category="symbols" file="enco-ini.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-phantom.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-phantom.xml index 8458be67b7e..2d5e152ccbb 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-phantom.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-phantom.xml @@ -4,25 +4,25 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="phantom" level="style" file="supp-box.mkiv"> + <cd:command name="phantom" level="style" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hphantom" level="style" file="supp-box.mkiv"> + <cd:command name="hphantom" level="style" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vphantom" level="style" file="supp-box.mkiv"> + <cd:command name="vphantom" level="style" category="strings" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="phantombox" level="style" file="pack-box.mkiv"> + <cd:command name="phantombox" level="style" category="boxes" keywords="strings" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -38,4 +38,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-placeholder.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-placeholder.xml new file mode 100644 index 00000000000..cbabf73ff9e --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-placeholder.xml @@ -0,0 +1,46 @@ +<?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="defineplaceholder" level="style" category="structure" file="typo-plc.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupplaceholder"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupplaceholder" level="style" category="structure" file="typo-plc.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <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="text"> + <cd:constant type="cd:text"/> + </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:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="placeholder" level="document" category="structure" file="typo-plc.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-placement.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-placement.xml index 665d9aeb887..e07998a69a4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-placement.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-placement.xml @@ -72,4 +72,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-position.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-position.xml index b9f4b3780bf..435f58ebb16 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-position.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-position.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="doifpositionaction" level="system" category="conditional" file="anch-pgr.mkiv"> + <cd:command name="doifpositionaction" level="system" keywords="conditional" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionaction" level="system" category="conditional" file="anch-pgr.mkiv"> + <cd:command name="doifelsepositionaction" level="system" keywords="conditional" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositionactionelse" level="system" category="conditional" file="anch-pgr.mkiv"> + <cd:command name="doifpositionactionelse" level="system" keywords="conditional" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -40,7 +40,7 @@ </cd:arguments> </cd:command> - <cd:command name="MPoverlayanchor" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="MPoverlayanchor" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -59,14 +59,14 @@ </cd:arguments> </cd:command> - <cd:command name="MPpositiongraphic" type="environment" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="MPpositiongraphic" type="environment" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPpositiongraphic" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="MPpositiongraphic" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -77,13 +77,13 @@ </cd:arguments> </cd:command> - <cd:command name="MPpositionmethod" type="environment" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="MPpositionmethod" type="environment" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setMPpositiongraphic" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="setMPpositiongraphic" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="setMPpositiongraphicrange" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="setMPpositiongraphicrange" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -108,21 +108,21 @@ </cd:arguments> </cd:command> - <cd:command name="MPgetposboxes" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="MPgetposboxes" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPgetmultipars" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="MPgetmultipars" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPgetmultishape" level="system" category="background metapost" file="anch-pgr.mkiv"> + <cd:command name="MPgetmultishape" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -386,7 +386,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifposition" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifposition" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -394,7 +394,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseposition" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifelseposition" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -402,7 +402,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositionelse" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifpositionelse" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -410,7 +410,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositiononpage" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifelsepositiononpage" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -419,7 +419,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositiononpageelse" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifpositiononpageelse" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -467,7 +467,7 @@ <cd:command name="disableparpositions" level="system" file="anch-pos.mkiv"/> - <cd:command name="doifelseoverlapping" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifelseoverlapping" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -476,7 +476,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifoverlappingelse" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifoverlappingelse" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -485,7 +485,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionsonsamepage" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsonsamepage" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -493,7 +493,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositionsonsamepageelse" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifpositionsonsamepageelse" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -501,7 +501,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionsonthispage" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsonthispage" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -509,7 +509,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositionsonthispageelse" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifpositionsonthispageelse" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -517,18 +517,18 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionsused" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsused" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifpositionsusedelse" level="system" category="conditional" file="anch-pos.mkiv"> + <cd:command name="doifpositionsusedelse" level="system" keywords="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-positionbar.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-positionbar.xml index 286466befe1..037045aaaba 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-positionbar.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-positionbar.xml @@ -70,4 +70,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-positioning.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-positioning.xml index 9d873fd46ee..7c3b2cb9a54 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-positioning.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-positioning.xml @@ -95,4 +95,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-postponing.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-postponing.xml index 0d4c98d7ae1..929a0c75dae 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-postponing.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-postponing.xml @@ -12,4 +12,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-processor.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-processor.xml index 7e23c66311f..2b0f66e36e5 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-processor.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-processor.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineprocessor" level="style" category="fonts colors" file="typo-prc.mkvi"> + <cd:command name="defineprocessor" level="style" category="fonts" keywords="colors" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupprocessor" level="style" category="fonts colors" file="typo-prc.mkvi"> + <cd:command name="setupprocessor" level="style" category="fonts" keywords="colors" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -41,11 +41,11 @@ </cd:arguments> </cd:command> - <cd:command name="applyprocessor" level="system" category="fonts colors" file="typo-prc.mkvi"> + <cd:command name="applyprocessor" level="system" category="fonts" keywords="colors" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-profile.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-profile.xml index acc486cb7eb..af98e9c10c5 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-profile.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-profile.xml @@ -97,4 +97,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-publication.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-publication.xml index b6280047aa5..e77274869c4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-publication.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-publication.xml @@ -807,7 +807,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifelse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -815,14 +815,14 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoif" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoif" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifnot" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifnot" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -835,7 +835,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsesameaspreviouschecked" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsesameaspreviouschecked" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -847,7 +847,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsesameasprevious" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsesameasprevious" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -855,7 +855,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsecombiinlist" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsecombiinlist" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -864,7 +864,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifsameaspreviouscheckedelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifsameaspreviouscheckedelse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -876,7 +876,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifsameaspreviouselse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifsameaspreviouselse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -884,7 +884,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifcombiinlistelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifcombiinlistelse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -899,7 +899,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelseuservariable" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifelseuservariable" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -907,7 +907,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifuservariableelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxdoifuservariableelse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -967,7 +967,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxsingularplural" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxsingularplural" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -979,7 +979,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxsingularorplural" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxsingularorplural" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -991,7 +991,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxoneorrange" level="system" category="bibliography conditional" file="publ-ini.mkiv"> + <cd:command name="btxoneorrange" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -1139,4 +1139,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-random.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-random.xml index a1a17f669f0..8237a4cb982 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-random.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-random.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="getrandomcount" level="system" file="supp-ran.mkiv"> + <cd:command name="getrandomcount" level="system" category="counter" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="getrandomdimen" level="system" file="supp-ran.mkiv"> + <cd:command name="getrandomdimen" level="system" category="counter" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dimension"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="getrandomnumber" level="system" file="supp-ran.mkiv"> + <cd:command name="getrandomnumber" level="system" category="counter" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="getrandomfloat" level="system" file="supp-ran.mkiv"> + <cd:command name="getrandomfloat" level="system" category="counter" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> @@ -36,29 +36,29 @@ </cd:arguments> </cd:command> - <cd:command name="setrandomseed" level="system" file="supp-ran.mkiv"> + <cd:command name="setrandomseed" level="system" category="counter" file="supp-ran.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="getrandomseed" level="system" file="supp-ran.mkiv"> + <cd:command name="getrandomseed" level="system" category="counter" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="randomseed" type="environment" begin="push" end="pop" level="system" file="supp-ran.mkiv"/> + <cd:command name="randomseed" type="environment" begin="push" end="pop" level="system" category="counter" file="supp-ran.mkiv"/> - <cd:command name="reuserandomseed" level="system" file="supp-ran.mkiv"/> + <cd:command name="reuserandomseed" level="system" category="counter" file="supp-ran.mkiv"/> - <cd:command name="randomnumber" level="system" file="supp-ran.mkiv"> + <cd:command name="randomnumber" level="system" category="counter" file="supp-ran.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="mprandomnumber" level="system" file="supp-ran.mkiv"/> + <cd:command name="mprandomnumber" level="system" category="counter" keywords="metapost" file="supp-ran.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf b/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 9d01bdf5ef9..654cbb8deef 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-references.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-references.xml index 1e3e3466d2f..2774dd39669 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-references.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-references.xml @@ -49,6 +49,16 @@ <cd:parameter name="prefix"> <cd:resolve name="value-referenceprefix"/> </cd:parameter> + <!-- all margindata locations are possible --> + <cd:parameter name="labelalternative"> + <cd:resolve name="value-margindata"/> + </cd:parameter> + <cd:parameter name="labelstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="labelcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -138,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsereferencefound" level="system" category="references conditional" file="strc-ref.mkvi"> + <cd:command name="doifelsereferencefound" level="system" category="references" keywords="conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -146,7 +156,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifreferencefoundelse" level="system" category="references conditional" file="strc-ref.mkvi"> + <cd:command name="doifreferencefoundelse" level="system" category="references" keywords="conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -264,7 +274,7 @@ </cd:arguments> </cd:command> - <cd:command name="docheckedpagestate" level="system" category="references" file="strc-ref.mkvi"> + <cd:command name="doifcheckedpagestate" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-command"/> @@ -411,7 +421,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseurldefined" level="system" category="references conditional" file="strc-ref.mkvi"> + <cd:command name="doifelseurldefined" level="system" category="references" keywords="conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -419,7 +429,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifurldefinedelse" level="system" category="references conditional" file="strc-ref.mkvi"> + <cd:command name="doifurldefinedelse" level="system" category="references" keywords="conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -427,7 +437,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefiledefined" level="system" category="references conditional" file="strc-ref.mkvi"> + <cd:command name="doifelsefiledefined" level="system" category="references" keywords="conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -435,7 +445,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffiledefinedelse" level="system" category="references conditional" file="strc-ref.mkvi"> + <cd:command name="doiffiledefinedelse" level="system" category="references" keywords="conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -563,4 +573,18 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="referencepagestate" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="referencepagedetail" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="referencerealpage" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="referencecolumnnumber" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="tracedpagestate" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="markreferencepage" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="referencesymbol" level="style" category="references" file="strc-ref.mkvi"/> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-regime.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-regime.xml index e126abb65af..d30d96332f2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-regime.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-regime.xml @@ -85,4 +85,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-renderingwindow.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-renderingwindow.xml index 525415c7074..ee2dd9ce554 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-renderingwindow.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-renderingwindow.xml @@ -59,4 +59,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-replacement.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-replacement.xml index 1cee232db84..dec893bef38 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-replacement.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-replacement.xml @@ -7,20 +7,22 @@ <cd:command name="replaceword" level="style" category="language" file="lang-rep.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> - <cd:resolve name="keyword-text"/> + <cd:resolve name="keyword-text-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setreplacement" level="style" category="language" file="lang-rep.mkiv"> + <cd:command name="setreplacements" level="style" category="language" file="lang-rep.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> <cd:constant type="cd:name"/> </cd:keywords> + <!-- command is overloaded in typo-ovl.mkiv with second argument --> + <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="resetreplacement" level="style" category="language" file="lang-rep.mkiv"/> + <cd:command name="resetreplacements" level="style" category="language" file="lang-rep.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-rotation.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-rotation.xml new file mode 100644 index 00000000000..b35f9de1868 --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-rotation.xml @@ -0,0 +1,54 @@ +<?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="mirror" level="document" category="graphics" file="grph-trf.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="setuprotate" level="style" category="graphics" file="grph-trf.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="location"> + <cd:constant type="fit"/> + <cd:constant type="broad"/> + <cd:constant type="depth"/> + <cd:constant type="high"/> + <cd:constant type="middle"/> + <cd:constant type="default"/> + <cd:constant type="normal"/> + </cd:parameter> + <cd:parameter name="rotation"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="rotate" level="document" category="graphics" file="grph-trf.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuprotate"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="dorotatebox" level="system" category="graphics" file="grph-trf.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-ruby.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-ruby.xml index 4422029b80c..65553cdf54d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-ruby.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-ruby.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineruby" level="style" category="fonts" file="typo-rub.mkiv"> + <cd:command name="defineruby" level="style" category="language" keywords="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupruby" level="style" category="fonts" file="typo-rub.mkiv"> + <cd:command name="setupruby" level="style" category="language" keywords="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -60,7 +60,7 @@ </cd:arguments> </cd:command> - <cd:command name="ruby" level="document" category="fonts" file="typo-rub.mkiv"> + <cd:command name="ruby" level="document" category="language" keywords="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -68,10 +68,10 @@ </cd:arguments> </cd:command> - <cd:command name="ruby" type="environment" level="document" category="fonts" file="typo-rub.mkiv"> + <cd:command name="ruby" type="environment" level="document" category="language" keywords="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-scale.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-scale.xml index 36a46479e9d..4d88c912d74 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-scale.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-scale.xml @@ -121,4 +121,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-scite.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-scite.xml index f04e575e015..3e1ed2e8187 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-scite.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-scite.xml @@ -30,4 +30,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-script.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-script.xml index affa2658bf1..89a92902419 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-script.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-script.xml @@ -24,6 +24,7 @@ <cd:constant type="nihongo"/> <cd:constant type="ethiopic"/> <cd:constant type="thai"/> + <cd:constant type="tibetan"/> <cd:constant type="test"/> </cd:parameter> <cd:parameter name="preset"> @@ -65,7 +66,7 @@ <cd:command name="resetscript" level="system" category="language" file="scrp-ini.mkvi"/> - <cd:command name="script" type="environment" category="language" file="scrp-ini.mkvi"> + <cd:command name="script" type="environment" level="document" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -73,6 +74,7 @@ <cd:constant type="nihongo"/> <cd:constant type="ethiopic"/> <cd:constant type="thai"/> + <cd:constant type="tibetan"/> <cd:constant type="test"/> <cd:constant type="cd:name"/> </cd:keywords> @@ -88,22 +90,4 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="hangul" level="document" category="language" file="scrp-ini.mkvi"/> - - <cd:command name="hanzi" level="document" category="language" file="scrp-ini.mkvi"/> - - <cd:command name="nihongo" level="document" category="language" file="scrp-ini.mkvi"/> - - <cd:command name="ethiopic" level="document" category="language" file="scrp-ini.mkvi"/> - - <cd:command name="thai" level="document" category="language" file="scrp-ini.mkvi"/> - - <cd:command name="latin" level="document" category="language" file="scrp-ini.mkvi"/> - - <cd:command name="test" level="document" category="language" file="scrp-ini.mkvi"/> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml index 0ec20a80452..0395a741cf8 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml @@ -546,4 +546,4 @@ <cd:command name="headsetupspacing" level="system" category="structure" file="strc-ren.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-sectionblock.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-sectionblock.xml index 1cb2debdef5..e9622dac8a2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-sectionblock.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-sectionblock.xml @@ -81,52 +81,4 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="frontmatter" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="bookmark"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:inherit name="setupsectionblock"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="bodymatter" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="bookmark"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:inherit name="setupsectionblock"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="appendices" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="bookmark"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:inherit name="setupsectionblock"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="backmatter" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="bookmark"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:inherit name="setupsectionblock"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-selector.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-selector.xml index 44970669b49..d70bb7ab758 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-selector.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-selector.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineselector" level="style" file="core-env.mkiv"> + <cd:command name="defineselector" level="style" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -13,21 +13,21 @@ </cd:arguments> </cd:command> - <cd:command name="setupselector" level="style" file="core-env.mkiv"> + <cd:command name="setupselector" level="style" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> <cd:parameter name="n"> <cd:constant type="cd:number"/> </cd:parameter> - <cd:parameter name="m"> + <cd:parameter name="max"> <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="select" level="document" file="core-env.mkiv"> + <cd:command name="select" level="document" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content optional="yes"/> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="directselect" level="system" file="core-env.mkiv"> + <cd:command name="directselect" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content optional="yes"/> @@ -49,4 +49,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-setup.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-setup.xml index a4420bfcfbb..0cfb216bd2b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-setup.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-setup.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupsetup" level="style" file="x-setups-basics.mkiv"> + <cd:command name="setupsetup" level="style" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="criterium"> @@ -19,152 +19,158 @@ </cd:arguments> </cd:command> - <cd:command name="basicsetup" level="system" file="x-setups-basics.mkiv"> + <cd:command name="basicsetup" level="system" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="basicsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> + <cd:command name="basicsetup" variant="argument" level="system" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="shortsetup" level="system" file="x-setups-basics.mkiv"> + <cd:command name="shortsetup" level="system" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="shortsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> + <cd:command name="shortsetup" variant="argument" level="system" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setup" level="system" file="x-setups-basics.mkiv"> + <cd:command name="setup" level="system" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setup" variant="argument" level="system" file="x-setups-basics.mkiv"> + <cd:command name="setup" variant="argument" level="system" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showsetup" level="system" file="x-setups-basics.mkiv"> + <cd:command name="showsetup" level="system" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="showsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> + <cd:command name="showsetup" variant="argument" level="system" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="placesetup" level="document" file="x-setups-basics.mkiv"/> + <cd:command name="placesetup" level="document" category="xml" file="x-setups-basics.mkiv"/> - <cd:command name="placeallsetups" level="document" file="x-setups-basics.mkiv"/> + <cd:command name="placeallsetups" level="document" category="xml" file="x-setups-basics.mkiv"/> - <cd:command name="placeeverysetup" level="document" file="x-setups-basics.mkiv"/> + <cd:command name="placeeverysetup" level="document" category="xml" file="x-setups-basics.mkiv"/> - <cd:command name="showrootvalues" level="document" file="x-setups-basics.mkiv"> + <cd:command name="showrootvalues" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="showinstancevalues" level="document" file="x-setups-basics.mkiv"> + <cd:command name="showinstancevalues" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdinternal" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdinternal" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetup" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetup" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetup" variant="argument" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdshortsetup" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetup" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdshortsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetup" variant="argument" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdfullsetup" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetup" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdfullsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetup" variant="argument" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetupinstance" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetupinstance" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdshortsetupinstance" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetupinstance" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdfullsetupinstance" level="document" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetupinstance" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showdefinition" level="document" file="x-setups-basics.mkiv"> + <cd:command name="showdefinition" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="showdefinition" variant="argument" level="document" file="x-setups-basics.mkiv"> + <cd:command name="showdefinition" variant="argument" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="definition" level="document" file="x-setups-basics.mkiv"> + <cd:command name="definition" level="document" category="xml" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text-list"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="loadsetups" level="style" category="xml" file="x-setups-basics.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-file-optional"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-setups.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-setups.xml index a3773e8f77d..da0a75cb238 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-setups.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-setups.xml @@ -4,126 +4,126 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setups" level="style" file="core-env.mkiv"> + <cd:command name="setups" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="setups" variant="direct" level="style" file="core-env.mkiv"> + <cd:command name="setups" variant="direct" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="setup" level="style" file="core-env.mkiv"> + <cd:command name="setup" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setup" variant="direct" level="style" file="core-env.mkiv"> + <cd:command name="setup" variant="direct" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="directsetup" level="style" file="core-env.mkiv"> + <cd:command name="directsetup" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fastsetup" level="style" file="core-env.mkiv"> + <cd:command name="fastsetup" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="texsetup" level="style" file="core-env.mkiv"> + <cd:command name="texsetup" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="luasetup" level="style" category="lua" file="core-env.mkiv"> + <cd:command name="luasetup" level="style" category="structure" keywords="lua" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="systemsetups" level="system" file="core-env.mkiv"> + <cd:command name="systemsetups" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsetups" level="system" file="core-env.mkiv"> + <cd:command name="resetsetups" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="copysetups" level="system" file="core-env.mkiv"> + <cd:command name="copysetups" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showsetupsdefinition" level="system" file="core-env.mkiv"> + <cd:command name="showsetupsdefinition" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupwithargument" level="system" file="core-env.mkiv"> + <cd:command name="setupwithargument" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fastsetupwithargument" level="system" file="core-env.mkiv"> + <cd:command name="fastsetupwithargument" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setupwithargumentswapped" level="system" file="core-env.mkiv"> + <cd:command name="setupwithargumentswapped" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fastsetupwithargumentswapped" level="system" file="core-env.mkiv"> + <cd:command name="fastsetupwithargumentswapped" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="usesetupsparameter" level="system" file="core-env.mkiv"> + <cd:command name="usesetupsparameter" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="autosetups" level="style" file="core-env.mkiv"> + <cd:command name="autosetups" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doprocesslocalsetups" level="system" file="core-env.mkiv"> + <cd:command name="doprocesslocalsetups" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesetups" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifelsesetups" level="system" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -131,7 +131,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsetupselse" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifsetupselse" level="system" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -139,21 +139,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifsetups" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifsetups" level="system" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotsetups" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifnotsetups" level="system" category="structure" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="luasetups" type="environment" level="system" category="lua" file="core-env.mkiv"> + <cd:command name="luasetups" type="environment" level="system" category="structure" keywords="lua" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -162,13 +162,13 @@ </cd:arguments> </cd:command> - <cd:command name="luasetups" type="environment" variant="string" level="system" category="lua" file="core-env.mkiv"> + <cd:command name="luasetups" type="environment" variant="string" level="system" category="structure" keywords="lua" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetups" type="environment" level="style" category="xml" file="core-env.mkiv"> + <cd:command name="xmlsetups" type="environment" level="style" category="structure" keywords="xml" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -177,13 +177,13 @@ </cd:arguments> </cd:command> - <cd:command name="xmlsetups" type="environment" variant="string" level="style" category="xml" file="core-env.mkiv"> + <cd:command name="xmlsetups" type="environment" variant="string" level="style" category="structure" keywords="xml" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="rawsetups" type="environment" level="system" file="core-env.mkiv"> + <cd:command name="rawsetups" type="environment" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -192,13 +192,13 @@ </cd:arguments> </cd:command> - <cd:command name="rawsetups" type="environment" variant="string" level="system" file="core-env.mkiv"> + <cd:command name="rawsetups" type="environment" variant="string" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="localsetups" type="environment" level="style" file="core-env.mkiv"> + <cd:command name="localsetups" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -207,13 +207,13 @@ </cd:arguments> </cd:command> - <cd:command name="localsetups" type="environment" variant="string" level="style" file="core-env.mkiv"> + <cd:command name="localsetups" type="environment" variant="string" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="setups" type="environment" level="style" file="core-env.mkiv"> + <cd:command name="setups" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -222,7 +222,7 @@ </cd:arguments> </cd:command> - <cd:command name="setups" type="environment" variant="string" level="style" file="core-env.mkiv"> + <cd:command name="setups" type="environment" variant="string" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-shift.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-shift.xml index 521317d1ded..2d26f5c51cc 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-shift.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-shift.xml @@ -73,20 +73,4 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="shiftup" level="document" category="layout" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="shiftdown" level="document" category="layout" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-sidebar.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-sidebar.xml index 7518b5c6179..5f425802805 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-sidebar.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-sidebar.xml @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-simplecolumns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-simplecolumns.xml index caefa9fbbb9..fb2d7a2edec 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-simplecolumns.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-simplecolumns.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setsimplecolumnshsize" level="system" category="structure layout" file="page-smp.mkiv"> + <cd:command name="setsimplecolumnshsize" level="system" category="columns" keywords="structure layout" file="page-smp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -23,12 +23,23 @@ </cd:arguments> </cd:command> - <cd:command name="simplecolumns" type="environment" level="system" category="structure layout" file="page-smp.mkiv"> + <cd:command name="simplecolumns" type="environment" level="system" category="columns" keywords="structure layout" file="page-smp.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setsimplecolumnshsize"/> + <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:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-smash.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-smash.xml index 9183c8a6b86..1e7dc286705 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-smash.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-smash.xml @@ -4,69 +4,69 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="smashbox" level="system" file="supp-box.mkiv"> + <cd:command name="smashbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="smashboxed" level="system" file="supp-box.mkiv"> + <cd:command name="smashboxed" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hsmashbox" level="system" file="supp-box.mkiv"> + <cd:command name="hsmashbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vsmashbox" level="system" file="supp-box.mkiv"> + <cd:command name="vsmashbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hsmash" level="system" file="supp-box.mkiv"> + <cd:command name="hsmash" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vsmash" level="system" file="supp-box.mkiv"> + <cd:command name="vsmash" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hsmashed" level="system" file="supp-box.mkiv"> + <cd:command name="hsmashed" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vsmashed" level="system" file="supp-box.mkiv"> + <cd:command name="vsmashed" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smashedhbox" level="system" file="supp-box.mkiv"> + <cd:command name="smashedhbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smashedvbox" level="system" file="supp-box.mkiv"> + <cd:command name="smashedvbox" level="system" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smash" level="document" file="supp-box.mkiv"> + <cd:command name="smash" level="document" category="boxes" file="supp-box.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="w"/> @@ -79,4 +79,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-sort.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-sort.xml index 5a263ab979d..a5763a4bf50 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-sort.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-sort.xml @@ -74,6 +74,12 @@ <cd:parameter name="synonymcolor"> <cd:constant type="cd:color"/> </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:assignments> </cd:arguments> </cd:command> @@ -133,7 +139,7 @@ </cd:instances> </cd:command> - <cd:command name="doifelsecurrentsortingused" level="system" category="language conditional" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsortingused" level="system" category="language" keywords="conditional" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> @@ -171,31 +177,4 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="logo" level="document" category="language" file="strc-syn.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistoflogos" level="document" category="language" file="strc-syn.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupsorting"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistoflogos" level="document" category="language" file="strc-syn.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupsorting"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-soundtrack.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-soundtrack.xml index c374268bbc4..ecb474d34e2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-soundtrack.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-soundtrack.xml @@ -27,4 +27,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-spellchecking.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-spellchecking.xml index 90a219fc8b7..ec7d8e8e66b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-spellchecking.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-spellchecking.xml @@ -9,7 +9,7 @@ <cd:assignments list="yes"> <cd:parameter name="state"> <cd:constant type="start"/> - <cd:constant type="stop" defult="yes"/> + <cd:constant type="stop" default="yes"/> </cd:parameter> <cd:parameter name="method"> <cd:constant type="1"/> @@ -30,4 +30,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-spreadsheet.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-spreadsheet.xml index 8181cfe2d52..e3806ee3ae8 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-spreadsheet.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-spreadsheet.xml @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsespreadsheetcell" level="system" category="tables conditional" file="m-spreadsheet.mkiv"> + <cd:command name="doifelsespreadsheetcell" level="system" category="tables" keywords="conditional" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -84,7 +84,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifspreadsheetcellelse" level="system" category="tables conditional" file="m-spreadsheet.mkiv"> + <cd:command name="doifspreadsheetcellelse" level="system" category="tables" keywords="conditional" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -137,4 +137,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-startstop.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-startstop.xml index ba0abb0b7d8..3df32a51656 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-startstop.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-startstop.xml @@ -97,4 +97,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-steps.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-steps.xml index c71bc2e2fa0..dc86f6397fb 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-steps.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-steps.xml @@ -409,4 +409,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-stream.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-stream.xml index 7e769fdb689..37e04553d8d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-stream.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-stream.xml @@ -4,9 +4,9 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="currentoutputstream" level="system" file="page-str.mkiv"/> + <cd:command name="currentoutputstream" level="system" category="structure" file="page-str.mkiv"/> - <cd:command name="ifinoutputstream" level="system" file="page-str.mkiv"> + <cd:command name="ifinoutputstream" level="system" category="structure" keywords="conditional" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -15,60 +15,60 @@ </cd:arguments> </cd:command> - <cd:command name="enableoutputstream" level="system" file="page-str.mkiv"> + <cd:command name="enableoutputstream" level="system" category="structure" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="disableoutputstream" level="system" file="page-str.mkiv"/> + <cd:command name="disableoutputstream" level="system" category="structure" file="page-str.mkiv"/> - <cd:command name="outputstream" type="environment" level="system" file="page-str.mkiv"> + <cd:command name="outputstream" type="environment" level="system" category="structure" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushoutputstream" level="system" file="page-str.mkiv"> + <cd:command name="flushoutputstream" level="system" category="structure" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreambox" level="system" file="page-str.mkiv"> + <cd:command name="outputstreambox" level="system" category="structure" keywords="boxes" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamcopy" level="system" file="page-str.mkiv"> + <cd:command name="outputstreamcopy" level="system" category="structure" keywords="boxes" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamunvbox" level="system" file="page-str.mkiv"> + <cd:command name="outputstreamunvbox" level="system" category="structure" keywords="boxes" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamunvcopy" level="system" file="page-str.mkiv"> + <cd:command name="outputstreamunvcopy" level="system" category="structure" keywords="boxes" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="synchronizeoutputstreams" level="system" file="page-str.mkiv"> + <cd:command name="synchronizeoutputstreams" level="system" category="structure" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="pushoutputstream" level="system" file="page-str.mkiv"> + <cd:command name="pushoutputstream" level="system" category="structure" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-string.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-string.xml index aba5429c5d6..36c4234e0b0 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-string.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-string.xml @@ -4,61 +4,61 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="wdofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="wdofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="htofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="htofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="dpofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="dpofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hdofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="hdofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="htdpofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="htdpofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="widthofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="widthofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="heightofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="heightofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="depthofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="depthofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="heightanddepthofstring" level="system" file="blob-ini.mkiv"> + <cd:command name="heightanddepthofstring" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setwidthof" level="system" file="blob-ini.mkiv"> + <cd:command name="setwidthof" level="system" category="strings" file="blob-ini.mkiv"> <cd:arguments> <cd:text/> <cd:delimiter name="to"/> @@ -66,4 +66,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-strut.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-strut.xml index d686d6ee0d2..4b399435871 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-strut.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-strut.xml @@ -4,17 +4,17 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="strutdp" level="system" file="supp-box.mkiv"/> + <cd:command name="strutdp" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/> - <cd:command name="strutht" level="system" file="supp-box.mkiv"/> + <cd:command name="strutht" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/> - <cd:command name="strutwd" level="system" file="supp-box.mkiv"/> + <cd:command name="strutwd" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/> - <cd:command name="struthtdp" level="system" file="supp-box.mkiv"/> + <cd:command name="struthtdp" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/> - <cd:command name="strutgap" level="system" file="supp-box.mkiv"/> + <cd:command name="strutgap" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/> - <cd:command name="setupstruts" level="style" file="spac-ver.mkiv"> + <cd:command name="setupstrut" level="style" category="fonts" keywords="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-strut"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizestrut" level="system" file="spac-ver.mkiv"> + <cd:command name="synchronizestrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-strut"/> @@ -30,38 +30,38 @@ </cd:arguments> </cd:command> - <cd:command name="strut" level="style" file="spac-ver.mkiv"/> + <cd:command name="strut" level="style" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="halfstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="halfstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="quarterstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="quarterstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="halflinestrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="halflinestrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="noheightstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="noheightstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="depthstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="depthstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="setstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="setstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="setcharstrut" level="system" file="spac-ver.mkiv"> + <cd:command name="setcharstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setfontstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="setfontstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="settightstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="settightstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="setcapstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="setcapstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="setnostrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="setnostrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="showstruts" level="document" file="spac-ver.mkiv"/> + <cd:command name="showstruts" level="document" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="showcolorstruts" level="document" file="spac-ver.mkiv"/> + <cd:command name="showcolorstruts" level="document" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> - <cd:command name="strut" type="environment" begin="beg" end="end" level="system" file="spac-ver.mkiv"/> + <cd:command name="strut" type="environment" begin="beg" end="end" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/> </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml index 64a6f27dd17..b4d74b1a0c7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseinsymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv"> + <cd:command name="doifelseinsymbolset" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinsymbolsetelse" level="system" category="symbols conditional" file="symb-ini.mkiv"> + <cd:command name="doifinsymbolsetelse" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinsymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv"> + <cd:command name="doifinsymbolset" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv"> + <cd:command name="doifelsesymbolset" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -47,7 +47,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsymbolsetelse" level="system" category="symbols conditional" file="symb-ini.mkiv"> + <cd:command name="doifsymbolsetelse" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefiguresymbol" level="style" category="symbols graphics" file="symb-ini.mkiv"> + <cd:command name="definefiguresymbol" level="style" category="symbols" keywords="graphics" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="figuresymbol" level="document" category="symbols graphics" file="symb-ini.mkiv"> + <cd:command name="figuresymbol" level="document" category="symbols" keywords="graphics" file="symb-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -100,7 +100,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesymboldefined" level="system" category="symbols conditional" file="symb-ini.mkiv"> + <cd:command name="doifelsesymboldefined" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -108,7 +108,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsymboldefinedelse" level="system" category="symbols conditional" file="symb-ini.mkiv"> + <cd:command name="doifsymboldefinedelse" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-synctex.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-synctex.xml index 21f49e3f66d..363d9657cf9 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-synctex.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-synctex.xml @@ -39,4 +39,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-synonym.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-synonym.xml index 3e3e1c02798..8bc9ed87ef4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-synonym.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-synonym.xml @@ -76,6 +76,25 @@ <cd:parameter name="synonymcolor"> <cd:constant type="cd:color"/> </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="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="hyphens"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -144,14 +163,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentsynonymused" level="system" category="symbols conditional" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsynonymused" level="system" category="symbols" keywords="conditional" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentsynonymshown" level="system" category="symbols conditional" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsynonymshown" level="system" category="symbols" keywords="conditional" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> @@ -194,32 +213,4 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="abbreviation" level="document" category="symbols" file="strc-syn.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistofabbreviations" level="document" category="symbols" file="strc-syn.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupsynonyms"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistofabbreviations" level="document" category="symbols" file="strc-syn.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupsynonyms"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-system.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-system.xml index c8abff23827..72b51760db1 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-system.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-system.xml @@ -4,28 +4,28 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="expanded" level="system" file="syst-aux.mkiv"> + <cd:command name="expanded" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="expanded" type="environment" level="system" file="syst-aux.mkiv"/> + <cd:command name="expanded" type="environment" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="gobbleoneargument" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbleoneargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="gobbletwoarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbletwoarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="gobblethreearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblethreearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -33,7 +33,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefourarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblefourarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefivearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblefivearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblesixarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblesixarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblesevenarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblesevenarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleeightarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbleeightarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleninearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbleninearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -102,7 +102,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbletenarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbletenarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -117,20 +117,20 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleoneoptional" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbleoneoptional" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> </cd:arguments> </cd:command> - <cd:command name="gobbletwooptionals" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbletwooptionals" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> <cd:resolve name="keyword-dummy"/> </cd:arguments> </cd:command> - <cd:command name="gobblethreeoptionals" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblethreeoptionals" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> <cd:resolve name="keyword-dummy"/> @@ -138,7 +138,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefouroptionals" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblefouroptionals" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> <cd:resolve name="keyword-dummy"/> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefiveoptionals" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblefiveoptionals" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> <cd:resolve name="keyword-dummy"/> @@ -157,9 +157,9 @@ </cd:arguments> </cd:command> - <cd:command name="donothing" level="system" file="syst-aux.mkiv"/> + <cd:command name="donothing" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="doifelsenextchar" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenextchar" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-true"/> @@ -167,7 +167,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnextcharelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnextcharelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-true"/> @@ -175,212 +175,212 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsenextoptional" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenextoptional" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextoptionalelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnextoptionalelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextoptionalcs" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenextoptionalcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifnextoptionalcselse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnextoptionalcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextbgroup" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenextbgroup" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextbgroupelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnextbgroupelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextbgroupcs" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenextbgroupcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifnextbgroupcselse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnextbgroupcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextparenthesis" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenextparenthesis" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextparenthesiselse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnextparenthesiselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefastoptionalcheck" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsefastoptionalcheck" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiffastoptionalcheckelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doiffastoptionalcheckelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefastoptionalcheckcs" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsefastoptionalcheckcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doiffastoptionalcheckcselse" level="system" file="syst-aux.mkiv"> + <cd:command name="doiffastoptionalcheckcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="assumelongusagecs" level="system" file="syst-aux.mkiv"> + <cd:command name="assumelongusagecs" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="setvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setgvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="setgvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setevalue" level="system" file="syst-aux.mkiv"> + <cd:command name="setevalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setxvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="setxvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="getvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="letvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="letgvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="letgvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="resetvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="resetvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="undefinevalue" level="system" file="syst-aux.mkiv"> + <cd:command name="undefinevalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="ignorevalue" level="system" file="syst-aux.mkiv"> + <cd:command name="ignorevalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setuvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="setuvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuevalue" level="system" file="syst-aux.mkiv"> + <cd:command name="setuevalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setugvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="setugvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuxvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="setuxvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getuvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="getuvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseundefined" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseundefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -388,7 +388,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifundefinedelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifundefinedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -396,7 +396,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedefined" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsedefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -404,7 +404,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdefinedelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifdefinedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -412,39 +412,39 @@ </cd:arguments> </cd:command> - <cd:command name="doifundefined" level="system" file="syst-aux.mkiv"> + <cd:command name="doifundefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifdefined" level="system" file="syst-aux.mkiv"> + <cd:command name="doifdefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="letbeundefined" level="system" file="syst-aux.mkiv"> + <cd:command name="letbeundefined" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="localundefine" level="system" file="syst-aux.mkiv"> + <cd:command name="localundefine" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="globalundefine" level="system" file="syst-aux.mkiv"> + <cd:command name="globalundefine" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsealldefined" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsealldefined" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -452,7 +452,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifalldefinedelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifalldefinedelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -460,7 +460,7 @@ </cd:arguments> </cd:command> - <cd:command name="doif" level="system" file="syst-aux.mkiv"> + <cd:command name="doif" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -468,7 +468,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnot" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnot" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -476,7 +476,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -485,7 +485,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> @@ -493,7 +493,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifemptyelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> @@ -501,21 +501,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doifempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelseinset" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -524,7 +524,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinsetelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -533,7 +533,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinset" level="system" file="syst-aux.mkiv"> + <cd:command name="doifinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -541,7 +541,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotinset" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -549,7 +549,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecommon" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsecommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -558,7 +558,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcommonelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifcommonelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -567,7 +567,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcommon" level="system" file="syst-aux.mkiv"> + <cd:command name="doifcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -575,7 +575,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotcommon" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -583,60 +583,60 @@ </cd:arguments> </cd:command> - <cd:command name="processcommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="processcommalist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="quitcommalist" level="system" file="syst-aux.mkiv"/> + <cd:command name="quitcommalist" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="quitprevcommalist" level="system" file="syst-aux.mkiv"/> + <cd:command name="quitprevcommalist" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="processcommacommand" level="system" file="syst-aux.mkiv"> + <cd:command name="processcommacommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processcommalistwithparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="processcommalistwithparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processcommalist" type="environment" level="system" file="syst-aux.mkiv"> + <cd:command name="processcommalist" type="environment" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="processcommacommand" type="environment" level="system" file="syst-aux.mkiv"> + <cd:command name="processcommacommand" type="environment" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="currentcommalistitem" level="system" file="syst-aux.mkiv"/> + <cd:command name="currentcommalistitem" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="processaction" level="system" file="syst-aux.mkiv"> + <cd:command name="processaction" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="processfirstactioninset" level="system" file="syst-aux.mkiv"> + <cd:command name="processfirstactioninset" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="processallactionsinset" level="system" file="syst-aux.mkiv"> + <cd:command name="processallactionsinset" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> @@ -645,17 +645,17 @@ <cd:command name="commalistelement" level="system" file="syst-aux.mkiv"/> - <cd:command name="firstcharacter" level="system" file="syst-aux.mkiv"/> + <cd:command name="firstcharacter" level="system" category="strings" file="syst-aux.mkiv"/> - <cd:command name="remainingcharacters" level="system" file="syst-aux.mkiv"/> + <cd:command name="remainingcharacters" level="system" category="strings" file="syst-aux.mkiv"/> - <cd:command name="getfirstcharacter" level="system" file="syst-aux.mkiv"> + <cd:command name="getfirstcharacter" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefirstchar" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsefirstchar" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -664,7 +664,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffirstcharelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doiffirstcharelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -673,19 +673,19 @@ </cd:arguments> </cd:command> - <cd:command name="thefirstcharacter" level="system" file="syst-aux.mkiv"> + <cd:command name="thefirstcharacter" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="theremainingcharacters" level="system" file="syst-aux.mkiv"> + <cd:command name="theremainingcharacters" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelseinstring" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -694,7 +694,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinstringelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifinstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -703,7 +703,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinstring" level="system" file="syst-aux.mkiv"> + <cd:command name="doifinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -711,7 +711,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotinstring" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -719,7 +719,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseincsname" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseincsname" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-csname"/> @@ -728,7 +728,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifincsnameelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifincsnameelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-csname"/> @@ -737,7 +737,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsenumber" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -745,7 +745,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnumberelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnumberelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -753,21 +753,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifnumber" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotnumber" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotnumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="percentdimen" level="system" file="syst-aux.mkiv"> + <cd:command name="percentdimen" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -780,7 +780,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpercentdimen" level="system" file="syst-aux.mkiv"> + <cd:command name="setpercentdimen" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -793,28 +793,28 @@ </cd:arguments> </cd:command> - <cd:command name="makerawcommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="makerawcommalist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawprocesscommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="rawprocesscommalist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawprocesscommacommand" level="system" file="syst-aux.mkiv"> + <cd:command name="rawprocesscommacommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawdoifelseinset" level="system" file="syst-aux.mkiv"> + <cd:command name="rawdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -823,7 +823,7 @@ </cd:arguments> </cd:command> - <cd:command name="rawdoifinsetelse" level="system" file="syst-aux.mkiv"> + <cd:command name="rawdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -832,7 +832,7 @@ </cd:arguments> </cd:command> - <cd:command name="rawdoifinset" level="system" file="syst-aux.mkiv"> + <cd:command name="rawdoifinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -840,123 +840,123 @@ </cd:arguments> </cd:command> - <cd:command name="rawprocessaction" level="system" file="syst-aux.mkiv"> + <cd:command name="rawprocessaction" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="currentvalue" level="system" file="syst-aux.mkiv"/> + <cd:command name="currentvalue" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="getparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="geteparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="geteparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getgparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getgparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getxparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getxparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="forgetparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="forgetparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getexpandedparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getexpandedparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="doassign" level="system" file="syst-aux.mkiv"> + <cd:command name="doassign" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="doeassign" level="system" file="syst-aux.mkiv"> + <cd:command name="doeassign" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="undoassign" level="system" file="syst-aux.mkiv"> + <cd:command name="undoassign" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="doassignempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doassignempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="processassignmentlist" level="system" file="syst-aux.mkiv"> + <cd:command name="processassignmentlist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processassignmentcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="processassignmentcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processassignmentlist" type="environment" level="system" file="syst-aux.mkiv"> + <cd:command name="processassignmentlist" type="environment" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="processassignmentcommand" type="environment" level="system" file="syst-aux.mkiv"> + <cd:command name="processassignmentcommand" type="environment" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="currentassignmentlistkey" level="system" file="syst-aux.mkiv"/> + <cd:command name="currentassignmentlistkey" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="currentassignmentlistvalue" level="system" file="syst-aux.mkiv"/> + <cd:command name="currentassignmentlistvalue" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="getemptyparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getemptyparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copyparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="copyparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> @@ -964,13 +964,13 @@ </cd:arguments> </cd:command> - <cd:command name="checkparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="checkparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="ifparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="ifparameters" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -979,41 +979,41 @@ </cd:arguments> </cd:command> - <cd:command name="commalistsize" level="system" file="syst-aux.mkiv"/> + <cd:command name="commalistsize" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="getcommalistsize" level="system" file="syst-aux.mkiv"> + <cd:command name="getcommalistsize" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="getcommacommandsize" level="system" file="syst-aux.mkiv"> + <cd:command name="getcommacommandsize" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="getfromcommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="getfromcommalist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="getfromcommacommand" level="system" file="syst-aux.mkiv"> + <cd:command name="getfromcommacommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="firstinlist" level="system" file="syst-aux.mkiv"> + <cd:command name="firstinlist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="dogetcommacommandelement" level="system" file="syst-aux.mkiv"> + <cd:command name="dogetcommacommandelement" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-number"/> <cd:delimiter name="from"/> @@ -1023,14 +1023,14 @@ </cd:arguments> </cd:command> - <cd:command name="dosingleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dosingleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dodoubleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dodoubleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1038,7 +1038,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dotripleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1047,7 +1047,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadrupleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doquadrupleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1057,7 +1057,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintupleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doquintupleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1068,7 +1068,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosixtupleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dosixtupleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1080,7 +1080,7 @@ </cd:arguments> </cd:command> - <cd:command name="doseventupleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doseventupleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1093,14 +1093,14 @@ </cd:arguments> </cd:command> - <cd:command name="dosingleargument" level="system" file="syst-aux.mkiv"> + <cd:command name="dosingleargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> </cd:arguments> </cd:command> - <cd:command name="dodoubleargument" level="system" file="syst-aux.mkiv"> + <cd:command name="dodoubleargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1108,7 +1108,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleargument" level="system" file="syst-aux.mkiv"> + <cd:command name="dotripleargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1117,7 +1117,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadrupleargument" level="system" file="syst-aux.mkiv"> + <cd:command name="doquadrupleargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1127,7 +1127,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintupleargument" level="system" file="syst-aux.mkiv"> + <cd:command name="doquintupleargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1138,7 +1138,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosixtupleargument" level="system" file="syst-aux.mkiv"> + <cd:command name="dosixtupleargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1150,7 +1150,7 @@ </cd:arguments> </cd:command> - <cd:command name="doseventupleargument" level="system" file="syst-aux.mkiv"> + <cd:command name="doseventupleargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1163,13 +1163,13 @@ </cd:arguments> </cd:command> - <cd:command name="strippedcsname" level="system" file="syst-aux.mkiv"> + <cd:command name="strippedcsname" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="strippedcsname" variant="string" level="system" file="syst-aux.mkiv"> + <cd:command name="strippedcsname" variant="string" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -1177,13 +1177,13 @@ </cd:arguments> </cd:command> - <cd:command name="complexorsimple" level="system" file="syst-aux.mkiv"> + <cd:command name="complexorsimple" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="complexorsimple" variant="argument" level="system" file="syst-aux.mkiv"> + <cd:command name="complexorsimple" variant="argument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1192,13 +1192,13 @@ </cd:arguments> </cd:command> - <cd:command name="complexorsimpleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="complexorsimpleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="complexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv"> + <cd:command name="complexorsimpleempty" variant="argument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1207,13 +1207,13 @@ </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimple" level="system" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimple" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimple" variant="argument" level="system" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimple" variant="argument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1222,13 +1222,13 @@ </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimpleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimpleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimpleempty" variant="argument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1237,18 +1237,18 @@ </cd:arguments> </cd:command> - <cd:command name="permitspacesbetweengroups" level="system" file="syst-aux.mkiv"/> + <cd:command name="permitspacesbetweengroups" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="dontpermitspacesbetweengroups" level="system" file="syst-aux.mkiv"/> + <cd:command name="dontpermitspacesbetweengroups" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="dosinglegroupempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dosinglegroupempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dodoublegroupempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dodoublegroupempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1256,7 +1256,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotriplegroupempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dotriplegroupempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1265,7 +1265,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadruplegroupempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doquadruplegroupempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1275,7 +1275,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintuplegroupempty" level="system" file="syst-aux.mkiv"> + <cd:command name="doquintuplegroupempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1286,27 +1286,27 @@ </cd:arguments> </cd:command> - <cd:command name="firstofoneargument" level="system" file="syst-aux.mkiv"> + <cd:command name="firstofoneargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstoftwoarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="firstoftwoarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="secondoftwoarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="secondoftwoarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstofthreearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="firstofthreearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1314,7 +1314,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofthreearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="secondofthreearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1322,7 +1322,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofthreearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="thirdofthreearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1330,7 +1330,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstoffourarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="firstoffourarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1339,7 +1339,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondoffourarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="secondoffourarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1348,7 +1348,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdoffourarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="thirdoffourarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1357,7 +1357,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthoffourarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="fourthoffourarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1366,7 +1366,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstoffivearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="firstoffivearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1376,7 +1376,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondoffivearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="secondoffivearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1386,7 +1386,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdoffivearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="thirdoffivearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1396,7 +1396,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthoffivearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="fourthoffivearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1406,7 +1406,7 @@ </cd:arguments> </cd:command> - <cd:command name="fifthoffivearguments" level="system" file="syst-aux.mkiv"> + <cd:command name="fifthoffivearguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1416,7 +1416,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstofsixarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="firstofsixarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1427,7 +1427,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofsixarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="secondofsixarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1438,7 +1438,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofsixarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="thirdofsixarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1449,7 +1449,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthofsixarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="fourthofsixarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1460,7 +1460,7 @@ </cd:arguments> </cd:command> - <cd:command name="fifthofsixarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="fifthofsixarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1471,7 +1471,7 @@ </cd:arguments> </cd:command> - <cd:command name="sixthofsixarguments" level="system" file="syst-aux.mkiv"> + <cd:command name="sixthofsixarguments" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1482,27 +1482,27 @@ </cd:arguments> </cd:command> - <cd:command name="firstofoneunexpanded" level="system" file="syst-aux.mkiv"> + <cd:command name="firstofoneunexpanded" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstoftwounexpanded" level="system" file="syst-aux.mkiv"> + <cd:command name="firstoftwounexpanded" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="secondoftwounexpanded" level="system" file="syst-aux.mkiv"> + <cd:command name="secondoftwounexpanded" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstofthreeunexpanded" level="system" file="syst-aux.mkiv"> + <cd:command name="firstofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1510,7 +1510,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofthreeunexpanded" level="system" file="syst-aux.mkiv"> + <cd:command name="secondofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1518,7 +1518,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofthreeunexpanded" level="system" file="syst-aux.mkiv"> + <cd:command name="thirdofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1526,56 +1526,56 @@ </cd:arguments> </cd:command> - <cd:command name="letempty" level="system" file="syst-aux.mkiv"> + <cd:command name="letempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalletempty" level="system" file="syst-aux.mkiv"> + <cd:command name="globalletempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="letvalueempty" level="system" file="syst-aux.mkiv"> + <cd:command name="letvalueempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letgvalueempty" level="system" file="syst-aux.mkiv"> + <cd:command name="letgvalueempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letvaluerelax" level="system" file="syst-aux.mkiv"> + <cd:command name="letvaluerelax" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letgvalurelax" level="system" file="syst-aux.mkiv"> + <cd:command name="letgvalurelax" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="relaxvalueifundefined" level="system" file="syst-aux.mkiv"> + <cd:command name="relaxvalueifundefined" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="rawgetparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="rawgetparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="texdefinition" type="environment" level="system" file="syst-aux.mkiv"> + <cd:command name="texdefinition" type="environment" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="spaces"/> @@ -1613,39 +1613,37 @@ </cd:arguments> </cd:command> - <cd:command name="texdefinition" level="system" file="syst-aux.mkiv"> + <cd:command name="texdefinition" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="texcode" type="environment" level="system" file="syst-aux.mkiv"/> - - <cd:command name="newcounter" level="system" file="syst-aux.mkiv"> + <cd:command name="newcounter" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fastincrement" level="system" file="syst-aux.mkiv"> + <cd:command name="fastincrement" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fastdecrement" level="system" file="syst-aux.mkiv"> + <cd:command name="fastdecrement" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="increment" level="system" file="syst-aux.mkiv"> + <cd:command name="increment" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="increment" variant="argument" level="system" file="syst-aux.mkiv"> + <cd:command name="increment" variant="argument" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> @@ -1654,13 +1652,13 @@ </cd:arguments> </cd:command> - <cd:command name="decrement" level="system" file="syst-aux.mkiv"> + <cd:command name="decrement" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="decrement" variant="argument" level="system" file="syst-aux.mkiv"> + <cd:command name="decrement" variant="argument" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> @@ -1669,49 +1667,43 @@ </cd:arguments> </cd:command> - <cd:command name="incrementvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="incrementvalue" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="decrementvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="decrementvalue" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="newsignal" level="system" file="syst-aux.mkiv"> + <cd:command name="newsignal" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="checkedstrippedcsname" level="system" file="syst-aux.mkiv"> + <cd:command name="checkedstrippedcsname" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="checkedstrippedcsname" variant="string" level="system" file="syst-aux.mkiv"> - <cd:arguments> - <cd:resolve name="string-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="savenormalmeaning" level="system" file="syst-aux.mkiv"> + <cd:command name="savenormalmeaning" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="recursedepth" level="system" file="syst-aux.mkiv"/> + <cd:command name="recursedepth" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="recurselevel" level="system" file="syst-aux.mkiv"/> + <cd:command name="recurselevel" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="resetrecurselevel" level="system" file="syst-aux.mkiv"/> + <cd:command name="resetrecurselevel" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="dostepwiserecurse" level="system" file="syst-aux.mkiv"> + <cd:command name="dostepwiserecurse" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -1722,79 +1714,79 @@ </cd:arguments> </cd:command> - <cd:command name="dorecurse" level="system" file="syst-aux.mkiv"> + <cd:command name="dorecurse" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doexpandedrecurse" level="system" file="syst-aux.mkiv"> + <cd:command name="doexpandedrecurse" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="dowith" level="system" file="syst-aux.mkiv"> + <cd:command name="dowith" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command-list"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doloop" level="system" file="syst-aux.mkiv"> + <cd:command name="doloop" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="exitloop" level="system" file="syst-aux.mkiv"/> + <cd:command name="exitloop" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="exitloopnow" level="system" file="syst-aux.mkiv"/> + <cd:command name="exitloopnow" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="dofastloopcs" level="system" file="syst-aux.mkiv"> + <cd:command name="dofastloopcs" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fastloopindex" level="system" file="syst-aux.mkiv"/> + <cd:command name="fastloopindex" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="fastloopfinal" level="system" file="syst-aux.mkiv"/> + <cd:command name="fastloopfinal" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="doloopoverlist" level="system" file="syst-aux.mkiv"> + <cd:command name="doloopoverlist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="recursestring" level="system" file="syst-aux.mkiv"/> + <cd:command name="recursestring" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="newevery" level="system" file="syst-aux.mkiv"> + <cd:command name="newevery" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="EveryPar" level="system" file="syst-aux.mkiv"> + <cd:command name="EveryPar" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="EveryLine" level="system" file="syst-aux.mkiv"> + <cd:command name="EveryLine" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="forgeteverypar" level="system" file="syst-aux.mkiv"/> + <cd:command name="forgeteverypar" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="convertvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="convertvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:delimiter name="to"/> @@ -1802,14 +1794,14 @@ </cd:arguments> </cd:command> - <cd:command name="defconvertedvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="defconvertedvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseassignment" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -1817,7 +1809,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifassignmentelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifassignmentelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -1825,13 +1817,13 @@ </cd:arguments> </cd:command> - <cd:command name="docheckassignment" level="system" file="syst-aux.mkiv"> + <cd:command name="docheckassignment" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ifassignment" level="system" file="syst-aux.mkiv"> + <cd:command name="ifassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -1840,7 +1832,19 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseassignmentcs" level="system" file="syst-aux.mkiv"> + <cd:command name="validassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="nonvalidassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifelseassignmentcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> @@ -1848,7 +1852,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifassignmentelsecs" level="system" file="syst-aux.mkiv"> + <cd:command name="doifassignmentelsecs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> @@ -1856,7 +1860,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertargument" level="system" file="syst-aux.mkiv"> + <cd:command name="convertargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -1864,7 +1868,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="convertcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:delimiter name="to"/> @@ -1872,55 +1876,55 @@ </cd:arguments> </cd:command> - <cd:command name="defconvertedargument" level="system" file="syst-aux.mkiv"> + <cd:command name="defconvertedargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="defconvertedcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="defconvertedcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="edefconvertedargument" level="system" file="syst-aux.mkiv"> + <cd:command name="edefconvertedargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="gdefconvertedargument" level="system" file="syst-aux.mkiv"> + <cd:command name="gdefconvertedargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="gdefconvertedcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="gdefconvertedcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="xdefconvertedargument" level="system" file="syst-aux.mkiv"> + <cd:command name="xdefconvertedargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="showvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemeaning" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsemeaning" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1929,7 +1933,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmeaningelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifmeaningelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1938,7 +1942,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesamestring" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsesamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1947,7 +1951,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsamestringelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifsamestringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1956,7 +1960,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsamestring" level="system" file="syst-aux.mkiv"> + <cd:command name="doifsamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1964,7 +1968,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotsamestring" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotsamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1972,7 +1976,9 @@ </cd:arguments> </cd:command> - <cd:command name="ConvertToConstant" level="system" file="syst-aux.mkiv"> + <!-- begin of obsolete --> + + <cd:command name="ConvertToConstant" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -1980,7 +1986,7 @@ </cd:arguments> </cd:command> - <cd:command name="ConvertConstantAfter" level="system" file="syst-aux.mkiv"> + <cd:command name="ConvertConstantAfter" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -1988,61 +1994,63 @@ </cd:arguments> </cd:command> - <cd:command name="assignifempty" level="system" file="syst-aux.mkiv"> + <!-- end of obsolete --> + + <cd:command name="assignifempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="grabuntil" level="system" file="syst-aux.mkiv"> + <cd:command name="grabuntil" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processbetween" level="system" file="syst-aux.mkiv"> + <cd:command name="processbetween" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="gobbleuntil" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbleuntil" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="gobbleuntilrelax" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbleuntilrelax" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="relax"/> </cd:arguments> </cd:command> - <cd:command name="processuntil" level="system" file="syst-aux.mkiv"> + <cd:command name="processuntil" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="groupedcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="groupedcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="simplegroupedcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="simplegroupedcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="pickupgroupedcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="pickupgroupedcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2050,35 +2058,35 @@ </cd:arguments> </cd:command> - <cd:command name="BeforePar" level="system" file="syst-aux.mkiv"> + <cd:command name="BeforePar" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="AfterPar" level="system" file="syst-aux.mkiv"> + <cd:command name="AfterPar" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="GetPar" level="system" file="syst-aux.mkiv"/> + <cd:command name="GetPar" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="GotoPar" level="system" file="syst-aux.mkiv"/> + <cd:command name="GotoPar" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="dowithpargument" level="system" file="syst-aux.mkiv"> + <cd:command name="dowithpargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dowithwargument" level="system" file="syst-aux.mkiv"> + <cd:command name="dowithwargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dorepeatwithcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="dorepeatwithcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -2088,7 +2096,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsestringinstring" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsestringinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2097,7 +2105,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifstringinstringelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifstringinstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2106,7 +2114,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendtoks" level="system" file="syst-aux.mkiv"> + <cd:command name="appendtoks" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2114,7 +2122,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependtoks" level="system" file="syst-aux.mkiv"> + <cd:command name="prependtoks" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2122,7 +2130,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendtoksonce" level="system" file="syst-aux.mkiv"> + <cd:command name="appendtoksonce" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2130,7 +2138,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependtoksonce" level="system" file="syst-aux.mkiv"> + <cd:command name="prependtoksonce" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2138,7 +2146,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseintoks" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseintoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2147,7 +2155,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifintokselse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifintokselse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2156,25 +2164,25 @@ </cd:arguments> </cd:command> - <cd:command name="collecting" type="environment" level="system" file="syst-aux.mkiv"/> + <cd:command name="collecting" type="environment" level="system" category="strings" file="syst-aux.mkiv"/> - <cd:command name="collect" type="environment" level="system" file="syst-aux.mkiv"/> + <cd:command name="collect" type="environment" level="system" category="strings" file="syst-aux.mkiv"/> - <cd:command name="expandedcollect" type="environment" level="system" file="syst-aux.mkiv"/> + <cd:command name="expandedcollect" type="environment" level="system" category="strings" file="syst-aux.mkiv"/> - <cd:command name="collect" level="system" file="syst-aux.mkiv"> + <cd:command name="collect" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="collectexpanded" level="system" file="syst-aux.mkiv"> + <cd:command name="collectexpanded" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="removetoks" level="system" file="syst-aux.mkiv"> + <cd:command name="removetoks" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="from"/> @@ -2182,7 +2190,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendetoks" level="system" file="syst-aux.mkiv"> + <cd:command name="appendetoks" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2190,7 +2198,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependetoks" level="system" file="syst-aux.mkiv"> + <cd:command name="prependetoks" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2198,19 +2206,19 @@ </cd:arguments> </cd:command> - <cd:command name="flushtoks" level="system" file="syst-aux.mkiv"> + <cd:command name="flushtoks" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dotoks" level="system" file="syst-aux.mkiv"> + <cd:command name="dotoks" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="beforesplitstring" level="system" file="syst-aux.mkiv"> + <cd:command name="beforesplitstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2220,7 +2228,7 @@ </cd:arguments> </cd:command> - <cd:command name="aftersplitstring" level="system" file="syst-aux.mkiv"> + <cd:command name="aftersplitstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2230,7 +2238,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitstring" level="system" file="syst-aux.mkiv"> + <cd:command name="splitstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2242,7 +2250,7 @@ </cd:arguments> </cd:command> - <cd:command name="greedysplitstring" level="system" file="syst-aux.mkiv"> + <cd:command name="greedysplitstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2254,7 +2262,7 @@ </cd:arguments> </cd:command> - <cd:command name="beforetestandsplitstring" level="system" file="syst-aux.mkiv"> + <cd:command name="beforetestandsplitstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2264,7 +2272,7 @@ </cd:arguments> </cd:command> - <cd:command name="aftertestandsplitstring" level="system" file="syst-aux.mkiv"> + <cd:command name="aftertestandsplitstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2274,7 +2282,7 @@ </cd:arguments> </cd:command> - <cd:command name="testandsplitstring" level="system" file="syst-aux.mkiv"> + <cd:command name="testandsplitstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2286,7 +2294,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatperiod" level="system" file="syst-aux.mkiv"> + <cd:command name="splitatperiod" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2294,7 +2302,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcomma" level="system" file="syst-aux.mkiv"> + <cd:command name="splitatcomma" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2302,7 +2310,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatasterisk" level="system" file="syst-aux.mkiv"> + <cd:command name="splitatasterisk" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2310,7 +2318,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcolon" level="system" file="syst-aux.mkiv"> + <cd:command name="splitatcolon" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2318,7 +2326,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcolons" level="system" file="syst-aux.mkiv"> + <cd:command name="splitatcolons" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2326,7 +2334,7 @@ </cd:arguments> </cd:command> - <cd:command name="removesubstring" level="system" file="syst-aux.mkiv"> + <cd:command name="removesubstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="from"/> @@ -2336,35 +2344,35 @@ </cd:arguments> </cd:command> - <cd:command name="appendtocommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="appendtocommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="prependtocommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="prependtocommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="addtocommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="addtocommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="pretocommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="pretocommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="robustdoifelseinset" level="system" file="syst-aux.mkiv"> + <cd:command name="robustdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -2373,7 +2381,7 @@ </cd:arguments> </cd:command> - <cd:command name="robustdoifinsetelse" level="system" file="syst-aux.mkiv"> + <cd:command name="robustdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -2382,35 +2390,35 @@ </cd:arguments> </cd:command> - <cd:command name="robustaddtocommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="robustaddtocommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="robustpretocommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="robustpretocommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="xsplitstring" level="system" file="syst-aux.mkiv"> + <cd:command name="xsplitstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="removefromcommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="removefromcommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="substituteincommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="substituteincommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2418,14 +2426,14 @@ </cd:arguments> </cd:command> - <cd:command name="replaceincommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="replaceincommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="globalprocesscommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="globalprocesscommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -2434,112 +2442,112 @@ </cd:arguments> </cd:command> - <cd:command name="withoutpt" level="system" file="syst-aux.mkiv"> + <cd:command name="withoutpt" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="PtToCm" level="system" file="syst-aux.mkiv"> + <cd:command name="PtToCm" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="dimensiontocount" level="system" file="syst-aux.mkiv"> + <cd:command name="dimensiontocount" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="numberofpoints" level="system" file="syst-aux.mkiv"> + <cd:command name="numberofpoints" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="swapdimens" level="system" file="syst-aux.mkiv"> + <cd:command name="swapdimens" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="swapcounts" level="system" file="syst-aux.mkiv"> + <cd:command name="swapcounts" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="swapmacros" level="system" file="syst-aux.mkiv"> + <cd:command name="swapmacros" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapdimens" level="system" file="syst-aux.mkiv"> + <cd:command name="globalswapdimens" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapcounts" level="system" file="syst-aux.mkiv"> + <cd:command name="globalswapcounts" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapmacros" level="system" file="syst-aux.mkiv"> + <cd:command name="globalswapmacros" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalpushmacro" level="system" file="syst-aux.mkiv"> + <cd:command name="globalpushmacro" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="localpushmacro" level="system" file="syst-aux.mkiv"> + <cd:command name="localpushmacro" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalpopmacro" level="system" file="syst-aux.mkiv"> + <cd:command name="globalpopmacro" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="localpopmacro" level="system" file="syst-aux.mkiv"> + <cd:command name="localpopmacro" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="pushmacro" level="system" file="syst-aux.mkiv"> + <cd:command name="pushmacro" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="popmacro" level="system" file="syst-aux.mkiv"> + <cd:command name="popmacro" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="localhsize" level="system" file="syst-aux.mkiv"/> + <cd:command name="localhsize" level="system" category="layout" file="syst-aux.mkiv"/> - <cd:command name="setlocalhsize" level="system" file="syst-aux.mkiv"> + <cd:command name="setlocalhsize" level="system" category="layout" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:dimension" prefix="cd:sign" method="none"/> @@ -2547,9 +2555,9 @@ </cd:arguments> </cd:command> - <cd:command name="availablehsize" level="system" file="syst-aux.mkiv"/> + <cd:command name="availablehsize" level="system" category="layout" file="syst-aux.mkiv"/> - <cd:command name="distributedhsize" level="system" file="syst-aux.mkiv"> + <cd:command name="distributedhsize" level="system" category="layout" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -2557,14 +2565,14 @@ </cd:arguments> </cd:command> - <cd:command name="hsizefraction" level="system" file="syst-aux.mkiv"> + <cd:command name="hsizefraction" level="system" category="layout" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="doifvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="doifvalue" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2572,7 +2580,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2580,7 +2588,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsevalue" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsevalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2589,7 +2597,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvalueelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifvalueelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2598,21 +2606,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifnothing" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifsomething" level="system" file="syst-aux.mkiv"> + <cd:command name="doifsomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenothing" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2620,7 +2628,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnothingelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnothingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2628,7 +2636,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesomething" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsesomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2636,7 +2644,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomethingelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifsomethingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2644,21 +2652,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifvaluenothing" level="system" file="syst-aux.mkiv"> + <cd:command name="doifvaluenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifvaluesomething" level="system" file="syst-aux.mkiv"> + <cd:command name="doifvaluesomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsevaluenothing" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsevaluenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2666,7 +2674,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvaluenothingelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifvaluenothingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2674,7 +2682,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseemptyvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2682,7 +2690,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvalueelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifemptyvalueelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2690,21 +2698,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="doifemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotemptyvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelseallcommon" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -2713,7 +2721,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifallcommonelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifallcommonelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -2722,7 +2730,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifallcommon" level="system" file="syst-aux.mkiv"> + <cd:command name="doifallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -2730,7 +2738,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotallcommon" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -2738,7 +2746,7 @@ </cd:arguments> </cd:command> - <cd:command name="dodoubleemptywithset" level="system" file="syst-aux.mkiv"> + <cd:command name="dodoubleemptywithset" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list-optional"/> @@ -2746,7 +2754,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleemptywithset" level="system" file="syst-aux.mkiv"> + <cd:command name="dotripleemptywithset" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list-optional"/> @@ -2755,7 +2763,7 @@ </cd:arguments> </cd:command> - <cd:command name="dodoubleargumentwithset" level="system" file="syst-aux.mkiv"> + <cd:command name="dodoubleargumentwithset" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list"/> @@ -2763,7 +2771,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleargumentwithset" level="system" file="syst-aux.mkiv"> + <cd:command name="dotripleargumentwithset" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list"/> @@ -2772,7 +2780,7 @@ </cd:arguments> </cd:command> - <cd:command name="stripcharacter" level="system" file="syst-aux.mkiv"> + <cd:command name="stripcharacter" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:delimiter name="from"/> @@ -2782,7 +2790,7 @@ </cd:arguments> </cd:command> - <cd:command name="stripspaces" level="system" file="syst-aux.mkiv"> + <cd:command name="stripspaces" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="from"/> <cd:resolve name="string-text"/> @@ -2791,7 +2799,7 @@ </cd:arguments> </cd:command> - <cd:command name="unspacestring" level="system" file="syst-aux.mkiv"> + <cd:command name="unspacestring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2799,14 +2807,14 @@ </cd:arguments> </cd:command> - <cd:command name="executeifdefined" level="system" file="syst-aux.mkiv"> + <cd:command name="executeifdefined" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesomespace" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsesomespace" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2814,7 +2822,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomespaceelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifsomespaceelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2822,7 +2830,7 @@ </cd:arguments> </cd:command> - <cd:command name="processseparatedlist" level="system" file="syst-aux.mkiv"> + <cd:command name="processseparatedlist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> @@ -2833,7 +2841,7 @@ </cd:arguments> </cd:command> - <cd:command name="processlist" level="system" file="syst-aux.mkiv"> + <cd:command name="processlist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> @@ -2842,14 +2850,14 @@ </cd:arguments> </cd:command> - <cd:command name="processassignlist" level="system" file="syst-aux.mkiv"> + <cd:command name="processassignlist" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="untexargument" level="system" file="syst-aux.mkiv"> + <cd:command name="untexargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:delimiter name="to"/> @@ -2857,7 +2865,7 @@ </cd:arguments> </cd:command> - <cd:command name="untexcommand" level="system" file="syst-aux.mkiv"> + <cd:command name="untexcommand" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-csname"/> <cd:delimiter name="to"/> @@ -2865,56 +2873,56 @@ </cd:arguments> </cd:command> - <cd:command name="PointsToBigPoints" level="system" file="syst-aux.mkiv"> + <cd:command name="PointsToBigPoints" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="PointsToWholeBigPoints" level="system" file="syst-aux.mkiv"> + <cd:command name="PointsToWholeBigPoints" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ScaledPointsToBigPoints" level="system" file="syst-aux.mkiv"> + <cd:command name="ScaledPointsToBigPoints" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ScaledPointsToWholeBigPoints" level="system" file="syst-aux.mkiv"> + <cd:command name="ScaledPointsToWholeBigPoints" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="PointsToReal" level="system" file="syst-aux.mkiv"> + <cd:command name="PointsToReal" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dontleavehmode" level="style" file="syst-aux.mkiv"/> + <cd:command name="dontleavehmode" level="style" category="system" file="syst-aux.mkiv"/> - <cd:command name="utfupper" level="system" file="syst-aux.mkiv"> + <cd:command name="utfupper" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="utflower" level="system" file="syst-aux.mkiv"> + <cd:command name="utflower" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="uppercasestring" level="system" file="syst-aux.mkiv"> + <cd:command name="uppercasestring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2922,7 +2930,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowercasestring" level="system" file="syst-aux.mkiv"> + <cd:command name="lowercasestring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2930,7 +2938,7 @@ </cd:arguments> </cd:command> - <cd:command name="counttoken" level="system" file="syst-aux.mkiv"> + <cd:command name="counttoken" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="in"/> @@ -2940,7 +2948,7 @@ </cd:arguments> </cd:command> - <cd:command name="counttokens" level="system" file="syst-aux.mkiv"> + <cd:command name="counttokens" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2948,7 +2956,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitofftokens" level="system" file="syst-aux.mkiv"> + <cd:command name="splitofftokens" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="from"/> @@ -2958,7 +2966,7 @@ </cd:arguments> </cd:command> - <cd:command name="handletokens" level="system" file="syst-aux.mkiv"> + <cd:command name="handletokens" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="with"/> @@ -2966,11 +2974,11 @@ </cd:arguments> </cd:command> - <cd:command name="settrialtypesetting" level="system" file="syst-aux.mkiv"/> + <cd:command name="settrialtypesetting" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="resettrialtypesetting" level="system" file="syst-aux.mkiv"/> + <cd:command name="resettrialtypesetting" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="iftrialtypesetting" level="system" file="syst-aux.mkiv"> + <cd:command name="iftrialtypesetting" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -2979,64 +2987,64 @@ </cd:arguments> </cd:command> - <cd:command name="integerrounding" level="system" file="syst-aux.mkiv"> + <cd:command name="integerrounding" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="onedigitrounding" level="system" file="syst-aux.mkiv"> + <cd:command name="onedigitrounding" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="twodigitrounding" level="system" file="syst-aux.mkiv"> + <cd:command name="twodigitrounding" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="threedigitrounding" level="system" file="syst-aux.mkiv"> + <cd:command name="threedigitrounding" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="processcontent" level="system" file="syst-aux.mkiv"> + <cd:command name="processcontent" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dogobblesingleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dogobblesingleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dogobbledoubleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="dogobbledoubleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="gobblesingleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="gobblesingleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="gobbledoubleempty" level="system" file="syst-aux.mkiv"> + <cd:command name="gobbledoubleempty" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesometoks" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsesometoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> @@ -3044,7 +3052,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsometokselse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifsometokselse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> @@ -3052,71 +3060,71 @@ </cd:arguments> </cd:command> - <cd:command name="doifsometoks" level="system" file="syst-aux.mkiv"> + <cd:command name="doifsometoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifemptytoks" level="system" file="syst-aux.mkiv"> + <cd:command name="doifemptytoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="strictinspectnextcharacter" type="environment" level="system" file="syst-aux.mkiv"/> + <cd:command name="strictinspectnextcharacter" type="environment" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="strictdoifelsenextoptional" level="system" file="syst-aux.mkiv"> + <cd:command name="strictdoifelsenextoptional" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="strictdoifnextoptionalelse" level="system" file="syst-aux.mkiv"> + <cd:command name="strictdoifnextoptionalelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="gobblespacetokens" level="system" file="syst-aux.mkiv"/> + <cd:command name="gobblespacetokens" level="system" category="strings" file="syst-aux.mkiv"/> - <cd:command name="verbatimstring" level="system" file="syst-aux.mkiv"> + <cd:command name="verbatimstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lastdigit" level="system" file="syst-aux.mkiv"> + <cd:command name="lastdigit" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="lasttwodigits" level="system" file="syst-aux.mkiv"> + <cd:command name="lasttwodigits" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="serializedcommalist" level="system" file="syst-aux.mkiv"/> + <cd:command name="serializedcommalist" level="system" category="strings" file="syst-aux.mkiv"/> - <cd:command name="serializecommalist" level="system" file="syst-aux.mkiv"> + <cd:command name="serializecommalist" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="purenumber" level="system" file="syst-aux.mkiv"> + <cd:command name="purenumber" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="filterfromvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="filterfromvalue" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -3124,7 +3132,7 @@ </cd:arguments> </cd:command> - <cd:command name="filterfromnext" level="system" file="syst-aux.mkiv"> + <cd:command name="filterfromnext" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -3136,61 +3144,61 @@ </cd:arguments> </cd:command> - <cd:command name="definemeasure" level="style" file="syst-aux.mkiv"> + <cd:command name="definemeasure" level="style" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="freezemeasure" level="system" file="syst-aux.mkiv"> + <cd:command name="freezemeasure" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setmeasure" level="system" file="syst-aux.mkiv"> + <cd:command name="setmeasure" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setgmeasure" level="system" file="syst-aux.mkiv"> + <cd:command name="setgmeasure" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setemeasure" level="system" file="syst-aux.mkiv"> + <cd:command name="setemeasure" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setxmeasure" level="system" file="syst-aux.mkiv"> + <cd:command name="setxmeasure" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="measure" level="style" file="syst-aux.mkiv"> + <cd:command name="measure" level="style" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="measured" level="style" file="syst-aux.mkiv"> + <cd:command name="measured" level="style" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dividedsize" level="system" file="syst-aux.mkiv"> + <cd:command name="dividedsize" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -3198,7 +3206,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedimension" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsedimension" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3206,7 +3214,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdimensionelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifdimensionelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3214,7 +3222,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedimenstring" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsedimenstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3222,7 +3230,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdimenstringelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifdimenstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3230,23 +3238,23 @@ </cd:arguments> </cd:command> - <cd:command name="compresult" level="system" file="syst-aux.mkiv"/> + <cd:command name="compresult" level="system" category="counter" file="syst-aux.mkiv"/> - <cd:command name="comparedimension" level="system" file="syst-aux.mkiv"> + <cd:command name="comparedimension" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="comparedimensioneps" level="system" file="syst-aux.mkiv"> + <cd:command name="comparedimensioneps" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="letcscsname" level="system" file="syst-aux.mkiv"> + <cd:command name="letcscsname" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:delimiter name="csname"/> @@ -3255,7 +3263,7 @@ </cd:arguments> </cd:command> - <cd:command name="letcsnamecs" level="system" file="syst-aux.mkiv"> + <cd:command name="letcsnamecs" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="csname"/> <cd:resolve name="string-name"/> @@ -3264,7 +3272,7 @@ </cd:arguments> </cd:command> - <cd:command name="letcsnamecsname" level="system" file="syst-aux.mkiv"> + <cd:command name="letcsnamecsname" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="csname"/> <cd:resolve name="string-name"/> @@ -3275,20 +3283,20 @@ </cd:arguments> </cd:command> - <cd:command name="addvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="addvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="unspaced" level="system" file="syst-aux.mkiv"> + <cd:command name="unspaced" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="unspaceargument" level="system" file="syst-aux.mkiv"> + <cd:command name="unspaceargument" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -3296,14 +3304,14 @@ </cd:arguments> </cd:command> - <cd:command name="unspaceafter" level="system" file="syst-aux.mkiv"> + <cd:command name="unspaceafter" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelsehasspace" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsehasspace" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3311,7 +3319,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifhasspaceelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifhasspaceelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3319,25 +3327,25 @@ </cd:arguments> </cd:command> - <cd:command name="setflag" level="system" file="syst-aux.mkiv"> + <cd:command name="setflag" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetflag" level="system" file="syst-aux.mkiv"> + <cd:command name="resetflag" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="flag" level="system" file="syst-aux.mkiv"> + <cd:command name="flag" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseflagged" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelseflagged" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -3345,7 +3353,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifflaggedelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifflaggedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -3353,14 +3361,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotflagged" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnotflagged" level="system" category="system" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="inheritparameter" level="system" file="syst-aux.mkiv"> + <cd:command name="inheritparameter" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> @@ -3368,7 +3376,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsenonzeropositive" level="system" file="syst-aux.mkiv"> + <cd:command name="doifelsenonzeropositive" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -3376,7 +3384,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnonzeropositiveelse" level="system" file="syst-aux.mkiv"> + <cd:command name="doifnonzeropositiveelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -3384,118 +3392,122 @@ </cd:arguments> </cd:command> - <cd:command name="getrawparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getrawparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getraweparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getraweparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getrawgparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getrawgparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getrawxparameters" level="system" file="syst-aux.mkiv"> + <cd:command name="getrawxparameters" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="unprotected" level="system" file="syst-aux.mkiv"> + <cd:command name="unprotected" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="par"/> </cd:arguments> </cd:command> - <cd:command name="resettimer" level="system" file="syst-aux.mkiv"/> + <cd:command name="resettimer" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="elapsedtime" level="system" file="syst-aux.mkiv"/> + <cd:command name="elapsedtime" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="elapsedseconds" level="system" file="syst-aux.mkiv"/> + <cd:command name="elapsedseconds" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="currentfeaturetest" level="system" file="syst-aux.mkiv"/> + <cd:command name="elapsedsteptime" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="testfeature" level="system" file="syst-aux.mkiv"> + <cd:command name="currentfeaturetest" level="system" category="system" file="syst-aux.mkiv"/> + + <cd:command name="testfeature" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="showtimer" level="system" file="syst-aux.mkiv"> + <cd:command name="retestfeature" level="system" category="system" file="syst-aux.mkiv"/> + + <cd:command name="showtimer" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="testfeatureonce" level="system" file="syst-aux.mkiv"> + <cd:command name="testfeatureonce" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="freezedimenmacro" level="system" file="syst-aux.mkiv"> + <cd:command name="freezedimenmacro" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="negated" level="system" file="syst-aux.mkiv"> + <cd:command name="negated" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="assigndimen" level="system" file="syst-aux.mkiv"> + <cd:command name="assigndimen" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="appendvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="appendvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="appendgvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="appendgvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="prependvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="prependvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="prependgvalue" level="system" file="syst-aux.mkiv"> + <cd:command name="prependgvalue" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="processranges" level="system" file="syst-aux.mkiv"> + <cd:command name="processranges" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:number"/> @@ -3505,7 +3517,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithrange" level="system" file="syst-aux.mkiv"> + <cd:command name="dowithrange" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:number"/> @@ -3515,11 +3527,11 @@ </cd:arguments> </cd:command> - <cd:command name="ignoreimplicitspaces" level="system" file="syst-aux.mkiv"/> + <cd:command name="ignoreimplicitspaces" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="nointerference" type="environment" level="system" file="syst-aux.mkiv"/> + <cd:command name="nointerference" type="environment" level="system" category="system" file="syst-aux.mkiv"/> - <cd:command name="expandcheckedcsname" level="system" file="syst-aux.mkiv"> + <cd:command name="expandcheckedcsname" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-key"/> @@ -3527,43 +3539,43 @@ </cd:arguments> </cd:command> - <cd:command name="docheckedpair" level="system" file="syst-aux.mkiv"> + <cd:command name="docheckedpair" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> </cd:arguments> </cd:command> - <cd:command name="constantnumber" level="system" file="syst-aux.mkiv"> + <cd:command name="constantnumber" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantnumberargument" level="system" file="syst-aux.mkiv"> + <cd:command name="constantnumberargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantdimen" level="system" file="syst-aux.mkiv"> + <cd:command name="constantdimen" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantdimenargument" level="system" file="syst-aux.mkiv"> + <cd:command name="constantdimenargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantemptyargument" level="system" file="syst-aux.mkiv"> + <cd:command name="constantemptyargument" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="getsubstring" level="system" file="syst-aux.mkiv"> + <cd:command name="getsubstring" level="system" category="strings" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -3571,7 +3583,7 @@ </cd:arguments> </cd:command> - <cd:command name="converteddimen" level="system" file="syst-aux.mkiv"> + <cd:command name="converteddimen" level="system" category="counter" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:keywords delimiters="braces"> @@ -3591,14 +3603,14 @@ </cd:arguments> </cd:command> - <cd:command name="ntimes" level="system" file="syst-aux.mkiv"> + <cd:command name="ntimes" level="system" category="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="expdoifelse" level="system" file="syst-lua.mkiv"> + <cd:command name="expdoifelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -3607,7 +3619,7 @@ </cd:arguments> </cd:command> - <cd:command name="expdoif" level="system" file="syst-lua.mkiv"> + <cd:command name="expdoif" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -3615,7 +3627,7 @@ </cd:arguments> </cd:command> - <cd:command name="expdoifnot" level="system" file="syst-lua.mkiv"> + <cd:command name="expdoifnot" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -3623,7 +3635,7 @@ </cd:arguments> </cd:command> - <cd:command name="expandeddoif" level="system" file="syst-lua.mkiv"> + <cd:command name="expandeddoif" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -3631,7 +3643,7 @@ </cd:arguments> </cd:command> - <cd:command name="expandeddoifnot" level="system" file="syst-lua.mkiv"> + <cd:command name="expandeddoifnot" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -3639,7 +3651,7 @@ </cd:arguments> </cd:command> - <cd:command name="expandeddoifelse" level="system" file="syst-lua.mkiv"> + <cd:command name="expandeddoifelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -3648,7 +3660,7 @@ </cd:arguments> </cd:command> - <cd:command name="expdoifelsecommon" level="system" file="syst-lua.mkiv"> + <cd:command name="expdoifelsecommon" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -3657,7 +3669,7 @@ </cd:arguments> </cd:command> - <cd:command name="expdoifcommonelse" level="system" file="syst-lua.mkiv"> + <cd:command name="expdoifcommonelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-text-list"/> @@ -3666,7 +3678,7 @@ </cd:arguments> </cd:command> - <cd:command name="expdoifelseinset" level="system" file="syst-lua.mkiv"> + <cd:command name="expdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -3675,7 +3687,7 @@ </cd:arguments> </cd:command> - <cd:command name="expdoifinsetelse" level="system" file="syst-lua.mkiv"> + <cd:command name="expdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text-list"/> @@ -3684,10 +3696,20 @@ </cd:arguments> </cd:command> - <cd:command name="luaexpr" level="system" file="syst-lua.mkiv"> + <cd:command name="luaexpr" level="system" category="strings" file="syst-lua.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> + <cd:command name="setupsystem" level="style" category="counter" file="core-sys.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-systemlog.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-systemlog.xml index fc3243cfb7a..16b121322cf 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-systemlog.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-systemlog.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="systemlog" level="system" file="core-sys.mkiv"> + <cd:command name="systemlog" level="system" category="tracker" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-text"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="systemlogfirst" level="system" file="core-sys.mkiv"> + <cd:command name="systemlogfirst" level="system" category="tracker" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-text"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="systemloglast" level="system" file="core-sys.mkiv"> + <cd:command name="systemloglast" level="system" category="tracker" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-text"/> @@ -28,4 +28,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-table.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-table.xml index e59a9ca9798..c75fc1d8ed3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-table.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-table.xml @@ -58,7 +58,7 @@ <cd:command name="setuptables" level="style" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:assignments list="yes"> - <cd:parameter name="text"> + <cd:parameter name="textwidth"> <cd:constant type="cd:dimension"/> <cd:constant type="max"/> </cd:parameter> @@ -407,4 +407,4 @@ --> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-tabulation.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-tabulation.xml index 6768b9b4cf6..2c080876935 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-tabulation.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-tabulation.xml @@ -4,19 +4,164 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetabulation" level="style" category="tables" file="tabl-tbl.mkiv"> + <!-- + + <cd:command name="definetabulation" level="style" category="tables" file="tabl-tbl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptabulation"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuptabulation" level="style" category="tables" file="tabl-tbl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="format"> + <cd:constant type="cd:template"/> + <cd:constant type="none"/> + </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="distance"> + <cd:constant type="small"/> + <cd:constant type="medium" default="yes"/> + <cd:constant type="big"/> + <cd:constant type="none"/> + <cd:constant type="blank"/> + <cd:constant type="depth" default="yes"/> + <cd:constant type="grid"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="blank"> + <cd:resolve name="value-blank"/> + </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="background"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="foregroundstyle"> + <cd:resolve name="value-style"/> + </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"/> + <cd:constant type="right"/> + <cd:constant type="dimension"/> + </cd:parameter> + <cd:parameter name="rule"> + <cd:constant type="line"/> + <cd:constant type="normal" default="yes"/> + </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:parameter name="bodyfont"> + <cd:inherit name="setupbodyfont"/> + </cd:parameter> + <cd:parameter name="indenting"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="split"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="repeat"/> + <cd:constant type="auto" default="yes"/> + </cd:parameter> + <cd:parameter name="unit"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="inner"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="EQ"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="header"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="repeat"/> + <cd:constant type="text"/> + </cd:parameter> + <cd:parameter name="frame"> + <cd:constant type="on"/> + <cd:constant type="off" default="yes"/> + </cd:parameter> + <cd:parameter name="title"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="keeptogether"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="tabulation" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-tbl.mkiv"> + <cd:sequence> + <cd:variable value="tabulation"/> + </cd:sequence> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptabulation"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="definetabulate" level="style" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptabulation"/> - </cd:assignments> + <cd:template optional="yes"/> </cd:arguments> </cd:command> - <cd:command name="setuptabulation" level="style" category="tables" file="tabl-tbl.mkiv"> + <!-- + + <cd:command name="setuptabulate" level="style" category="tables" file="tabl-tbl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setuptabulation"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setuptabulate" level="style" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> <cd:parameter name="format"> <cd:constant type="cd:template"/> @@ -120,36 +265,6 @@ </cd:arguments> </cd:command> - <cd:command name="tabulation" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-tbl.mkiv"> - <cd:sequence> - <cd:variable value="tabulation"/> - </cd:sequence> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptabulation"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="definetabulate" level="style" category="tables" file="tabl-tbl.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name"/> - <cd:resolve name="keyword-name-optional"/> - <cd:template optional="yes"/> - </cd:arguments> - </cd:command> - - <cd:command name="setuptabulate" level="style" category="tables" file="tabl-tbl.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setuptabulation"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command name="tabulate" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:template optional="yes"/> @@ -196,24 +311,6 @@ <!-- - <cd:command name="legend" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptabulate"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="fact" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptabulate"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command name="VL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-tagging.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-tagging.xml index d07b32ec1e0..4193f0e246b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-tagging.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-tagging.xml @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseinelement" level="system" category="xml conditional" file="strc-tag.mkiv"> + <cd:command name="doifelseinelement" level="system" category="xml" keywords="conditional" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -40,7 +40,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinelementelse" level="system" category="xml conditional" file="strc-tag.mkiv"> + <cd:command name="doifinelementelse" level="system" category="xml" keywords="conditional" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="taggedlabeltexts" level="system" category="xml language" file="strc-tag.mkiv"> + <cd:command name="taggedlabeltexts" level="system" category="xml" keywords="language" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -56,7 +56,7 @@ </cd:arguments> </cd:command> - <cd:command name="namedtaggedlabeltexts" level="system" category="xml language" file="strc-tag.mkiv"> + <cd:command name="namedtaggedlabeltexts" level="system" category="xml" keywords="language" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-tex.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-tex.xml index 277c4db95b7..5599315c58e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-tex.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-tex.xml @@ -454,4 +454,4 @@ <cd:command name="xspaceskip" level="primitive"/> <cd:command name="year" level="primitive"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-textbackground.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-textbackground.xml index 6104b1d9aa8..9d5b36c0791 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-textbackground.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-textbackground.xml @@ -148,4 +148,4 @@ <cd:command name="textbackgroundmanual" type="environment" level="system" category="background" file="anch-bck.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-textflow.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-textflow.xml index 9c9ea21900c..71234373f91 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-textflow.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-textflow.xml @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetextflowcollector" level="system" category="structure conditional" file="page-flw.mkiv"> + <cd:command name="doifelsetextflowcollector" level="system" category="structure" keywords="conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftextflowcollectorelse" level="system" category="structure conditional" file="page-flw.mkiv"> + <cd:command name="doiftextflowcollectorelse" level="system" category="structure" keywords="conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -53,7 +53,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetextflow" level="system" category="structure conditional" file="page-flw.mkiv"> + <cd:command name="doifelsetextflow" level="system" category="structure" keywords="conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -61,7 +61,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftextflowelse" level="system" category="structure conditional" file="page-flw.mkiv"> + <cd:command name="doiftextflowelse" level="system" category="structure" keywords="conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -81,4 +81,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-textrule.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-textrule.xml index b71df66a6a4..addbc13162d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-textrule.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-textrule.xml @@ -69,4 +69,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml index f13d8802115..0dcaf065dec 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml @@ -43,15 +43,30 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:resolve name="value-style"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <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="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -61,6 +76,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -116,7 +134,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayouttextline" level="system" category="layout conditional" file="page-txt.mkvi"> + <cd:command name="doifelselayouttextline" level="system" category="layout" keywords="conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -124,7 +142,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayouttextlineelse" level="system" category="layout conditional" file="page-txt.mkvi"> + <cd:command name="doiflayouttextlineelse" level="system" category="layout" keywords="conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -132,7 +150,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayoutsomeline" level="system" category="layout conditional" file="page-txt.mkvi"> + <cd:command name="doifelselayoutsomeline" level="system" category="layout" keywords="conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -140,7 +158,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayoutsomelineelse" level="system" category="layout conditional" file="page-txt.mkvi"> + <cd:command name="doiflayoutsomelineelse" level="system" category="layout" keywords="conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -268,4 +286,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-thinrule.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-thinrule.xml index 372f9a23805..bc150083a5f 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-thinrule.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-thinrule.xml @@ -71,4 +71,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-token.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-token.xml index 09e2ad3d6df..f0359587b97 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-token.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-token.xml @@ -4,59 +4,59 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="tokens" type="environment" level="system" file="toks-tra.mkiv"> + <cd:command name="tokens" type="environment" level="system" category="strings" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushtokens" level="system" file="toks-tra.mkiv"> + <cd:command name="flushtokens" level="system" category="strings" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showtokens" level="system" file="toks-tra.mkiv"> + <cd:command name="showtokens" level="system" category="strings" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="testtokens" level="system" file="toks-tra.mkiv"> + <cd:command name="testtokens" level="system" category="strings" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definetokenlist" level="style" file="toks-aux.mkiv"> + <cd:command name="definetokenlist" level="style" category="strings" file="toks-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tokenlist" type="environment" level="style" file="toks-aux.mkiv"> + <cd:command name="tokenlist" type="environment" level="style" category="strings" file="toks-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="gettokenlist" level="style" file="toks-aux.mkiv"> + <cd:command name="gettokenlist" level="style" category="strings" file="toks-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resettokenlist" level="style" file="toks-aux.mkiv"> + <cd:command name="resettokenlist" level="style" category="strings" file="toks-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="settokenlist" level="style" file="toks-aux.mkiv"> + <cd:command name="settokenlist" level="style" category="strings" file="toks-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-tolerance.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-tolerance.xml index 3d0010edf80..1613c317059 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-tolerance.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-tolerance.xml @@ -19,4 +19,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-tooltip.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-tooltip.xml index df43ff9ce5d..038324426cc 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-tooltip.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-tooltip.xml @@ -62,30 +62,4 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="tooltip" level="document" category="pdf" file="scrn-fld.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptooltip"/> - </cd:assignments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="tooltip" variant="argument" level="document" category="pdf" file="scrn-fld.mkvi"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="left"/> - <cd:constant type="middle"/> - <cd:constant type="right"/> - </cd:keywords> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-tracker.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-tracker.xml index 3db36addcac..785674e2c7b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-tracker.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-tracker.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="installtextracker" level="system" file="trac-ctx.mkiv"> + <cd:command name="installtextracker" level="system" category="tracker" file="trac-ctx.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="installtexdirective" level="system" file="trac-ctx.mkiv"> + <cd:command name="installtexdirective" level="system" category="tracker" file="trac-ctx.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> @@ -20,56 +20,56 @@ </cd:arguments> </cd:command> - <cd:command name="enabletrackers" level="style" file="trac-deb.mkiv"> + <cd:command name="enabletrackers" level="style" category="tracker" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disabletrackers" level="style" file="trac-deb.mkiv"> + <cd:command name="disabletrackers" level="style" category="tracker" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="resettrackers" level="system" file="trac-deb.mkiv"/> + <cd:command name="resettrackers" level="system" category="tracker" file="trac-deb.mkiv"/> - <cd:command name="showtrackers" level="document" file="trac-deb.mkiv"/> + <cd:command name="showtrackers" level="document" category="tracker" file="trac-deb.mkiv"/> - <cd:command name="enabledirectives" level="style" file="trac-deb.mkiv"> + <cd:command name="enabledirectives" level="style" category="tracker" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disabledirectives" level="style" file="trac-deb.mkiv"> + <cd:command name="disabledirectives" level="style" category="tracker" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="showdirectives" level="document" file="trac-deb.mkiv"/> + <cd:command name="showdirectives" level="document" category="tracker" file="trac-deb.mkiv"/> - <cd:command name="enableexperiments" level="style" file="trac-deb.mkiv"> + <cd:command name="enableexperiments" level="style" category="tracker" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disableexperiments" level="style" file="trac-deb.mkiv"> + <cd:command name="disableexperiments" level="style" category="tracker" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="showexperiments" level="document" file="trac-deb.mkiv"/> + <cd:command name="showexperiments" level="document" category="tracker" file="trac-deb.mkiv"/> - <cd:command name="showedebuginfo" level="system" file="trac-deb.mkiv"/> + <cd:command name="showedebuginfo" level="system" category="tracker" file="trac-deb.mkiv"/> - <cd:command name="overloaderror" level="system" file="trac-deb.mkiv"/> + <cd:command name="overloaderror" level="system" category="tracker" file="trac-deb.mkiv"/> - <cd:command name="showlogcategories" level="system" file="trac-deb.mkiv"/> + <cd:command name="showlogcategories" level="system" category="tracker" file="trac-deb.mkiv"/> - <cd:command name="showjustification" level="system" file="trac-jus.mkiv"/> + <cd:command name="showjustification" level="system" category="tracker" file="trac-jus.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-translate.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-translate.xml index a865a4dd033..566208f96b2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-translate.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-translate.xml @@ -23,4 +23,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-translation.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-translation.xml index f4f03037e07..9737fffaa51 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-translation.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-translation.xml @@ -26,4 +26,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-twopassdata.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-twopassdata.xml index 992735693a7..853e21d1fa2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-twopassdata.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-twopassdata.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="immediatesavetwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="immediatesavetwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="savetwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="savetwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="lazysavetwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="lazysavetwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="savetaggedtwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="savetaggedtwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="lazysavetaggedtwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="lazysavetaggedtwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -46,57 +46,57 @@ </cd:arguments> </cd:command> - <cd:command name="definetwopasslist" level="system" file="core-two.mkiv"> + <cd:command name="definetwopasslist" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="gettwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="gettwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="checktwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="checktwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="findtwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="findtwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getfirsttwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="getfirsttwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getlasttwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="getlasttwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getnamedtwopassdatalist" level="system" file="core-two.mkiv"> + <cd:command name="getnamedtwopassdatalist" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="gettwopassdatalist" level="system" file="core-two.mkiv"> + <cd:command name="gettwopassdatalist" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseintwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="doifelseintwopassdata" level="system" category="twopassdata" keywords="conditional" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifintwopassdataelse" level="system" file="core-two.mkiv"> + <cd:command name="doifintwopassdataelse" level="system" category="twopassdata" keywords="conditional" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -114,11 +114,11 @@ </cd:arguments> </cd:command> - <cd:command name="getfromtwopassdata" level="system" file="core-two.mkiv"> + <cd:command name="getfromtwopassdata" level="system" category="twopassdata" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-typography.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-typography.xml index c5f06fa13d4..8f6fb1974d3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-typography.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-typography.xml @@ -170,4 +170,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-unit.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-unit.xml index c8092a4ed2b..c92a3b76870 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-unit.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-unit.xml @@ -87,16 +87,6 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="unit" level="document" category="symbols" file="phys-dim.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - - --> - <cd:command name="installunitsseparator" level="system" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> @@ -137,4 +127,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-userdata.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-userdata.xml index e9617f0bc18..6c7da128a33 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-userdata.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-userdata.xml @@ -47,7 +47,7 @@ </cd:arguments> </cd:command> - <cd:command name="userdata" type="environment" level="document" category="structure" file="strc-usr.mkiv"> + <cd:command name="userdata" type="environment" level="document" category="structure" keywords="buffer" file="strc-usr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> @@ -78,8 +78,8 @@ </cd:arguments> </cd:command> - <cd:command name="getuserdata" level="style" category="structure" file="strc-usr.mkiv"/> + <cd:command name="getuserdata" level="style" category="structure" keywords="buffer" file="strc-usr.mkiv"/> - <cd:command name="getinlineuserdata" level="style" category="structure" file="strc-usr.mkiv"/> + <cd:command name="getinlineuserdata" level="style" category="structure" keywords="buffer" file="strc-usr.mkiv"/> </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-variables.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-variables.xml index 7c295f9ad58..69aab736ece 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-variables.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-variables.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setvariables" level="style" file="core-env.mkiv"> + <cd:command name="setvariables" level="style" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="setevariables" level="system" file="core-env.mkiv"> + <cd:command name="setevariables" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="setgvariables" level="system" file="core-env.mkiv"> + <cd:command name="setgvariables" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="setxvariables" level="system" file="core-env.mkiv"> + <cd:command name="setxvariables" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -72,7 +72,7 @@ </cd:arguments> </cd:command> - <cd:command name="checkvariables" level="system" file="core-env.mkiv"> + <cd:command name="checkvariables" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -89,7 +89,7 @@ </cd:arguments> </cd:command> - <cd:command name="setvariable" level="style" file="core-env.mkiv"> + <cd:command name="setvariable" level="style" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="setevariable" level="system" file="core-env.mkiv"> + <cd:command name="setevariable" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="setgvariable" level="system" file="core-env.mkiv"> + <cd:command name="setgvariable" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="setxvariable" level="system" file="core-env.mkiv"> + <cd:command name="setxvariable" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -121,21 +121,21 @@ </cd:arguments> </cd:command> - <cd:command name="getvariable" level="style" file="core-env.mkiv"> + <cd:command name="getvariable" level="style" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="showvariable" level="system" file="core-env.mkiv"> + <cd:command name="showvariable" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="doifelsevariable" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifelsevariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -144,7 +144,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvariableelse" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifvariableelse" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -153,7 +153,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvariable" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -161,7 +161,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotvariable" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifnotvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -169,7 +169,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseemptyvariable" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifelseemptyvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -178,7 +178,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvariableelse" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifemptyvariableelse" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -187,7 +187,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvariable" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifemptyvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -195,7 +195,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotemptyvariable" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifnotemptyvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -203,7 +203,7 @@ </cd:arguments> </cd:command> - <cd:command name="getvariabledefault" level="system" file="core-env.mkiv"> + <cd:command name="getvariabledefault" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -211,7 +211,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupenv" level="system" file="core-env.mkiv"> + <cd:command name="setupenv" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="set"> @@ -227,7 +227,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseenv" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifelseenv" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -235,7 +235,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifenvelse" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifenvelse" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -243,74 +243,74 @@ </cd:arguments> </cd:command> - <cd:command name="doifenv" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifenv" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotenv" level="system" category="conditional" file="core-env.mkiv"> + <cd:command name="doifnotenv" level="system" category="strings" keywords="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="env" level="system" file="core-env.mkiv"> + <cd:command name="env" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="envvar" level="system" file="core-env.mkiv"> + <cd:command name="envvar" level="system" category="strings" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="setdocumentfilename" level="system" file="luat-ini.mkiv"> + <cd:command name="setdocumentfilename" category="strings" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setdocumentargument" level="system" file="luat-ini.mkiv"> + <cd:command name="setdocumentargument" category="strings" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setdocumentargumentdefault" level="system" file="luat-ini.mkiv"> + <cd:command name="setdocumentargumentdefault" category="strings" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="getdocumentfilename" level="system" file="luat-ini.mkiv"> + <cd:command name="getdocumentfilename" level="system" category="strings" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="getdocumentargument" level="system" file="luat-ini.mkiv"> + <cd:command name="getdocumentargument" level="system" category="strings" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getdocumentargumentdefault" level="system" file="luat-ini.mkiv"> + <cd:command name="getdocumentargumentdefault" level="system" category="strings" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelsedocumentargument" level="system" category="conditional" file="luat-ini.mkiv"> + <cd:command name="doifelsedocumentargument" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -318,7 +318,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentargumentelse" level="system" category="conditional" file="luat-ini.mkiv"> + <cd:command name="doifdocumentargumentelse" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -326,21 +326,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentargument" level="system" category="conditional" file="luat-ini.mkiv"> + <cd:command name="doifdocumentargument" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotdocumentargument" level="system" category="conditional" file="luat-ini.mkiv"> + <cd:command name="doifnotdocumentargument" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsedocumentfilename" level="system" category="conditional" file="luat-ini.mkiv"> + <cd:command name="doifelsedocumentfilename" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -348,7 +348,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentfilenameelse" level="system" category="conditional" file="luat-ini.mkiv"> + <cd:command name="doifdocumentfilenameelse" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -356,18 +356,18 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentfilename" level="system" category="conditional" file="luat-ini.mkiv"> + <cd:command name="doifdocumentfilename" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotdocumentfilename" level="system" category="conditional" file="luat-ini.mkiv"> + <cd:command name="doifnotdocumentfilename" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml index 830b8bb110d..20f1bb8730a 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml @@ -235,7 +235,7 @@ </cd:arguments> </cd:command> - <cd:command name="typing" type="environment" generated="yes" variant="instance" level="document" category="verbatim" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" generated="yes" variant="instance" level="document" category="verbatim" keywords="buffer" file="buff-ver.mkiv"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -249,7 +249,7 @@ </cd:instances> </cd:command> - <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" level="document" category="verbatim" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" level="document" category="verbatim" keywords="buffer" file="buff-ver.mkiv"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -321,7 +321,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetypingfile" category="verbatim conditional" level="system" file="buff-ver.mkiv"> + <cd:command name="doifelsetypingfile" level="system" category="verbatim" keywords="conditional" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -329,7 +329,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftypingfileelse" category="verbatim conditional" level="system" file="buff-ver.mkiv"> + <cd:command name="doiftypingfileelse" level="system" category="verbatim" keywords="conditional" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -337,107 +337,4 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="typing" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptyping"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="typing" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="continue"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="LUA" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptyping"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="LUA" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:sequence> - <cd:variable value="lua"/> - </cd:sequence> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="continue"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="MP" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptyping"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="MP" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="continue"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="XML" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptyping"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="XML" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="continue"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="PARSEDXML" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptyping"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="PARSEDXML" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="continue"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="TEX" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptyping"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="TEX" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="continue"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - --> - -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-version.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-version.xml index 22a3846d974..643d172153e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-version.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-version.xml @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseolderversion" level="system" category="conditional" file="file-mod.mkvi"> + <cd:command name="doifelseolderversion" level="system" keywords="conditional" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifolderversionelse" level="system" category="conditional" file="file-mod.mkvi"> + <cd:command name="doifolderversionelse" level="system" keywords="conditional" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseoldercontext" level="system" category="conditional" file="file-mod.mkvi"> + <cd:command name="doifelseoldercontext" level="system" keywords="conditional" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -67,7 +67,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifoldercontextelse" level="system" category="conditional" file="file-mod.mkvi"> + <cd:command name="doifoldercontextelse" level="system" keywords="conditional" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -75,4 +75,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-viewerlayer.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-viewerlayer.xml index fde846e4d4d..6b68b7fb9df 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-viewerlayer.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-viewerlayer.xml @@ -65,4 +65,4 @@ <cd:command name="showlayoutcomponents" level="document" category="pdf" file="attr-lay.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-visual.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-visual.xml index 7849ab90b94..6679fd410e8 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-visual.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-visual.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="fakerule" level="system" file="m-visual.mkiv"> + <cd:command name="fakerule" level="system" category="rules" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> @@ -17,7 +17,7 @@ </cd:arguments> </cd:command> - <cd:command name="fakelines" level="document" file="m-visual.mkiv"> + <cd:command name="fakelines" level="document" category="strings" file="m-visual.mkiv"> <cd:arguments> <cd:keywords name="keywords" delimiters="braces"> <cd:constant type="cd:number"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="fakewords" level="document" file="m-visual.mkiv"> + <cd:command name="fakewords" level="document" category="strings" file="m-visual.mkiv"> <cd:arguments> <cd:keywords name="keywords" delimiters="braces"> <cd:constant type="cd:number"/> @@ -43,7 +43,7 @@ </cd:arguments> </cd:command> - <cd:command name="fakenwords" level="system" file="m-visual.mkiv"> + <cd:command name="fakenwords" level="system" category="strings" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:keywords name="keywords" delimiters="braces"> @@ -53,19 +53,19 @@ </cd:arguments> </cd:command> - <cd:command name="showfakewords" level="system" file="m-visual.mkiv"/> + <cd:command name="showfakewords" level="system" category="strings" file="m-visual.mkiv"/> - <cd:command name="fakeword" level="system" file="m-visual.mkiv"/> + <cd:command name="fakeword" level="system" category="strings" file="m-visual.mkiv"/> - <cd:command name="fakeparindent" level="system" file="m-visual.mkiv"/> + <cd:command name="fakeparindent" level="system" category="whitespace" file="m-visual.mkiv"/> - <cd:command name="fakeddroppedcaps" level="system" file="m-visual.mkiv"> + <cd:command name="fakeddroppedcaps" level="system" category="fonts" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="fakefigure" level="document" file="m-visual.mkiv"> + <cd:command name="fakefigure" level="document" category="graphics" keywords="structure" file="m-visual.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="placefloat"/> @@ -78,7 +78,7 @@ </cd:arguments> </cd:command> - <cd:command name="fakeimage" level="document" file="m-visual.mkiv"> + <cd:command name="fakeimage" level="document" category="graphics" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -87,11 +87,11 @@ </cd:arguments> </cd:command> - <cd:command name="fakeformula" level="document" file="m-visual.mkiv"/> + <cd:command name="fakeformula" level="document" category="mathematics" file="m-visual.mkiv"/> - <cd:command name="fakespacingformula" level="document" file="m-visual.mkiv"/> + <cd:command name="fakespacingformula" level="document" category="mathematics" file="m-visual.mkiv"/> - <cd:command name="smashedgrid" level="system" file="m-visual.mkiv"> + <cd:command name="smashedgrid" level="system" category="layout" file="m-visual.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="basegrid"/> @@ -99,17 +99,17 @@ </cd:arguments> </cd:command> - <cd:command name="bodyfontgrid" level="system" file="m-visual.mkiv"/> + <cd:command name="bodyfontgrid" level="system" category="fonts" file="m-visual.mkiv"/> - <cd:command name="emexgrid" level="system" file="m-visual.mkiv"/> + <cd:command name="emexgrid" level="system" category="fonts" file="m-visual.mkiv"/> - <cd:command name="simplethesis" level="system" file="m-visual.mkiv"/> + <cd:command name="simplethesis" level="system" category="layout" file="m-visual.mkiv"/> - <cd:command name="showbaselines" level="system" file="m-visual.mkiv"/> + <cd:command name="showbaselines" level="system" category="layout" file="m-visual.mkiv"/> - <cd:command name="showpagebuilder" level="system" file="m-visual.mkiv"/> + <cd:command name="showpagebuilder" level="system" category="layout" file="m-visual.mkiv"/> - <cd:command name="tagbox" level="system" file="m-visual.mkiv"> + <cd:command name="tagbox" level="system" category="boxes" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:keywords optional="yes"> @@ -131,24 +131,24 @@ </cd:arguments> </cd:command> - <cd:command name="coloredhbox" level="system" file="m-visual.mkiv"> + <cd:command name="coloredhbox" level="system" category="boxes" keywords="colors" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredvbox" level="system" file="m-visual.mkiv"> + <cd:command name="coloredvbox" level="system" category="boxes" keywords="colors" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredvtop" level="system" file="m-visual.mkiv"> + <cd:command name="coloredvtop" level="system" category="boxes" keywords="colors" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredstrut" level="system" file="m-visual.mkiv"/> + <cd:command name="coloredstrut" level="system" category="fonts" file="m-visual.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-visualizer.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-visualizer.xml index 81d02f4fbaf..817cdb38345 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-visualizer.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-visualizer.xml @@ -4,111 +4,111 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="ruledhbox" level="system" file="trac-vis.mkiv"> + <cd:command name="ruledhbox" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvbox" level="system" file="trac-vis.mkiv"> + <cd:command name="ruledvbox" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvtop" level="system" file="trac-vis.mkiv"> + <cd:command name="ruledvtop" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledtopv" level="system" file="trac-vis.mkiv"> + <cd:command name="ruledtopv" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledhpack" level="system" file="trac-vis.mkiv"> + <cd:command name="ruledhpack" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvpack" level="system" file="trac-vis.mkiv"> + <cd:command name="ruledvpack" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledtpack" level="system" file="trac-vis.mkiv"> + <cd:command name="ruledtpack" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledmbox" level="system" file="trac-vis.mkiv"> + <cd:command name="ruledmbox" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxr" level="system" file="trac-vis.mkiv"> + <cd:command name="filledhboxr" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxg" level="system" file="trac-vis.mkiv"> + <cd:command name="filledhboxg" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxb" level="system" file="trac-vis.mkiv"> + <cd:command name="filledhboxb" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxc" level="system" file="trac-vis.mkiv"> + <cd:command name="filledhboxc" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxm" level="system" file="trac-vis.mkiv"> + <cd:command name="filledhboxm" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxy" level="system" file="trac-vis.mkiv"> + <cd:command name="filledhboxy" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxk" level="system" file="trac-vis.mkiv"> + <cd:command name="filledhboxk" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="showmakeup" level="document" file="trc-vis.mkiv"> + <cd:command name="showmakeup" level="document" category="boxes" file="trc-vis.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="makeup" default="yes"/> @@ -142,26 +142,26 @@ </cd:arguments> </cd:command> - <cd:command name="showallmakeup" level="document" file="trc-vis.mkiv"/> + <cd:command name="showallmakeup" level="document" category="boxes" file="trc-vis.mkiv"/> - <cd:command name="showboxes" level="document" file="trc-vis.mkiv"/> + <cd:command name="showboxes" level="document" category="boxes" file="trc-vis.mkiv"/> - <cd:command name="showglyphs" level="document" file="trc-vis.mkiv"/> + <cd:command name="showglyphs" level="document" category="fonts" file="trc-vis.mkiv"/> - <cd:command name="showfontkerns" level="document" file="trc-vis.mkiv"/> + <cd:command name="showfontkerns" level="document" category="fonts" file="trc-vis.mkiv"/> - <cd:command name="showfontitalics" level="document" file="trc-vis.mkiv"/> + <cd:command name="showfontitalics" level="document" category="fonts" file="trc-vis.mkiv"/> - <cd:command name="showglyphdata" level="document" file="trc-vis.mkiv"/> + <cd:command name="showglyphdata" level="document" category="fonts" file="trc-vis.mkiv"/> - <cd:command name="showfontexpansion" level="document" file="trc-vis.mkiv"/> + <cd:command name="showfontexpansion" level="document" category="fonts" file="trc-vis.mkiv"/> - <cd:command name="setvisualizerfont" level="system" file="trc-vis.mkiv"> + <cd:command name="setvisualizerfont" level="system" category="fonts" file="trc-vis.mkiv"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="resetvisualizers" level="system" file="trc-vis.mkiv"/> + <cd:command name="resetvisualizers" level="system" category="fonts" file="trc-vis.mkiv"/> </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml index e79e4e73623..653ae169e6f 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml @@ -106,6 +106,18 @@ </cd:arguments> </cd:command> + <cd:command name="doifoutervmode" level="document" category="whitespace" keywords="conditional" file="spac-ver.mkxl"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="dosomebreak" level="document" category="whitespace" file="spac-ver.mkxl"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command name="godown" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-dimension"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-whitespace.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-whitespace.xml index a44b08f1d9c..c64b44a41a2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-whitespace.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-whitespace.xml @@ -59,6 +59,6 @@ </cd:arguments> </cd:command> - <cd:command name="forgetparskip" category="alignment" level="system" file="spac-ver.mkiv"/> + <cd:command name="forgetparskip" category="alignment" keywords="alignment" level="system" category="whitespace" file="spac-ver.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-xml.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-xml.xml index 1786e1bf60d..5c63416d772 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-xml.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-xml.xml @@ -726,16 +726,7 @@ <cd:command name="xmlregisterns" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:url"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="xmlregisterns" level="style" category="xml" file="lxml-ini.mkiv"> - <cd:arguments> - <cd:resolve name="argument-name"/> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-url"/> </cd:arguments> </cd:command> @@ -827,7 +818,7 @@ <!-- - <cd:command name="xmltoparameters" file="lxml-ini.mkiv"> + <cd:command name="xmltoparameters" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -921,6 +912,10 @@ <cd:constant type="yes"/> <cd:constant type="no"/> </cd:parameter> + <cd:parameter name="entities"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -931,4 +926,10 @@ </cd:arguments> </cd:command> + <cd:command name="xmldepth" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-xtable.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-xtable.xml index 7ee0df3f28f..4e1056cb21e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-xtable.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-xtable.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definextable" level="style" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="definextable" level="style" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupxtable" level="style" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="setupxtable" level="style" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -101,7 +101,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtable" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -109,13 +109,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtable" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="embeddedxtable" type="environment" level="style" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="embeddedxtable" type="environment" level="style" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -123,13 +123,13 @@ </cd:arguments> </cd:command> - <cd:command name="embeddedxtable" type="environment" variant="name" level="style" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="embeddedxtable" type="environment" variant="name" level="style" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtable" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" generated="yes" variant="example" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:sequence> <cd:variable value="xtable"/> </cd:sequence> @@ -140,13 +140,13 @@ </cd:arguments> </cd:command> - <cd:command name="processxtablebuffer" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="processxtablebuffer" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xrow" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xrow" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -157,7 +157,7 @@ <!-- - <cd:command name="xcolumn" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xcolumn" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -168,7 +168,7 @@ --> - <cd:command name="xcolumn" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xcolumn" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -176,13 +176,13 @@ </cd:arguments> </cd:command> - <cd:command name="xcolumn" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xcolumn" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xcell" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xcell" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -203,7 +203,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtablehead" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtablehead" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -211,13 +211,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablehead" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtablehead" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablefoot" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtablefoot" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -225,13 +225,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablefoot" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtablefoot" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablenext" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtablenext" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -239,13 +239,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablenext" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtablenext" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablebody" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtablebody" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -253,13 +253,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablebody" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xtablebody" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xgroup" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -268,7 +268,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrowgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xrowgroup" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -277,7 +277,7 @@ </cd:arguments> </cd:command> - <cd:command name="xcellgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="xcellgroup" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -286,8 +286,8 @@ </cd:arguments> </cd:command> - <cd:command name="currentxtablerow" level="system" category="tables" file="tabl-xtb.mkvi"/> + <cd:command name="currentxtablerow" level="system" category="tables" keywords="background rules" file="tabl-xtb.mkvi"/> - <cd:command name="currentxtablecolumn" level="system" category="tables" file="tabl-xtb.mkvi"/> + <cd:command name="currentxtablecolumn" level="system" category="tables" keywords="background rules" file="tabl-xtb.mkvi"/> </cd:interface> |