diff options
Diffstat (limited to 'tex/context/interface/mkiv')
230 files changed, 14731 insertions, 12304 deletions
diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index e8353dbdc..4cfb3c7fe 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -1,8 +1,587 @@ <?xml version='1.0'?> <!-- 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:arguments> + <cd:keywords delimiters="none"> + <cd:constant type="cd:character"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:character"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="enco-ini.mkiv" level="style" name="definecharacter"> + <cd:arguments> + <cd:keywords delimiters="none"> + <cd:constant type="cd:character"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="enco-ini.mkiv" level="style" name="definecommand"> + <cd:arguments> + <cd:keywords delimiters="none"> + <cd:constant type="cd:character"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:command"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="enco-ini.mkiv" level="style" name="definemathaccent"> + <cd:arguments> + <cd:keywords delimiters="none"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="enco-ini.mkiv" level="style" name="buildmathaccent"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="enco-ini.mkiv" level="style" name="buildtextaccent"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command 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: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: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: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: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: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:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="acute"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="grave"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="ddot"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="tilde"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="bar"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="breve"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="check"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="hat"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="vec"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="dot"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="ring"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="dddot"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> + <cd:interface file="i-align.xml"> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="setupalign"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="broad"/> + <cd:constant type="wide"/> + <cd:constant default="yes" type="bottom"/> + <cd:constant type="height"/> + <cd:constant type="line"/> + <cd:constant type="high"/> + <cd:constant type="low"/> + <cd:constant type="lohi"/> + <cd:constant type="flushright"/> + <cd:constant type="flushleft"/> + <cd:constant type="middle"/> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant default="yes" type="width"/> + <cd:constant type="normal"/> + <cd:constant type="reset"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="flushinner"/> + <cd:constant type="flushouter"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="center"/> + <cd:constant type="disable"/> + <cd:constant type="last"/> + <cd:constant type="end"/> + <cd:constant type="paragraph"/> + <cd:constant type="lefttoright"/> + <cd:constant type="righttoleft"/> + <cd:constant type="l2r"/> + <cd:constant type="r2l"/> + <cd:constant type="table"/> + <cd:constant type="lesshyphenation"/> + <cd:constant type="morehyphenation"/> + <cd:constant type="hanging"/> + <cd:constant type="nothanging"/> + <cd:constant type="hz"/> + <cd:constant type="fullhz"/> + <cd:constant type="nohz"/> + <cd:constant type="hyphenated"/> + <cd:constant type="nothyphenated"/> + <cd:constant type="tolerant"/> + <cd:constant type="verytolerant"/> + <cd:constant type="stretch"/> + <cd:constant type="extremestretch"/> + <cd:constant type="final"/> + <cd:constant type="1*final"/> + <cd:constant type="2*final"/> + <cd:constant type="3*final"/> + <cd:constant type="4*final"/> + <cd:constant type="more"/> + <cd:constant type="1*more"/> + <cd:constant type="2*more"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="usealignparameter"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="alignment" type="environment"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="setupalign"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="linealignment" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="max"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="leftaligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="middlealigned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="rightaligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="maxaligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="midaligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="centeraligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="leftaligned"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="rightaligned"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="middlealigned"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="maxaligned"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="midaligned"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="centeraligned"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="alignedline"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="center"/> + <cd:constant type="max"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="center"/> + <cd:constant type="max"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="wordright"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="right"/> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedbox"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <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:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedspreadbox"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <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:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedboxplus"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <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:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplereversealignedbox"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <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:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplereversealignedboxplus"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <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:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-box.mkiv" level="system" name="alignedbox"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="line"/> + <cd:constant type="l"/> + <cd:constant type="c"/> + <cd:constant type="r"/> + <cd:constant type="m"/> + <cd:constant type="t"/> + <cd:constant type="b"/> + <cd:constant type="g"/> + </cd:keywords> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-box.mkiv" level="system" name="aligned"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="line"/> + <cd:constant type="l"/> + <cd:constant type="c"/> + <cd:constant type="r"/> + <cd:constant type="m"/> + <cd:constant type="t"/> + <cd:constant type="b"/> + <cd:constant type="g"/> + </cd:keywords> + <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" 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"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="notragged"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedleft"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedcenter"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedright"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="veryraggedleft"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="veryraggedcenter"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="veryraggedright"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedwidecenter"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="centeredlastline"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="flushedrightlastline"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="ttraggedright"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="forgetragged"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="line"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="leftline"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="rightline"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="centerline"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ver.mkiv" level="document" name="hanging" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant default="yes" type="left"/> + <cd:constant type="right"/> + </cd:parameter> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ver.mkiv" level="document" name="hanging" type="environment" variant="argument"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant default="yes" type="left"/> + <cd:constant type="right"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="spac-ver.mkiv" level="document" name="fixed" type="environment"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="low"/> + <cd:constant type="middle"/> + <cd:constant type="high"/> + <cd:constant type="lohi"/> + <cd:constant default="yes" type="default"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-anchor.xml"> - <cd:command file="pack-box.mkiv" name="defineanchor"> + <cd:command file="pack-box.mkiv" level="style" name="defineanchor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19,7 +598,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="anchor"> + <cd:command file="pack-box.mkiv" level="document" name="anchor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -36,7 +615,7 @@ </cd:command> </cd:interface> <cd:interface file="i-attachment.xml"> - <cd:command file="scrn-wid.mkvi" name="defineattachment"> + <cd:command file="scrn-wid.mkvi" level="style" name="defineattachment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -49,7 +628,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="setupattachment"> + <cd:command file="scrn-wid.mkvi" level="style" name="setupattachment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -121,9 +700,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="registerattachment"> + <cd:command file="scrn-wid.mkvi" level="style" name="setupattachments"> <cd:arguments> - <cd:keywords> + <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> @@ -131,25 +710,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" name="attachment" variant="example"> - <cd:sequence> - <cd:variable value="attachment"/> - </cd:sequence> + <cd:command file="scrn-wid.mkvi" level="document" name="registerattachment"> <cd:arguments> - <cd:keywords optional="yes"> + <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> - <cd:assignments list="yes" optional="yes"> + <cd:assignments list="yes"> <cd:inherit name="setupattachment"/> </cd:assignments> </cd:arguments> - <cd:instances> - <cd:constant value="attachment"/> - </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" name="attachment" type="environment" variant="example"> + <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" variant="instance"> <cd:sequence> - <cd:variable value="attachment"/> + <cd:instance value="attachment"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -163,18 +736,10 @@ <cd:constant value="attachment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" name="placeattachments"/> - <cd:command file="scrn-wid.mkvi" name="attachment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupattachment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command file="scrn-wid.mkvi" name="attachment" type="environment"> + <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" type="environment" variant="instance"> + <cd:sequence> + <cd:instance value="attachment"/> + </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -183,25 +748,29 @@ <cd:inherit name="setupattachment"/> </cd:assignments> </cd:arguments> + <cd:instances> + <cd:constant value="attachment"/> + </cd:instances> </cd:command> + <cd:command file="scrn-wid.mkvi" level="document" name="placeattachments"/> </cd:interface> <cd:interface file="i-attribute.xml"> - <cd:command file="attr-ini.mkiv" name="pushattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="pushattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="popattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="popattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="installattributestack"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="installattributestack"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="defineattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="defineattribute"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -214,7 +783,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="definesystemattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="definesystemattribute"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -227,12 +796,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="newattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="newattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="dosetattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="dosetattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -242,46 +811,46 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="doresetattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="doresetattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="dogetattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="dogetattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="dogetattributeid"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="dogetattributeid"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="resetallattributes"/> - <cd:command file="attr-ini.mkiv" name="savecurrentattributes"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="resetallattributes"/> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="savecurrentattributes"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="restorecurrentattributes"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="restorecurrentattributes"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="showattributes"/> + <cd:command category="attribute" file="attr-ini.mkiv" level="document" name="showattributes"/> </cd:interface> <cd:interface file="i-backend.xml"> - <cd:command file="back-ini.mkiv" name="setupbackend"> + <cd:command catehory="pdf" file="back-ini.mkiv" level="style" name="setupbackend"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="export"> @@ -295,7 +864,28 @@ <cd:constant type="cd:file"/> </cd:parameter> <cd:parameter name="intent"> - <cd:constant type="cd:name"/> + <cd:constant type="Coated FOGRA39 (ISO 12647-2:2004)"/> + <cd:constant type="GRACoL2006_Coated1v2.icc"/> + <cd:constant type="ISO Coated v2 300% (ECI)"/> + <cd:constant type="ISO Coated v2 (ECI)"/> + <cd:constant type="ISOnewspaper26v4"/> + <cd:constant type="ISOnewspaper26v4_gr"/> + <cd:constant type="ISO Uncoated"/> + <cd:constant type="ISO Uncoated Yellowish"/> + <cd:constant type="ISO Web Coated"/> + <cd:constant type="Japan Color 2001 Coated"/> + <cd:constant type="Japan Color 2002 Newspaper"/> + <cd:constant type="Japan Web Coated (Ad)"/> + <cd:constant type="SNAP 2007"/> + <cd:constant type="SWOP2006_Coated3v2.icc"/> + <cd:constant type="SWOP2006_Coated5v2.icc"/> + <cd:constant type="Uncoated FOGRA29 (ISO 12647-2:2004)"/> + <cd:constant type="Web Coated FOGRA28 (ISO 12647-2:2004)"/> + <cd:constant type="PSR_LWC_PLUS_V2_PT"/> + <cd:constant type="PSR_LWC_STD_V2_PT"/> + <cd:constant type="PSR_SC_PLUS_V2_PT"/> + <cd:constant type="PSR_SC_STD_V2_PT"/> + <cd:constant type="PSRgravureMF"/> </cd:parameter> <cd:parameter name="space"> <cd:constant type="yes"/> @@ -307,7 +897,20 @@ <cd:parameter name="format"> <cd:constant type="version"/> <cd:constant type="default"/> - <cd:constant type="cd:name"/> + <cd:constant type="PDF/X-1a:2001"/> + <cd:constant type="PDF/X-1a:2003"/> + <cd:constant type="PDF/X-3:2002"/> + <cd:constant type="PDF/X-3:2003"/> + <cd:constant type="PDF/X-4"/> + <cd:constant type="PDF/X-4p"/> + <cd:constant type="PDF/X-5g"/> + <cd:constant type="PDF/X-5pg"/> + <cd:constant type="PDF/X-5n"/> + <cd:constant type="PDF/A-1a:2005"/> + <cd:constant type="PDF/A-1b:2005"/> + <cd:constant type="PDF/A-2a"/> + <cd:constant type="PDF/A-3a"/> + <cd:constant type="PDF/UA-1"/> </cd:parameter> <cd:parameter name="level"> <cd:constant type="cd:number"/> @@ -324,7 +927,7 @@ </cd:command> </cd:interface> <cd:interface file="i-background.xml"> - <cd:command file="pack-bck.mkvi" name="definebackground"> + <cd:command category="background" file="pack-bck.mkvi" level="style" name="definebackground"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -337,7 +940,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" name="setupbackground"> + <cd:command category="background" file="pack-bck.mkvi" level="style" name="setupbackground"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -369,7 +972,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" generated="yes" name="background" type="environment" variant="example"> + <cd:command category="background" file="pack-bck.mkvi" generated="yes" level="document" name="background" type="environment" variant="example"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -382,14 +985,14 @@ <cd:constant value="background"/> </cd:instances> </cd:command> - <cd:command file="pack-bck.mkvi" name="background" type="environment"> + <cd:command category="background" file="pack-bck.mkvi" level="document" name="background" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbackground"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" generated="yes" name="background" variant="example"> + <cd:command category="background" file="pack-bck.mkvi" generated="yes" level="document" name="background" variant="example"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -400,12 +1003,12 @@ <cd:constant value="background"/> </cd:instances> </cd:command> - <cd:command file="pack-bck.mkvi" name="background"> + <cd:command category="background" file="pack-bck.mkvi" level="document" name="background"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" name="backgroundline"> + <cd:command category="background colors" file="pack-bck.mkvi" level="document" name="backgroundline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -413,7 +1016,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="setupbackgrounds"> + <cd:command category="background" file="page-bck.mkiv" level="style" name="setupbackgrounds"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="top"/> @@ -434,7 +1037,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="setupbackgrounds" variant="page"> + <cd:command category="background" file="page-bck.mkiv" level="style" name="setupbackgrounds" variant="page"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="paper"/> @@ -453,14 +1056,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="page-bck.mkiv" name="background" type="environment"> + <cd:command begin="push" category="background" end="pop" file="page-bck.mkiv" level="system" name="background" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="doifelsesomebackground"> + <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifelsesomebackground"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -473,7 +1076,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="doifsomebackgroundelse"> + <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifsomebackgroundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -486,7 +1089,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="doifsomebackground"> + <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifsomebackground"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -501,7 +1104,7 @@ </cd:command> </cd:interface> <cd:interface file="i-bar.xml"> - <cd:command file="node-rul.mkiv" name="definebar"> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="definebar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -514,7 +1117,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setupbar"> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="setupbar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -584,9 +1187,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" generated="yes" name="bar" variant="example"> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="setupbars"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupbar"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules" file="node-rul.mkiv" generated="yes" level="document" name="bar" variant="instance"> <cd:sequence> - <cd:variable value="bar"/> + <cd:instance value="bar"/> </cd:sequence> <cd:arguments> <cd:content/> @@ -610,118 +1223,38 @@ <cd:constant value="hiddenbar"/> </cd:instances> </cd:command> - <cd:command file="node-rul.mkiv" name="bar" type="environment"> + <cd:command category="rules" file="node-rul.mkiv" level="document" name="bar" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setbar"> + <cd:command category="rules" file="node-rul.mkiv" level="document" name="setbar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="directsetbar"> + <cd:command category="rules" file="node-rul.mkiv" level="document" name="directsetbar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="node-rul.mkiv" name="bar" type="environment"> + <cd:command begin="push" category="rules" end="pop" file="node-rul.mkiv" level="system" name="bar" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="overbar"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underbar"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="hiddenbar"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="overstrike"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="understrike"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="overbars"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underbars"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="overstrikes"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="understrikes"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underrandom"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underrandoms"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underdash"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underdashes"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underdot"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underdots"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="nobar"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="resetbar"/> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="resetbar"/> </cd:interface> <cd:interface file="i-blackrule.xml"> - <cd:command file="pack-mrl.mkiv" name="setupblackrules"> + <cd:command category="rules colors" file="pack-mrl.mkiv" level="style" name="setupblackrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -764,35 +1297,35 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="blackrule"> + <cd:command category="rules colors" file="pack-mrl.mkiv" level="document" name="blackrule"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="blackrules"> + <cd:command category="rules colors" file="pack-mrl.mkiv" level="document" name="blackrules"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="vl"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="vl"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="hl"> + <cd:command file="pack-mrl.mkiv" level="document" name="hl"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="somekindoftab"> + <cd:command category="rules" file="tabl-mis.mkiv" level="style" name="somekindoftab"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="alternative"> @@ -814,9 +1347,24 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="rules" file="grph-rul.mkiv" level="style" name="frule"> + <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="radius␣" type="cd:dimension"/> + <cd:constant method="none" prefix="line␣" type="cd:dimension"/> + <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:keywords> + <cd:delimiter name="relax"/> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-bleed.xml"> - <cd:command file="pack-box.mkiv" name="setupbleeding"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="setupbleeding"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -859,7 +1407,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="bleed"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="bleed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbleeding"/> @@ -867,11 +1415,11 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="bleedwidth"/> - <cd:command file="pack-box.mkiv" name="bleedheight"/> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="bleedwidth"/> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="bleedheight"/> </cd:interface> <cd:interface file="i-block.xml"> - <cd:command file="strc-blk.mkiv" name="defineblock"> + <cd:command category="structure" file="strc-blk.mkiv" level="style" name="defineblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -884,7 +1432,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="setupblock"> + <cd:command category="structure" file="strc-blk.mkiv" level="style" name="setupblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -909,7 +1457,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="begin" end="end" file="strc-blk.mkiv" generated="yes" name="block" type="environment" variant="example"> + <cd:command begin="begin" category="structure" end="end" file="strc-blk.mkiv" generated="yes" level="document" name="block" type="environment" variant="example"> <cd:sequence> <cd:variable value="block"/> </cd:sequence> @@ -917,39 +1465,37 @@ <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="hideblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="style" name="hideblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="keepblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="style" name="keepblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="useblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="document" name="useblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> @@ -959,14 +1505,13 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="processblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="document" name="processblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> @@ -976,14 +1521,13 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="selectblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="document" name="selectblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> @@ -995,7 +1539,7 @@ </cd:command> </cd:interface> <cd:interface file="i-bookmark.xml"> - <cd:command file="strc-bkm.mkiv" name="setupbookmark"> + <cd:command category="pdf" file="strc-bkm.mkiv" level="style" name="setupbookmark"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="force"> @@ -1035,7 +1579,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-bkm.mkiv" name="bookmark"> + <cd:command category="pdf" file="strc-bkm.mkiv" level="document" name="bookmark"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:section"/> @@ -1046,7 +1590,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="src-bkm.mkiv" name="placebookmarks"> + <cd:command category="pdf" file="src-bkm.mkiv" level="style" name="placebookmarks"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -1063,7 +1607,7 @@ </cd:command> </cd:interface> <cd:interface file="i-boxes.xml"> - <cd:command file="supp-box.mkiv" name="doiftext"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doiftext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1076,7 +1620,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifelsetext"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelsetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1089,7 +1633,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doiftextelse"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doiftextelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1102,7 +1646,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="dowithnextbox"> + <cd:command file="supp-box.mkiv" level="system" name="dowithnextbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1111,21 +1655,21 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="dowithnextboxcs"> + <cd:command 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" name="nextboxwd"/> - <cd:command file="supp-box.mkiv" name="nextboxht"/> - <cd:command file="supp-box.mkiv" name="nextboxdp"/> - <cd:command file="supp-box.mkiv" name="nextboxhtdp"/> - <cd:command file="supp-box.mkiv" name="flushnextbox"/> - <cd:command file="supp-box.mkiv" name="nextbox"/> - <cd:command file="supp-box.mkiv" name="nextdepth"/> - <cd:command file="supp-box.mkiv" name="dowithnextboxcontent"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1137,7 +1681,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="dowithnextboxcontentcs"> + <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcontentcs"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1145,47 +1689,47 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="rlap"> + <cd:command file="supp-box.mkiv" level="system" name="rlap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="llap"> + <cd:command file="supp-box.mkiv" level="system" name="llap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="clap"> + <cd:command file="supp-box.mkiv" level="system" name="clap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="tlap"> + <cd:command file="supp-box.mkiv" level="system" name="tlap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="blap"> + <cd:command file="supp-box.mkiv" level="system" name="blap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="reshapebox"> + <cd:command 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" name="shapebox" type="environment"/> - <cd:command file="supp-box.mkiv" name="flushshapebox"/> - <cd:command file="supp-box.mkiv" name="innerflushshapebox"/> - <cd:command file="supp-box.mkiv" name="shapedhbox"> + <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:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="processtokens"> + <cd:command file="supp-box.mkiv" level="system" name="processtokens"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1204,7 +1748,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doboundtext"> + <cd:command file="supp-box.mkiv" level="system" name="doboundtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1217,7 +1761,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="limitatetext"> + <cd:command file="supp-box.mkiv" level="system" name="limitatetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1230,7 +1774,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="limitatetext" variant="list"> + <cd:command file="supp-box.mkiv" level="system" name="limitatetext" variant="list"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1243,7 +1787,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="limtatefirstline"> + <cd:command file="supp-box.mkiv" level="system" name="limitatefirstline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1256,7 +1800,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="processisolatedchars"> + <cd:command file="supp-box.mkiv" level="system" name="processisolatedchars"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1264,7 +1808,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="processisolatedwords"> + <cd:command file="supp-box.mkiv" level="system" name="processisolatedwords"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1272,7 +1816,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytocharacters"> + <cd:command file="supp-box.mkiv" level="system" name="applytocharacters"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1280,7 +1824,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytowords"> + <cd:command file="supp-box.mkiv" level="system" name="applytowords"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1288,7 +1832,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringchar"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringchar"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1296,7 +1840,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringword"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringword"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1304,7 +1848,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringline"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringline"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1312,7 +1856,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringcharspaced"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringcharspaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1320,7 +1864,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringwordspaced"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringwordspaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1328,7 +1872,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringlinespaced"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringlinespaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1336,27 +1880,27 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="sbox"> + <cd:command file="supp-box.mkiv" level="system" name="sbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="inlinedbox"> + <cd:command file="supp-box.mkiv" level="system" name="inlinedbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="struttedbox"> + <cd:command file="supp-box.mkiv" level="system" name="struttedbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="topskippedbox"> + <cd:command file="supp-box.mkiv" level="system" name="topskippedbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="centeredbox"> + <cd:command file="supp-box.mkiv" level="system" name="centeredbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1364,7 +1908,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="centerednextbox"> + <cd:command file="supp-box.mkiv" level="system" name="centerednextbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1372,7 +1916,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="centerbox"> + <cd:command file="supp-box.mkiv" level="system" name="centerbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1380,7 +1924,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setrigidcolumnhsize"> + <cd:command file="supp-box.mkiv" level="system" name="setrigidcolumnhsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -1393,7 +1937,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setrigidcolumnbalance"> + <cd:command file="supp-box.mkiv" level="system" name="setrigidcolumnbalance"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1401,11 +1945,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vboxtohbox" type="environment"/> - <cd:command file="supp-box.mkiv" name="vboxtohboxseparator" type="environment"/> - <cd:command file="supp-box.mkiv" name="convertvboxtohbox"/> - <cd:command file="supp-box.mkiv" name="hboxestohbox" type="environment"/> - <cd:command file="supp-box.mkiv" name="unhhbox"> + <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:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1417,7 +1961,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hboxofvbox"> + <cd:command file="supp-box.mkiv" level="system" name="hboxofvbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1425,7 +1969,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifcontent"> + <cd:command file="supp-box.mkiv" level="system" name="doifcontent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1440,8 +1984,8 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="overlay" type="environment"/> - <cd:command file="supp-box.mkiv" name="fakebox"> + <cd:command file="supp-box.mkiv" level="system" name="overlay" type="environment"/> + <cd:command file="supp-box.mkiv" level="system" name="fakebox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1449,7 +1993,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lbox"> + <cd:command file="supp-box.mkiv" level="system" name="lbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1457,7 +2001,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="cbox"> + <cd:command file="supp-box.mkiv" level="system" name="cbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1465,7 +2009,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="rbox"> + <cd:command file="supp-box.mkiv" level="system" name="rbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1473,7 +2017,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="ltop"> + <cd:command file="supp-box.mkiv" level="system" name="ltop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1481,7 +2025,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="ctop"> + <cd:command file="supp-box.mkiv" level="system" name="ctop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1489,7 +2033,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="rtop"> + <cd:command file="supp-box.mkiv" level="system" name="rtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1497,47 +2041,47 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="tbox"> + <cd:command file="supp-box.mkiv" level="system" name="tbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="bbox"> + <cd:command file="supp-box.mkiv" level="system" name="bbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lhbox"> + <cd:command file="supp-box.mkiv" level="system" name="lhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="mhbox"> + <cd:command file="supp-box.mkiv" level="system" name="mhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="rhbox"> + <cd:command file="supp-box.mkiv" level="system" name="rhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lefthbox"> + <cd:command file="supp-box.mkiv" level="system" name="lefthbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="midhbox"> + <cd:command file="supp-box.mkiv" level="system" name="midhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="righthbox"> + <cd:command file="supp-box.mkiv" level="system" name="righthbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="boxofsize"> + <cd:command file="supp-box.mkiv" level="system" name="boxofsize"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none" list="yes" optional="yes"> @@ -1546,7 +2090,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="limitatelines"> + <cd:command file="supp-box.mkiv" level="system" name="limitatelines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -1559,98 +2103,98 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="fittopbaselinegrid"> + <cd:command file="supp-box.mkiv" level="system" name="fittopbaselinegrid"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="boxcursor"/> - <cd:command file="supp-box.mkiv" name="placedbox"> + <cd:command file="supp-box.mkiv" level="system" name="boxcursor"/> + <cd:command file="supp-box.mkiv" level="system" name="placedbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="rightbox"> + <cd:command file="supp-box.mkiv" level="system" name="rightbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="leftbox"> + <cd:command file="supp-box.mkiv" level="system" name="leftbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="topbox"> + <cd:command file="supp-box.mkiv" level="system" name="topbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="bottombox"> + <cd:command file="supp-box.mkiv" level="system" name="bottombox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lefttopbox"> + <cd:command file="supp-box.mkiv" level="system" name="lefttopbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="righttopbox"> + <cd:command file="supp-box.mkiv" level="system" name="righttopbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="leftbottombox"> + <cd:command file="supp-box.mkiv" level="system" name="leftbottombox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="rightbottombox"> + <cd:command file="supp-box.mkiv" level="system" name="rightbottombox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="topleftbox"> + <cd:command file="supp-box.mkiv" level="system" name="topleftbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="toprightbox"> + <cd:command file="supp-box.mkiv" level="system" name="toprightbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="bottomleftbox"> + <cd:command file="supp-box.mkiv" level="system" name="bottomleftbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="bottomrightbox"> + <cd:command file="supp-box.mkiv" level="system" name="bottomrightbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="middlebox"> + <cd:command file="supp-box.mkiv" level="system" name="middlebox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="baselinemiddlebox"> + <cd:command file="supp-box.mkiv" level="system" name="baselinemiddlebox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="baselineleftbox"> + <cd:command file="supp-box.mkiv" level="system" name="baselineleftbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="baselinerightbox"> + <cd:command file="supp-box.mkiv" level="system" name="baselinerightbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lrtbbox"> + <cd:command file="supp-box.mkiv" level="system" name="lrtbbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -1667,12 +2211,12 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="toplinebox"> + <cd:command file="supp-box.mkiv" level="system" name="toplinebox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setstackbox"> + <cd:command file="supp-box.mkiv" level="system" name="setstackbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1683,14 +2227,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="initializeboxstack"> + <cd:command 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" name="savebox"> + <cd:command file="supp-box.mkiv" level="system" name="savebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1701,7 +2245,17 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="restorebox"> + <cd:command file="supp-box.mkiv" level="system" name="flushbox"> + <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 file="supp-box.mkiv" level="system" name="restorebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1711,7 +2265,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="foundbox"> + <cd:command file="supp-box.mkiv" level="system" name="foundbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1721,7 +2275,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifelsebox"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelsebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1737,7 +2291,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifboxelse"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifboxelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1753,7 +2307,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="localpushbox"> + <cd:command file="supp-box.mkiv" level="system" name="localpushbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1761,7 +2315,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="localpopbox"> + <cd:command file="supp-box.mkiv" level="system" name="localpopbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1769,7 +2323,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="globalpushbox"> + <cd:command file="supp-box.mkiv" level="system" name="globalpushbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1777,7 +2331,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="globalpopbox"> + <cd:command file="supp-box.mkiv" level="system" name="globalpopbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1785,16 +2339,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="removedepth"/> - <cd:command file="supp-box.mkiv" name="obeydepth"/> - <cd:command file="supp-box.mkiv" name="undepthed"> + <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:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="removebottomthings"/> - <cd:command file="supp-box.mkiv" name="removelastskip"/> - <cd:command file="supp-box.mkiv" name="makestrutofbox"> + <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:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1802,7 +2356,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="raisebox"> + <cd:command file="supp-box.mkiv" level="system" name="raisebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -1811,7 +2365,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lowerbox"> + <cd:command file="supp-box.mkiv" level="system" name="lowerbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -1820,17 +2374,17 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="halfwaybox"> + <cd:command file="supp-box.mkiv" level="system" name="halfwaybox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="depthonlybox"> + <cd:command file="supp-box.mkiv" level="system" name="depthonlybox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalhbox"> + <cd:command file="supp-box.mkiv" level="system" name="naturalhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1838,7 +2392,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalvbox"> + <cd:command file="supp-box.mkiv" level="system" name="naturalvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1846,7 +2400,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalvtop"> + <cd:command file="supp-box.mkiv" level="system" name="naturalvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1854,7 +2408,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalvcenter"> + <cd:command file="supp-box.mkiv" level="system" name="naturalvcenter"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1862,7 +2416,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalhpack"> + <cd:command file="supp-box.mkiv" level="system" name="naturalhpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1870,7 +2424,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalvpack"> + <cd:command file="supp-box.mkiv" level="system" name="naturalvpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1878,12 +2432,12 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="frozenhbox"> + <cd:command file="supp-box.mkiv" level="system" name="frozenhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setboxllx"> + <cd:command file="supp-box.mkiv" level="system" name="setboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1894,7 +2448,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setboxlly"> + <cd:command file="supp-box.mkiv" level="system" name="setboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1905,7 +2459,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="gsetboxllx"> + <cd:command file="supp-box.mkiv" level="system" name="gsetboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1916,7 +2470,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="gsetboxlly"> + <cd:command file="supp-box.mkiv" level="system" name="gsetboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1927,7 +2481,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="getboxllx"> + <cd:command file="supp-box.mkiv" level="system" name="getboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1935,7 +2489,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="getboxlly"> + <cd:command file="supp-box.mkiv" level="system" name="getboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1943,7 +2497,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="directgetboxllx"> + <cd:command file="supp-box.mkiv" level="system" name="directgetboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1951,7 +2505,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="directgetboxlly"> + <cd:command file="supp-box.mkiv" level="system" name="directgetboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1959,13 +2513,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="shownextbox"> + <cd:command file="supp-box.mkiv" level="system" name="shownextbox"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="spreadhbox"> + <cd:command file="supp-box.mkiv" level="system" name="spreadhbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1973,7 +2527,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="minimalhbox"> + <cd:command file="supp-box.mkiv" level="system" name="minimalhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1981,13 +2535,13 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="nodetostring"> + <cd:command file="supp-box.mkiv" level="system" name="nodetostring"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="getnaturaldimensions"> + <cd:command file="supp-box.mkiv" level="system" name="getnaturaldimensions"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1995,10 +2549,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lastnaturalboxwd"/> - <cd:command file="supp-box.mkiv" name="lastnaturalboxht"/> - <cd:command file="supp-box.mkiv" name="lastnaturalboxdp"/> - <cd:command file="supp-box.mkiv" name="naturalwd"> + <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:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2006,7 +2560,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifelserighttoleftinbox"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelserighttoleftinbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2020,7 +2574,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifrighttoleftinboxelse"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifrighttoleftinboxelse"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2034,15 +2588,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="runninghbox"> + <cd:command 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" name="vbox" type="environment"/> - <cd:command begin="begin" end="end" file="supp-box.mkiv" name="hbox" type="environment"/> - <cd:command begin="begin" end="end" file="supp-box.mkiv" name="vtop" type="environment"/> - <cd:command file="supp-box.mkiv" name="setvboxregister"> + <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:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2051,7 +2605,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="sethboxregister"> + <cd:command file="supp-box.mkiv" level="system" name="sethboxregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2060,7 +2614,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setvtopregister"> + <cd:command file="supp-box.mkiv" level="system" name="setvtopregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2069,7 +2623,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="flushboxregister"> + <cd:command file="supp-box.mkiv" level="system" name="flushboxregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2077,7 +2631,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vboxregister" type="environment"> + <cd:command file="supp-box.mkiv" level="system" name="vboxregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2085,7 +2639,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hboxregister" type="environment"> + <cd:command file="supp-box.mkiv" level="system" name="hboxregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2093,7 +2647,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vtopregister" type="environment"> + <cd:command file="supp-box.mkiv" level="system" name="vtopregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2101,7 +2655,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="righttolefthbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttolefthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2109,7 +2663,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="lefttorighthbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2117,7 +2671,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="righttoleftvbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2125,7 +2679,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="lefttorightvbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2133,7 +2687,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="righttoleftvtop"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2141,7 +2695,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="lefttorightvtop"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2149,7 +2703,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="autodirhbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2157,7 +2711,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="autodirvbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2165,7 +2719,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="autodirvtop"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2173,7 +2727,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="leftorrighthbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2181,7 +2735,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="leftorrightvbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2189,7 +2743,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="leftorrightvtop"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2197,17 +2751,17 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="ibox"> + <cd:command file="spac-ali.mkiv" level="system" name="ibox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="obox"> + <cd:command file="spac-ali.mkiv" level="system" name="obox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="definehbox"> + <cd:command file="spac-ali.mkiv" level="system" name="definehbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2217,7 +2771,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" generated="yes" name="hbox" variant="example"> + <cd:command file="spac-ali.mkiv" generated="yes" level="system" name="hbox" variant="example"> <cd:sequence> <cd:string value="hbox"/> <cd:variable value="box"/> @@ -2226,10 +2780,114 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lastlinewidth"/> + <cd:command file="supp-box.mkiv" level="system" name="lastlinewidth"/> + <cd:command file="supp-box.mkiv" level="system" name="putboxincache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:csname"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="getboxfromcache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:csname"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelseboxincache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </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 file="supp-box.mkiv" level="system" name="copyboxfromcache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:csname"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="directboxfromcache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="directcopyboxfromcache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command 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:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-buffer.xml"> - <cd:command file="buff-ini.mkiv" name="doifelsebuffer"> + <cd:command category="buffer conditional" file="buff-ini.mkiv" level="system" name="doifelsebuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -2242,7 +2900,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="doifbufferelse"> + <cd:command category="buffer conditional" file="buff-ini.mkiv" level="system" name="doifbufferelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -2255,21 +2913,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="resetbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="system" name="resetbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="buffer" type="environment"> + <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="buffer" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="grabbufferdata"> + <cd:command category="buffer" file="buff-ini.mkiv" level="system" name="grabbufferdata"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:category"/> @@ -2285,7 +2943,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="grabbufferdatadirect"> + <cd:command category="buffer" file="buff-ini.mkiv" level="system" name="grabbufferdatadirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2298,14 +2956,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="set" end="end" file="buff-ini.mkiv" name="buffer" type="environment"> + <cd:command begin="set" category="buffer" end="end" file="buff-ini.mkiv" level="system" name="buffer" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="setupbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="setupbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> @@ -2320,7 +2978,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="definebuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="definebuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2333,43 +2991,42 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="getbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="getbuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="getdefinedbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="system" name="getdefinedbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="inlinebuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="inlinebuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" generated="yes" name="buffer" type="environment" variant="example"> + <cd:command evel="document" file="buff-ini.mkiv" generated="yes" lcategory="buffer" name="buffer" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> <cd:instances> <cd:constant value="hiding"/> </cd:instances> </cd:command> - <cd:command file="buff-ini.mkiv" generated="yes" name="getbuffer" variant="example"> + <cd:command category="buffer" file="buff-ini.mkiv" generated="yes" level="document" name="getbuffer" variant="instance"> <cd:sequence> <cd:string value="get"/> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> </cd:command> - <cd:command file="buff-ini.mkiv" name="hiding" type="environment"/> - <cd:command file="buff-ini.mkiv" name="processtexbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="processtexbuffer"> <cd:sequence> <cd:string value="processTEXbuffer"/> </cd:sequence> @@ -2379,7 +3036,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="savebuffer" variant="list"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="savebuffer" variant="list"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:buffer"/> @@ -2389,7 +3046,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="savebuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="savebuffer"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="list"> @@ -2405,28 +3062,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="ctxluabuffer"> + <cd:command category="buffer lua" file="buff-ini.mkiv" level="style" name="ctxluabuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="mkvibuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="mkvibuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="getbufferdata"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="getbufferdata"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typebuffer"> + <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="document" name="typebuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> @@ -2436,10 +3093,10 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="typebuffer" variant="example"> + <cd:command category="buffer verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typebuffer" variant="instance"> <cd:sequence> <cd:string value="type"/> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -2447,7 +3104,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typedefinedbuffer"> + <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="system" name="typedefinedbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:buffer"/> @@ -2457,9 +3114,55 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="buffer verbatim" file="lxml-ini.mkiv" level="style" name="prettyprintbuffer"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:buffer"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="buffer verbatim" file="lxml-ini.mkiv" level="style" name="inlineprettyprintbuffer"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:buffer"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="style" name="typeinlinebuffer"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:buffer"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptype"/> + </cd:assignments> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-button.xml"> - <cd:command file="scrn-but.mkvi" name="definebutton"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="definebutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2472,7 +3175,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="setupbutton"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="setupbutton"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -2507,7 +3210,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" generated="yes" name="button" variant="example"> + <cd:command catehory="pdf" file="scrn-but.mkvi" generated="yes" level="document" name="button" variant="example"> <cd:sequence> <cd:variable value="button"/> </cd:sequence> @@ -2526,7 +3229,7 @@ <cd:constant value="button"/> </cd:instances> </cd:command> - <cd:command file="scrn-but.mkvi" name="button"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="document" name="button"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbutton"/> @@ -2539,28 +3242,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="overlaybutton"> + <cd:command catehory="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 file="scrn-but.mkvi" name="overlaybutton" variant="direct"> + <cd:command catehory="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 file="scrn-but.mkvi" name="MPmenubuttons"> + <cd:command catehory="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 file="scrn-fld.mkvi" name="overlayrollbutton"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="overlayrollbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -2570,7 +3273,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definepushbutton"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="definepushbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2580,7 +3283,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="pushbutton"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="pushbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2590,7 +3293,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definepushsymbol"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="definepushsymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2602,7 +3305,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="rollbutton" variant="interactionmenu"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="interactionmenu"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -2618,7 +3321,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="rollbutton" variant="button"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="button"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -2633,7 +3336,7 @@ </cd:command> </cd:interface> <cd:interface file="i-capitals.xml"> - <cd:command file="typo-cap.mkiv" name="definecapitals"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="definecapitals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2646,7 +3349,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="setupcapitals"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="setupcapitals"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -2667,7 +3370,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="setcharactercasing"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="setcharactercasing"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -2686,211 +3389,211 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="WORD"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="WORD"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="word"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="word"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="Word"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="Word"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="Words"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="Words"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="camel"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="camel"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="WORDS"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="WORDS"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="words"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="words"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="pseudosmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="pseudosmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="pseudoSmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="pseudoSmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="pseudoSmallCapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="pseudoSmallCapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="pseudoMixedCapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="pseudoMixedCapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="realsmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="realsmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="realSmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="realSmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="realSmallCapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="realSmallCapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="notsmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="notsmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="smallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="smallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="Smallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="Smallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="SmallCapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="SmallCapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="autocap"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="autocap"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="mixedcaps"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="mixedcaps"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="kap"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="kap"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="Caps"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="Caps"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="uppercased"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="uppercased"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="lowercased"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="lowercased"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="randomizetext"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="randomizetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="randomized" type="environment"/> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="randomized" type="environment"/> </cd:interface> <cd:interface file="i-catcodes.xml"> - <cd:command file="catc-ctx.mkiv" name="texcode" type="environment"/> - <cd:command file="catc-ctx.mkiv" name="contextcode" type="environment"/> - <cd:command file="catc-ctx.mkiv" name="contextdefinitioncode" type="environment"/> - <cd:command begin="un" end="" file="catc-def.mkiv" name="protect" type="environment"/> - <cd:command file="catc-ini.mkiv" name="newcatcodetable"> + <cd:command category="catcode" file="catc-ctx.mkiv" 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"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="newcatcodetable"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="catcodetable" type="environment"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="catcodetable" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="extendedcatcodetable" type="environment"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="extendedcatcodetable" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" name="installactivecharacter"> + <cd:command category="catcode" file="catc-act.mkiv" level="system" name="installactivecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" name="defineactivecharacter"> + <cd:command category="catcode" file="catc-act.mkiv" level="system" name="defineactivecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -2900,7 +3603,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" name="installanddefineactivecharacter"> + <cd:command category="catcode" file="catc-act.mkiv" level="system" name="installanddefineactivecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -2910,16 +3613,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" name="makecharacteractive"> + <cd:command category="catcode" file="catc-act.mkiv" level="system" name="makecharacteractive"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="permitcircumflexescape"/> - <cd:command file="catc-ini.mkiv" name="permitcaretescape"/> - <cd:command file="catc-ini.mkiv" name="letcatcodecommand"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="permitcircumflexescape"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="permitcaretescape"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="letcatcodecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -2929,7 +3632,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="defcatcodecommand"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="defcatcodecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -2941,7 +3644,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="uedcatcodecommand"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="uedcatcodecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -2953,21 +3656,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="catc-ini.mkiv" name="catcodetable" type="environment"/> - <cd:command file="catc-ini.mkiv" name="restorecatcodes"/> - <cd:command file="catc-ini.mkiv" name="setcatcodetable"> + <cd:command begin="push" category="catcode" end="pop" file="catc-ini.mkiv" level="system" name="catcodetable" type="environment"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="restorecatcodes"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="setcatcodetable"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="tracecatcodetables"/> - <cd:command file="catc-ini.mkiv" name="catcodetablename"/> - <cd:command file="catc-sym.mkiv" name="rescan"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="tracecatcodetables"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="catcodetablename"/> + <cd:command category="catcode" file="catc-sym.mkiv" level="system" name="rescan"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="catc-sym.mkiv" name="rescanwithsetup"> + <cd:command category="catcode" file="catc-sym.mkiv" level="system" name="rescanwithsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2977,46 +3680,50 @@ </cd:command> </cd:interface> <cd:interface file="i-character.xml"> - <cd:command file="catc-sym.mkiv" name="letteropenbrace"/> - <cd:command file="catc-sym.mkiv" name="letterclosebrace"/> - <cd:command file="catc-sym.mkiv" name="letterampersand"/> - <cd:command file="catc-sym.mkiv" name="letterless"/> - <cd:command file="catc-sym.mkiv" name="lettermore"/> - <cd:command file="catc-sym.mkiv" name="letterhash"/> - <cd:command file="catc-sym.mkiv" name="letterdoublequote"/> - <cd:command file="catc-sym.mkiv" name="lettersinglequote"/> - <cd:command file="catc-sym.mkiv" name="letterdollar"/> - <cd:command file="catc-sym.mkiv" name="letterpercent"/> - <cd:command file="catc-sym.mkiv" name="letterhat"/> - <cd:command file="catc-sym.mkiv" name="letterunderscore"/> - <cd:command file="catc-sym.mkiv" name="letterbar"/> - <cd:command file="catc-sym.mkiv" name="lettertilde"/> - <cd:command file="catc-sym.mkiv" name="letterbackslash"/> - <cd:command file="catc-sym.mkiv" name="letterslash"/> - <cd:command file="catc-sym.mkiv" name="letterquestionmark"/> - <cd:command file="catc-sym.mkiv" name="letterat"/> - <cd:command file="catc-sym.mkiv" name="lettercolon"/> - <cd:command file="catc-sym.mkiv" name="letterescape"/> - <cd:command file="catc-sym.mkiv" name="letterbgroup"/> - <cd:command file="catc-sym.mkiv" name="letteregroup"/> - <cd:command file="catc-sym.mkiv" name="letterleftbrace"/> - <cd:command file="catc-sym.mkiv" name="letterrightbrace"/> - <cd:command file="catc-sym.mkiv" name="letterexclamationmark"/> - <cd:command file="char-ini.mkiv" name="utfchar"> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letteropenbrace"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterclosebrace"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterampersand"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterless"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="lettermore"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterhash"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterdoublequote"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="lettersinglequote"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterdollar"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterpercent"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterhat"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterunderscore"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterbar"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="lettertilde"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterbackslash"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterslash"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterquestionmark"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterat"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="lettercolon"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterleftparenthesis"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterrightparenthesis"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterleftbracket"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterrightbracket"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterescape"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterbgroup"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letteregroup"/> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="char-ini.mkiv" name="safechar"> + <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="safechar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="char-ini.mkiv" name="checkedchar"> + <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="checkedchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3026,47 +3733,47 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="char-ini.mkiv" name="textormathchar"> + <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="textormathchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="char-ini.mkiv" name="chardescription"> + <cd:command category="characters" file="char-ini.mkiv" level="style" name="chardescription"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="percent"/> - <cd:command file="enco-ini.mkiv" name="procent"/> - <cd:command file="enco-ini.mkiv" name="ampersand"/> - <cd:command file="enco-ini.mkiv" name="dollar"/> - <cd:command file="enco-ini.mkiv" name="hash"/> - <cd:command file="enco-ini.mkiv" name="hyphen"/> - <cd:command file="enco-ini.mkiv" name="lowerleftsingleninequote"/> - <cd:command file="enco-ini.mkiv" name="lowerleftdoubleninequote"/> - <cd:command file="enco-ini.mkiv" name="lowerrightsingleninequote"/> - <cd:command file="enco-ini.mkiv" name="lowerrightdoubleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperleftsingleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperleftdoubleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperrightsingleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperrightdoubleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperleftsinglesixquote"/> - <cd:command file="enco-ini.mkiv" name="upperleftdoublesixquote"/> - <cd:command file="enco-ini.mkiv" name="upperrightsinglesixquote"/> - <cd:command file="enco-ini.mkiv" name="upperrightdoublesixquote"/> - <cd:command file="enco-ini.mkiv" name="leftsubguillemot"/> - <cd:command file="enco-ini.mkiv" name="rightsubguillemot"/> - <cd:command file="enco-ini.mkiv" name="textcontrolspace"/> - <cd:command file="enco-ini.mkiv" name="textvisiblespace"/> - <cd:command file="enco-ini.mkiv" name="textminus"/> - <cd:command file="enco-ini.mkiv" name="textplus"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="percent"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="procent"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="ampersand"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="dollar"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="hash"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="hyphen"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="lowerleftsingleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="lowerleftdoubleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="lowerrightsingleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="lowerrightdoubleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperleftsingleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperleftdoubleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperrightsingleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperrightdoubleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperleftsinglesixquote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperleftdoublesixquote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperrightsinglesixquote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperrightdoublesixquote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="leftsubguillemot"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="rightsubguillemot"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="textcontrolspace"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="textvisiblespace"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="textminus"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="textplus"/> </cd:interface> <cd:interface file="i-characteralign.xml"> - <cd:command file="typo-tal.mkiv" name="singalcharacteralign"> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="singalcharacteralign"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3076,7 +3783,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" name="setcharacteralign"> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setcharacteralign"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3088,9 +3795,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" name="resetcharacteralign"/> - <cd:command file="typo-tal.mkiv" name="alignmentcharacter"/> - <cd:command file="typo-tal.mkiv" name="characteralign" type="environment"> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="resetcharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="alignmentcharacter"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="characteralign" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -3099,21 +3806,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" name="checkcharacteralign"> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="checkcharacteralign"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-characterspacing.xml"> - <cd:command file="typo-spa.mkiv" name="definecharacterspacing"> + <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="definecharacterspacing"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-spa.mkiv" name="setupcharacterspacing"> + <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="setupcharacterspacing"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3135,7 +3842,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-spa.mkiv" name="setcharacterspacing"> + <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="setcharacterspacing"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -3143,10 +3850,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-spa.mkiv" name="resetcharacterspacing"/> + <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="resetcharacterspacing"/> </cd:interface> <cd:interface file="i-characterstripping.xml"> - <cd:command file="typo-rep.mkiv" name="setcharacterstripping"> + <cd:command category="language" file="typo-rep.mkiv" level="style" name="setcharacterstripping"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -3154,13 +3861,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-rep.mkiv" name="resetcharacterstripping"/> - <cd:command file="typo-rep.mkiv" name="forcecharacterstripping"/> + <cd:command category="language" file="typo-rep.mkiv" level="style" name="resetcharacterstripping"/> + <cd:command category="language" file="typo-rep.mkiv" level="style" name="forcecharacterstripping"/> </cd:interface> <cd:interface file="i-charwidth.xml"> - <cd:command file="typo-lan.mkiv" name="charwidthlanguage"/> - <cd:command file="typo-lan.mkiv" name="averagecharwidth"/> - <cd:command file="typo-lan.mkiv" name="languagecharwidth"> + <cd:command category="language" file="typo-lan.mkiv" level="style" name="charwidthlanguage"/> + <cd:command category="language" file="typo-lan.mkiv" level="style" name="averagecharwidth"/> + <cd:command category="language" file="typo-lan.mkiv" level="style" name="languagecharwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -3169,12 +3876,12 @@ </cd:command> </cd:interface> <cd:interface file="i-chemical.xml"> - <cd:command file="chem-ini.mkiv" name="molecule"> + <cd:command file="chem-ini.mkiv" level="document" name="molecule"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="chem-ini.mkiv" name="chem"> + <cd:command file="chem-ini.mkiv" level="document" name="chem"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -3187,14 +3894,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="setupchemical"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="setupchemical"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="strut"> - <cd:inherit name="value-strut"/> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="auto"/> + <cd:constant type="cap"/> + <cd:constant type="fit"/> + <cd:constant type="line"/> + <cd:constant type="default"/> + <cd:constant type="cd:character"/> </cd:parameter> <cd:parameter name="width"> <cd:constant default="yes" type="fit"/> @@ -3283,7 +3997,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="setupchemicalframed"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="setupchemicalframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3293,7 +4007,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="definechemical"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="definechemical"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3301,7 +4015,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="definechemicalsymbol"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="definechemicalsymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3311,21 +4025,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicalsymbol"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicalsymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicaltext"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicaltext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemical" type="environment"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemical" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -3335,7 +4049,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemical"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemical"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -3348,28 +4062,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicaltoptext"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicaltoptext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicalbottext"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicalbottext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicalmidtext"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicalmidtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="definechemicals"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="definechemicals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3384,9 +4098,9 @@ </cd:command> </cd:interface> <cd:interface file="i-cleaning.xml"> - <cd:command begin="push" end="pop" file="typo-chr.mkiv" name="punctuation" type="environment"/> - <cd:command file="typo-chr.mkiv" name="removepunctuation"/> - <cd:command file="typo-chr.mkiv" name="markcontent"> + <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:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -3396,7 +4110,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-chr.mkiv" name="markedcontent" type="environment"> + <cd:command file="typo-chr.mkiv" level="system" name="markedcontent" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -3405,14 +4119,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-chr.mkiv" name="removemarkedcontent"> + <cd:command 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" name="setcharactercleaning"> + <cd:command file="typo-cln.mkiv" level="system" name="setcharactercleaning"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -3422,7 +4136,7 @@ </cd:command> </cd:interface> <cd:interface file="i-clipping.xml"> - <cd:command file="grph-trf.mkiv" name="setupclipping"> + <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="setupclipping"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -3483,7 +4197,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="clip"> + <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="clip"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupclipping"/> @@ -3493,7 +4207,7 @@ </cd:command> </cd:interface> <cd:interface file="i-collector.xml"> - <cd:command file="pack-box.mkiv" name="definecollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="definecollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3506,7 +4220,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setupcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="setupcollector"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3560,7 +4274,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="setcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3571,28 +4285,28 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="resetcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="resetcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="flushcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="flushcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="composedcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="composedcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="adaptcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="adaptcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3602,7 +4316,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="collectedtext"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="collectedtext"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcollector"/> @@ -3625,7 +4339,7 @@ </cd:command> </cd:interface> <cd:interface file="i-color.xml"> - <cd:command file="colo-ext.mkiv" name="negatecolorbox"> + <cd:command category="colors" file="colo-ext.mkiv" level="system" name="negatecolorbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -3633,7 +4347,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ext.mkiv" name="colorintent" type="environment"> + <cd:command category="colors" file="colo-ext.mkiv" level="document" name="colorintent" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="knockout"/> @@ -3642,10 +4356,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ext.mkiv" name="overprint" type="environment"/> - <cd:command file="colo-ext.mkiv" name="knockout" type="environment"/> - <cd:command file="colo-ext.mkiv" name="textcolorintent" type="environment"/> - <cd:command file="colo-grp.mkiv" name="definecolorgroup"> + <cd:command category="colors" file="colo-ext.mkiv" level="document" name="overprint" type="environment"/> + <cd:command category="colors" file="colo-ext.mkiv" level="document" name="knockout" type="environment"/> + <cd:command category="colors" file="colo-ext.mkiv" level="document" name="textcolorintent" type="environment"/> + <cd:command category="colors" file="colo-grp.mkiv" level="style" name="definecolorgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3659,7 +4373,7 @@ <cd:triplet list="yes"/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definecolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3724,7 +4438,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definecolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definecolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3734,7 +4448,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="defineglobalcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="defineglobalcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3744,7 +4458,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="defineglobalcolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="defineglobalcolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3754,7 +4468,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definenamedcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definenamedcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3764,7 +4478,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definenamedcolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definenamedcolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3774,7 +4488,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="defineprocesscolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="defineprocesscolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3787,7 +4501,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definespotcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definespotcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3828,7 +4542,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definemultitonecolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definemultitonecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3846,7 +4560,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definetransparency" variant="1"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definetransparency" variant="1"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3856,7 +4570,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definetransparency" variant="2"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definetransparency" variant="2"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3888,7 +4602,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definetransparency" variant="3"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definetransparency" variant="3"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3898,14 +4612,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="switchtocolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="switchtocolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="color"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="color"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3913,7 +4627,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="coloronly"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="coloronly"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3921,7 +4635,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="transparent"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="transparent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3929,7 +4643,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="graycolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="graycolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3937,7 +4651,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="colored" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="colored" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3945,7 +4659,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="colored"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="colored"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -3953,71 +4667,71 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="color" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="color" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="coloronly" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="coloronly" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="transparent" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" name="transparent" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="directcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="directcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="directcolored" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="directcolored" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="directcolored"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="directcolored"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="currentcolor" type="environment"/> - <cd:command file="colo-ini.mkiv" name="colorset" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="currentcolor" type="environment"/> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="colorset" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="usecolors"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="usecolors"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="setupcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="setupcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="setupcolors"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="setupcolors"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -4065,15 +4779,15 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="colo-ini.mkiv" name="color" type="environment"> + <cd:command begin="push" category="colors" end="pop" file="colo-ini.mkiv" level="system" name="color" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="save" end="restore" file="colo-ini.mkiv" name="color" type="environment"/> - <cd:command file="colo-ini.mkiv" name="definepalet"> + <cd:command begin="save" category="colors" end="restore" file="colo-ini.mkiv" level="system" name="color" type="environment"/> + <cd:command category="colors" file="colo-ini.mkiv" name="definepalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4085,7 +4799,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definepalet" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definepalet" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4095,22 +4809,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="getpaletsize"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="getpaletsize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="paletsize"/> - <cd:command file="colo-ini.mkiv" name="setuppalet"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="paletsize"/> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="setuppalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="setcolormodell"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="setcolormodell"> <cd:arguments> <cd:keywords> <cd:constant type="black"/> @@ -4123,8 +4837,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="protectedcolors" type="environment"/> - <cd:command file="colo-ini.mkiv" name="defineintermediatecolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="protectedcolors" type="environment"/> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="defineintermediatecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4143,7 +4857,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="color-ini.mkiv" name="doifelsecolor"> + <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifelsecolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4156,7 +4870,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="color-ini.mkiv" name="doifcolorelse"> + <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifcolorelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4169,7 +4883,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="color-ini.mkiv" name="doifcolor"> + <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4179,77 +4893,77 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="textcolor" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="textcolor" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="MPcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="MPcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="MPcoloronly"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="MPcoloronly"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="MPtransparency"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="MPtransparency"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="MPoptions"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="MPoptions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="colorvalue"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="colorvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="grayvalue"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="grayvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="colorcomponents"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="colorcomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="transparencycomponents"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="transparencycomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="processcolorcomponents"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="processcolorcomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="doifelseblack"> + <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifelseblack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4262,7 +4976,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="doifblackelse"> + <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifblackelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4275,7 +4989,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="doifelsedrawingblack"> + <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifelsedrawingblack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -4285,7 +4999,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="doifdrawingblackelse"> + <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifdrawingblackelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -4295,35 +5009,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolorbar"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolorbar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolor"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolorset"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolorset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolorcomponents"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolorcomponents"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showpalet"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showpalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4337,14 +5051,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="comparepalet"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="comparepalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolorgroup"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolorgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4358,7 +5072,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="comparecolorgroup"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="comparecolorgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4367,7 +5081,7 @@ </cd:command> </cd:interface> <cd:interface file="i-columns.xml"> - <cd:command file="page-mul.mkiv" name="setupcolumns"> + <cd:command category="columns" file="page-mul.mkiv" level="style" name="setupcolumns"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -4416,14 +5130,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="columns" type="environment"> + <cd:command category="columns" file="page-mul.mkiv" level="document" name="columns" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumns"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="setupcolumnspan"> + <cd:command category="columns" file="page-mul.mkiv" level="style" name="setupcolumnspan"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -4433,14 +5147,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="columnspan" type="environment"> + <cd:command category="columns" file="page-mul.mkiv" name="columnspan" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumnspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="setsimplecolumnhsize"> + <cd:command category="columns" file="page-mul.mkiv" level="system" name="setsimplecolumnhsize"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -4458,7 +5172,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="simplecolumns" type="environment"> + <cd:command category="columns" file="page-mul.mkiv" level="system" name="simplecolumns" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setsimplecolumnhsize"/> @@ -4467,7 +5181,7 @@ </cd:command> </cd:interface> <cd:interface file="i-combination.xml"> - <cd:command file="pack-com.mkiv" name="definecombination"> + <cd:command category="tables" file="pack-com.mkiv" level="style" name="definecombination"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4480,7 +5194,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="setupcombination"> + <cd:command category="tables" file="pack-com.mkiv" level="style" name="setupcombination"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -4540,7 +5254,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="combination" type="environment" variant="matrix"> + <cd:command category="tables" file="pack-com.mkiv" level="document" name="combination" type="environment" variant="matrix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -4550,7 +5264,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="combination" type="environment"> + <cd:command category="tables" file="pack-com.mkiv" level="document" name="combination" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -4560,7 +5274,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="floatcombination" type="environment" variant="matrix"> + <cd:command category="float tables" file="pack-com.mkiv" level="document" name="floatcombination" type="environment" variant="matrix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:matrix"/> @@ -4568,7 +5282,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="floatcombination" type="environment"> + <cd:command category="float tables" file="pack-com.mkiv" level="document" name="floatcombination" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcombination"/> @@ -4577,7 +5291,7 @@ </cd:command> </cd:interface> <cd:interface file="i-commandhandler.xml"> - <cd:command file="mult-aux.mkiv" name="installparameterhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4585,7 +5299,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installrootparameterhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installrootparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4593,7 +5307,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installparameterhashhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installparameterhashhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4601,7 +5315,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installparametersethandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installparametersethandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4609,7 +5323,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installstyleandcolorhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installstyleandcolorhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4617,7 +5331,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdefinehandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdefinehandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4626,7 +5340,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installsetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4634,7 +5348,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installswitchsetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installswitchsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4642,7 +5356,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installautosetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installautosetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4650,7 +5364,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installbasicparameterhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installbasicparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4658,7 +5372,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installbasicautosetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installbasicautosetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4667,7 +5381,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4676,7 +5390,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installswitchcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installswitchcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4685,7 +5399,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installautocommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installautocommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4694,7 +5408,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installsimplecommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installsimplecommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4703,7 +5417,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectparameterhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4711,7 +5425,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectsetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4719,7 +5433,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectparametersethandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectparametersethandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4727,7 +5441,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectstyleandcolorhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectstyleandcolorhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4735,7 +5449,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4743,7 +5457,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installsetuponlycommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installsetuponlycommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4751,7 +5465,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="relateparameterhandlers"> + <cd:command file="mult-aux.mkiv" level="system" name="relateparameterhandlers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -4767,28 +5481,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installactionhandler"> + <cd:command 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" name="installnamespace"> + <cd:command 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" name="installcorenamespace"> + <cd:command 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" name="definenamespace"> + <cd:command file="mult-aux.mkiv" level="system" name="definenamespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4826,8 +5540,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="listnamespaces"/> - <cd:command file="mult-aux.mkiv" name="showparentchain"> + <cd:command file="mult-aux.mkiv" level="system" name="listnamespaces"/> + <cd:command file="mult-aux.mkiv" level="system" name="showparentchain"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4835,7 +5549,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="doifelsecommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="doifelsecommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4849,7 +5563,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="doifcommandhandlerelse"> + <cd:command file="mult-aux.mkiv" level="system" name="doifcommandhandlerelse"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4863,7 +5577,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="doifcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="doifcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4874,7 +5588,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="doifnotcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="doifnotcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4885,7 +5599,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdefinitionset"> + <cd:command file="mult-aux.mkiv" level="system" name="installdefinitionset"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4893,7 +5607,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdefinitionsetmember"> + <cd:command file="mult-aux.mkiv" level="system" name="installdefinitionsetmember"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4905,7 +5619,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installparentinjector"> + <cd:command file="mult-aux.mkiv" level="system" name="installparentinjector"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4913,7 +5627,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="installframedcommandhandler"> + <cd:command file="pack-rul.mkiv" level="system" name="installframedcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4922,7 +5636,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="installframedautocommandhandler"> + <cd:command file="pack-rul.mkiv" level="system" name="installframedautocommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4931,7 +5645,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="installsimpleframedcommandhandler"> + <cd:command file="pack-rul.mkiv" level="system" name="installsimpleframedcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4942,7 +5656,7 @@ </cd:command> </cd:interface> <cd:interface file="i-comment.xml"> - <cd:command file="scrn-wid.mkvi" name="definecomment"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="definecomment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4955,7 +5669,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="setupcomment"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setupcomment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -5030,12 +5744,18 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="space"> + <cd:constant type="yes"/> + </cd:parameter> + <cd:parameter name="buffer"> + <cd:constant type="cd:buffer"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" name="comment" variant="example"> + <cd:command category="pdf" file="scrn-wid.mkvi" generated="yes" level="document" name="comment" variant="instance"> <cd:sequence> - <cd:variable value="comment"/> + <cd:instance value="comment"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -5052,9 +5772,9 @@ <cd:constant value="comment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" name="comment" type="environment" variant="example"> + <cd:command category="pdf" file="scrn-wid.mkvi" generated="yes" level="document" name="comment" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="comment"/> + <cd:instance value="comment"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -5068,341 +5788,318 @@ <cd:constant value="comment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" name="placecomments"/> - <cd:command file="scrn-wid.mkvi" name="comment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcomment"/> - </cd:assignments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="scrn-wid.mkvi" name="comment" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcomment"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command category="pdf" file="scrn-wid.mkvi" level="document" name="placecomments"/> </cd:interface> <cd:interface file="i-conversion.xml"> - <cd:command file="core-con.mkiv" name="numbers"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="numbers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Numbers"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="Numbers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="romannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="romannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Romannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Romannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="abjadnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="abjadnodotnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnodotnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="abjadnaivenumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnaivenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="languagecharacters"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="languagecharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="languageCharacters"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="languageCharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="alphabeticnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="alphabeticnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Alphabeticnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Alphabeticnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="thainumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="thainumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="devanagarinumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="devanagarinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="gurmurkhinumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="gurmurkhinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="gujaratinumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="gujaratinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="tibetannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="tibetannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="greeknumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="greeknumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Greeknumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Greeknumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="arabicnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="persiannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="persiannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="arabicdecimals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicdecimals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="persiandecimals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="persiandecimals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="arabicexnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicexnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreannumeralsp"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumeralsp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreannumeralsc"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumeralsc"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreanparentnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreanparentnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreancirclenumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreancirclenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="chinesenumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="chinesenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="chinesecapnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="chinesecapnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="chineseallnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="chineseallnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="character"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="character"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Character"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Character"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="characters"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="characters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Characters"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Characters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="monthlong"> + <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 file="core-con.mkiv" name="monthshort"> + <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 file="core-con.mkiv" name="convertmonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="convertmonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="month"> + <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 file="core-con.mkiv" name="MONTH"> + <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 file="core-con.mkiv" name="MONTHLONG"> + <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 file="core-con.mkiv" name="MONTHSHORT"> + <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 file="core-con.mkiv" name="weekday"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="weekday"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="WEEKDAY"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="WEEKDAY"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="dayoftheweek"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="dayoftheweek"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5415,7 +6112,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="getdayoftheweek"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="getdayoftheweek"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5428,7 +6125,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifelseleapyear"> + <cd:command category="counter conditional" file="core-con.mkiv" level="style" name="doifelseleapyear"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5441,7 +6138,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifleapyearelse"> + <cd:command category="counter conditional" file="core-con.mkiv" level="style" name="doifleapyearelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5454,7 +6151,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="dayspermonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="dayspermonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5464,7 +6161,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="getdayspermonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="getdayspermonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5474,7 +6171,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="currentdate"> + <cd:command category="counter language" file="core-con.mkiv" level="document" name="currentdate"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="year"/> @@ -5517,7 +6214,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="date"> + <cd:command category="counter language" file="core-con.mkiv" level="document" name="date"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="d"> @@ -5535,14 +6232,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="rawdate"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="rawdate"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="currentdate"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="currenttime"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="currenttime"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="h"/> @@ -5551,7 +6248,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="processmonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="processmonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5564,7 +6261,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="processyear"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="processyear"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5580,7 +6277,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="defineconversion"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="defineconversion"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -5593,7 +6290,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="defineconversion" variant="list"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="defineconversion" variant="list"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -5606,7 +6303,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="convertnumber"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="convertnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="empty"/> @@ -5683,7 +6380,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="uconvertnumber"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="uconvertnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:inherit name="convertnumber"/> @@ -5693,7 +6390,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifelseconversiondefined"> + <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifelseconversiondefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5706,7 +6403,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifconversiondefinedelse"> + <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifconversiondefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5719,7 +6416,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifelseconversionnumber"> + <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifelseconversionnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5735,7 +6432,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifconversionnumberelse"> + <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifconversionnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5751,7 +6448,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="wordtonumber"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="wordtonumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="one"/> @@ -5765,91 +6462,91 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="highordinalstr"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="highordinalstr"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="ordinalstr"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="ordinalstr"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="ordinaldaynumber"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="ordinaldaynumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="verbosenumber"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="verbosenumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="VerboseNumber"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="VerboseNumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="smallcappedromannumerals"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="smallcappedromannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="smallcappedcharacters"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="smallcappedcharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="sloveniannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="sloveniannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="slovenianNumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="slovenianNumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="spanishnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="spanishnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="spanishNumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="spanishNumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="unihex"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="unihex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="continuednumber"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="continuednumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5858,7 +6555,7 @@ </cd:command> </cd:interface> <cd:interface file="i-counter.xml"> - <cd:command file="strc-num.mkiv" name="definecounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="definecounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -5871,7 +6568,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="setupcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="setupcounter"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -5976,7 +6673,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifelsecounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifelsecounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5989,7 +6686,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifcounterelse"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifcounterelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6002,7 +6699,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6012,7 +6709,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifnotcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifnotcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6022,7 +6719,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="setcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="setcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6035,7 +6732,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="setcounterown"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="setcounterown"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6048,7 +6745,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="restartcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="restartcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6061,7 +6758,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="resetcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="resetcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6071,7 +6768,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="incrementcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="incrementcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6081,7 +6778,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="decrementcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="decrementcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6091,7 +6788,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="rawcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="rawcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6101,7 +6798,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="lastcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="lastcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6111,7 +6808,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="firstcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="firstcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6121,7 +6818,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="nextcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="nextcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6131,7 +6828,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="prevcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="prevcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6141,7 +6838,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="countersubs"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="countersubs"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6151,77 +6848,77 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="savecounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="savecounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="restorecounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="restorecounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="showcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="showcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="incrementedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="incrementedcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="decrementedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="decrementedcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="rawcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="rawcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="lastcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="lastcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="firstcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="firstcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="nextcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="nextcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="prevcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="prevcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="rawsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="rawsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6231,7 +6928,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="lastsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="lastsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6241,7 +6938,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="firstsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="firstsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6251,7 +6948,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="nextsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="nextsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6261,7 +6958,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="prevsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="prevsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6271,7 +6968,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="convertedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="convertedcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6281,7 +6978,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="convertedsubcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="convertedsubcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6297,7 +6994,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="directconvertedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="directconvertedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6311,7 +7008,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifelsedefinedcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifelsedefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6324,7 +7021,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifdefinedcounterelse"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifdefinedcounterelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6337,7 +7034,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifdefinedcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifdefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6347,7 +7044,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifundefinedcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifundefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6357,7 +7054,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ini.mkvi" name="defineresetset"> + <cd:command category="counter" file="strc-ini.mkvi" level="style" name="defineresetset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6371,7 +7068,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ini.mkvi" name="defineseparatorset"> + <cd:command category="counter" file="strc-ini.mkvi" level="style" name="defineseparatorset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6387,7 +7084,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ini.mkvi" name="defineconversionset"> + <cd:command category="counter" file="strc-ini.mkvi" level="style" name="defineconversionset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6403,7 +7100,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ini.mkvi" name="defineprefixset"> + <cd:command category="counter" file="strc-ini.mkvi" level="style" name="defineprefixset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6419,7 +7116,7 @@ </cd:command> </cd:interface> <cd:interface file="i-dataset.xml"> - <cd:command file="core-dat.mkiv" name="definedataset"> + <cd:command file="core-dat.mkiv" level="system" name="definedataset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6432,7 +7129,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setupdataset"> + <cd:command file="core-dat.mkiv" level="system" name="setupdataset"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -6445,7 +7142,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setdataset"> + <cd:command file="core-dat.mkiv" level="system" name="setdataset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6460,7 +7157,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="datasetvariable"> + <cd:command file="core-dat.mkiv" level="system" name="datasetvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6477,7 +7174,7 @@ </cd:command> </cd:interface> <cd:interface file="i-define.xml"> - <cd:command file="core-sys.mkiv" name="define"> + <cd:command file="core-sys.mkiv" level="system" name="define"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -6486,7 +7183,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="defineexpandable"> + <cd:command file="core-sys.mkiv" level="system" name="defineexpandable"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -6497,7 +7194,7 @@ </cd:command> </cd:interface> <cd:interface file="i-delimitedtext.xml"> - <cd:command file="typo-del.mkiv" name="definedelimitedtext"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="definedelimitedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6510,7 +7207,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="setupdelimitedtext"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="setupdelimitedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -6597,9 +7294,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" generated="yes" name="delimitedtext" variant="example"> + <cd:command category="language" file="typo-del.mkiv" generated="yes" level="document" name="delimitedtext" variant="instance"> <cd:sequence> - <cd:variable value="delimitedtext"/> + <cd:instance value="delimitedtext"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -6615,9 +7312,9 @@ <cd:constant value="aside"/> </cd:instances> </cd:command> - <cd:command file="typo-del.mkiv" generated="yes" name="delimitedtext" type="environment" variant="example"> + <cd:command category="language" file="typo-del.mkiv" generated="yes" level="document" name="delimitedtext" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="delimitedtext"/> + <cd:instance value="delimitedtext"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -6635,7 +7332,7 @@ <cd:constant value="aside"/> </cd:instances> </cd:command> - <cd:command file="typo-del.mkiv" name="delimitedtext"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="delimitedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6646,7 +7343,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="delimitedtext" type="environment"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="delimitedtext" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6659,7 +7356,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="delimited"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="delimited"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6670,7 +7367,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="delimited" type="environment"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="delimited" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6683,113 +7380,30 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="quotation"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="quotation" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="quote"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="quote" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="blockquote"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="blockquote" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="speech"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="aside" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="aside"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="speech" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="setupquotation"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="setupquotation"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="setupquote"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="setupquote"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="subsentence"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="subsentence"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="subsentence" type="environment"/> + <cd:command category="language" file="typo-del.mkiv" level="document" name="subsentence" type="environment"/> + <cd:command category="language" file="typo-del.mkiv" level="document" name="midsubsentence"/> </cd:interface> <cd:interface file="i-description.xml"> - <cd:command file="strc-des.mkvi" name="definedescription"> + <cd:command category="structure" file="strc-des.mkvi" level="style" name="definedescription"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6802,7 +7416,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" name="setupdescription"> + <cd:command category="structure" file="strc-des.mkvi" level="style" name="setupdescription"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -6875,6 +7489,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </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:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -6893,6 +7513,11 @@ <cd:constant default="yes" type="no"/> <cd:constant type="xml"/> </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:constant type="+"/> + <cd:constant type="-"/> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -6919,7 +7544,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" name="description" type="environment" variant="example"> + <cd:command category="structure" file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -6940,7 +7565,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" name="description" type="environment" variant="example:title"> + <cd:command category="structure" file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example:title"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -6953,7 +7578,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" name="description" variant="example"> + <cd:command category="structure" file="strc-des.mkvi" generated="yes" level="document" name="description" variant="example"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -6972,7 +7597,7 @@ </cd:command> </cd:interface> <cd:interface file="i-digits.xml"> - <cd:command file="typo-dig.mkiv" name="setdigitsmanipulation"> + <cd:command file="typo-dig.mkiv" level="system" name="setdigitsmanipulation"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -6980,18 +7605,18 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-dig.mkiv" name="resetdigitsmanipulation"/> - <cd:command file="typo-dig.mkiv" name="equaldigits"> + <cd:command file="typo-dig.mkiv" level="system" name="resetdigitsmanipulation"/> + <cd:command file="typo-dig.mkiv" 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" name="dummydigit"/> + <cd:command file="typo-dig.mkiv" level="document" name="dummydigit"/> </cd:interface> <cd:interface file="i-dimension.xml"> - <cd:command file="mult-dim.mkvi" name="assigndimension"> + <cd:command file="mult-dim.mkvi" level="system" name="assigndimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant method="none" prefix="cd:sign" type="small"/> @@ -7012,7 +7637,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-dim.mkvi" name="assignalfadimension"> + <cd:command file="mult-dim.mkvi" level="system" name="assignalfadimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small"/> @@ -7033,7 +7658,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-dim.mkvi" name="assignwidth"> + <cd:command file="mult-dim.mkvi" level="system" name="assignwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="fit"/> @@ -7049,7 +7674,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-dim.mkvi" name="assignvalue"> + <cd:command file="mult-dim.mkvi" level="system" name="assignvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small"/> @@ -7071,7 +7696,7 @@ </cd:command> </cd:interface> <cd:interface file="i-direction.xml"> - <cd:command file="typo-dir.mkiv" name="setupdirections"> + <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="setupdirections"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="bidi"> @@ -7089,19 +7714,23 @@ <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> </cd:parameter> + <cd:parameter name="break"> + <cd:constant default="yes" type="both"/> + <cd:constant type="before"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-dir.mkiv" name="setdirection"> + <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="setdirection"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-dir.mkiv" name="resetdirection"/> - <cd:command file="supp-dir.mkiv" name="showdirsinmargin"/> - <cd:command file="supp-dir.mkiv" name="istltdir"> + <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="resetdirection"/> + <cd:command category="alignment" file="supp-dir.mkiv" level="document" name="showdirsinmargin"/> + <cd:command category="alignment" file="supp-dir.mkiv" level="system" name="istltdir"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -7109,7 +7738,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" name="istrtdir"> + <cd:command category="alignment" file="supp-dir.mkiv" level="system" name="istrtdir"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -7119,10 +7748,10 @@ </cd:command> </cd:interface> <cd:interface file="i-document.xml"> - <cd:command file="file-job.mkvi" name="text" type="environment"/> - <cd:command begin="autostart" end="autostop" file="file-job.mkvi" name="text" type="environment"/> - <cd:command file="file-job.mkvi" name="notext" type="environment"/> - <cd:command file="file-job.mkvi" name="environment" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="text" type="environment"/> + <cd:command begin="autostart" category="structure" end="autostop" file="file-job.mkvi" level="system" name="text" type="environment"/> + <cd:command category="structure" file="file-job.mkvi" level="system" name="notext" type="environment"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="environment" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7130,7 +7759,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="environment" type="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="environment" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7138,29 +7767,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="environment"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="useenvironment"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="useenvironment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="currentenvironment"/> - <cd:command file="file-job.mkvi" name="project" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="currentenvironment"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="project" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7168,7 +7797,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="project" type="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="project" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7176,29 +7805,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="project"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="project"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="project" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="project" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="useproject"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="useproject"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="currentproject"/> - <cd:command file="file-job.mkvi" name="product" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="currentproject"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="product" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7206,7 +7835,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="product" type="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="product" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7214,29 +7843,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="product"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="product"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="product" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="product" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="useproduct"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="useproduct"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="currentproduct"/> - <cd:command file="file-job.mkvi" name="component" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="currentproduct"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="component" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7244,7 +7873,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="component" type="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="component" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7252,36 +7881,36 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="component"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="component"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="component" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="component" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="usecomponent"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="usecomponent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="currentcomponent"/> - <cd:command file="file-job.mkvi" name="document" type="environment"> + <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:assignments list="yes" optional="yes"> <cd:inherit name="setupdocument"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="setupdocument"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="setupdocument"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -7308,14 +7937,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="presetdocument"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="presetdocument"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdocument"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="documentvariable"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="documentvariable"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="file-job.mkvi" level="style" name="unexpandeddocumentvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7324,7 +7960,7 @@ </cd:command> </cd:interface> <cd:interface file="i-dummy.xml"> - <cd:command file="mult-aux.mkiv" name="getdummyparameters"> + <cd:command file="mult-aux.mkiv" level="system" name="getdummyparameters"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -7333,21 +7969,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="dummyparameter"> + <cd:command 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" name="directdummyparameter"> + <cd:command 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" name="setdummyparameter"> + <cd:command file="mult-aux.mkiv" level="system" name="setdummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7357,7 +7993,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="letdummyparameter"> + <cd:command file="mult-aux.mkiv" level="system" name="letdummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7365,7 +8001,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="usedummystyleandcolor"> + <cd:command category="fonts colors" file="mult-aux.mkiv" level="system" name="usedummystyleandcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7375,14 +8011,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="usedummystyleparameter"> + <cd:command category="fonts" file="mult-aux.mkiv" level="system" name="usedummystyleparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="usedummycolorparameter"> + <cd:command category="colors" file="mult-aux.mkiv" level="system" name="usedummycolorparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7391,7 +8027,7 @@ </cd:command> </cd:interface> <cd:interface file="i-effect.xml"> - <cd:command file="attr-eff.mkiv" name="defineeffect"> + <cd:command category="pdf" file="attr-eff.mkiv" level="style" name="defineeffect"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7404,7 +8040,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-eff.mkiv" name="setupeffect"> + <cd:command category="pdf" file="attr-eff.mkiv" level="style" name="setupeffect"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7431,19 +8067,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-eff.mkiv" name="effect" type="environment"> + <cd:command category="pdf" file="attr-eff.mkiv" level="document" name="effect" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-eff.mkiv" generated="yes" name="effect" type="environment" variant="example"> + <cd:command category="pdf" file="attr-eff.mkiv" generated="yes" level="document" name="effect" type="environment" variant="example"> <cd:sequence> <cd:variable value="effect"/> </cd:sequence> </cd:command> - <cd:command file="attr-eff.mkiv" name="effect"> + <cd:command category="pdf" file="attr-eff.mkiv" level="document" name="effect"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7453,7 +8089,7 @@ </cd:command> </cd:interface> <cd:interface file="i-enumeration.xml"> - <cd:command file="strc-enu.mkvi" name="defineenumeration"> + <cd:command category="structure" file="strc-enu.mkvi" level="style" name="defineenumeration"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7466,7 +8102,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" name="setupenumeration"> + <cd:command category="structure" file="strc-enu.mkvi" level="style" name="setupenumeration"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7586,6 +8222,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </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:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -7604,6 +8246,11 @@ <cd:constant default="yes" type="no"/> <cd:constant type="xml"/> </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:constant type="+"/> + <cd:constant type="-"/> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -7631,7 +8278,17 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" name="enumeration" type="environment" variant="example"> + <cd:command category="structure" file="strc-enu.mkvi" level="style" name="setupenumerations"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupenumeration"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" type="environment" variant="example"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -7652,7 +8309,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" name="enumeration" type="environment" variant="example:title"> + <cd:command category="structure" file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" type="environment" variant="example:title"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -7665,7 +8322,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" name="enumeration" variant="example"> + <cd:command category="structure" file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" variant="example"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -7684,7 +8341,7 @@ </cd:command> </cd:interface> <cd:interface file="i-export.xml"> - <cd:command file="back-exp.mkiv" name="setelementexporttag"> + <cd:command category="xml" file="back-exp.mkiv" level="system" name="setelementexporttag"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7701,7 +8358,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-exp.mkiv" name="setupexport"> + <cd:command category="xml" file="back-exp.mkiv" level="style" name="setupexport"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="align"> @@ -7751,14 +8408,14 @@ </cd:command> </cd:interface> <cd:interface file="i-field.xml"> - <cd:command file="scrn-fld.mkvi" name="presetfieldsymbols"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="system" name="presetfieldsymbols"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefieldcategory"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefieldcategory"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7771,7 +8428,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldcategory"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="setupfieldcategory"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7886,7 +8543,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="doifelsefieldcategory"> + <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doifelsefieldcategory"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7899,7 +8556,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="doiffieldcategoryelse"> + <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doiffieldcategoryelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7912,7 +8569,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefieldbody"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefieldbody"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7925,7 +8582,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldbody"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="setupfieldbody"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7938,7 +8595,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="fieldbody"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="document" name="fieldbody"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7948,7 +8605,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefieldbodyset"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefieldbodyset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7958,7 +8615,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="doifelsefieldbody"> + <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doifelsefieldbody"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7971,7 +8628,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="doiffieldbodyelse"> + <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doiffieldbodyelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7984,7 +8641,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8009,7 +8666,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definesubfield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definesubfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8022,7 +8679,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="clonefield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="clonefield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8038,7 +8695,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="copyfield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="copyfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8048,7 +8705,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="fitfieldframed"> + <cd:command category="pdf background rules" file="scrn-fld.mkvi" level="document" name="fitfieldframed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -8056,7 +8713,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="fitfield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="document" name="fitfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8066,7 +8723,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldlabelframed"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldlabelframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8076,7 +8733,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldcontentframed"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldcontentframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8087,7 +8744,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldtotalframed"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldtotalframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8116,7 +8773,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfield"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8139,7 +8796,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfields"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfields"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -8159,7 +8816,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="field"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="document" name="field"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8169,7 +8826,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefieldstack"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefieldstack"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8182,7 +8839,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="fieldstack"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="document" name="fieldstack"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8197,7 +8854,7 @@ </cd:command> </cd:interface> <cd:interface file="i-figure.xml"> - <cd:command file="grph-fig.mkiv" name="figure" type="environment"> + <cd:command category="graphics" file="grph-fig.mkiv" level="document" name="figure" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8210,7 +8867,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="referring"> + <cd:command category="graphics" file="grph-fig.mkiv" level="document" name="referring"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -8219,7 +8876,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="marking"> + <cd:command category="graphics" file="grph-fig.mkiv" level="document" name="marking"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -8228,7 +8885,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="remark"> + <cd:command category="graphics" file="grph-fig.mkiv" level="document" name="remark"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -8240,7 +8897,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="colorbar"> + <cd:command category="colors" file="grph-fig.mkiv" level="document" name="colorbar"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:color"/> @@ -8249,21 +8906,21 @@ </cd:command> </cd:interface> <cd:interface file="i-file.xml"> - <cd:command file="file-ini.mkvi" name="input"> + <cd:command category="structure" file="file-ini.mkvi" level="document" name="input"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="input" variant="string"> + <cd:command category="structure" file="file-ini.mkvi" level="document" name="input" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doiffile"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8273,7 +8930,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifnotfile"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifnotfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8283,7 +8940,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelsefile"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8296,7 +8953,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doiffileelse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8309,24 +8966,24 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="jobfilename"/> - <cd:command file="core-sys.mkiv" name="jobfilesuffix"/> - <cd:command file="core-sys.mkiv" name="inputfilebarename"/> - <cd:command file="core-sys.mkiv" name="inputfilerealsuffix"/> - <cd:command file="core-sys.mkiv" name="inputfilesuffix"/> - <cd:command file="core-sys.mkiv" name="inputfilename"/> - <cd:command file="core-sys.mkiv" name="outputfilename"/> - <cd:command file="file-ini.mkvi" name="readingfile" type="environment"/> - <cd:command begin="push" end="pop" file="file-ini.mkvi" name="endofline" type="environment"/> - <cd:command file="file-ini.mkvi" name="restoreendofline"/> - <cd:command file="file-ini.mkvi" name="inputgivenfile"> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="jobfilename"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="jobfilesuffix"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="inputfilebarename"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="inputfilerealsuffix"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="inputfilesuffix"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="inputfilename"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="outputfilename"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="readingfile" type="environment"/> + <cd:command begin="push" category="structure" end="pop" file="file-ini.mkvi" level="system" name="endofline" type="environment"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="restoreendofline"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="inputgivenfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelsepath"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsepath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8339,7 +8996,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifpathelse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifpathelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8352,7 +9009,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelsefileexists"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsefileexists"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8365,7 +9022,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doiffileexistselse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffileexistselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8378,7 +9035,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelsepathexists"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsepathexists"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8391,7 +9048,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifpathexistselse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifpathexistselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8404,7 +9061,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelseparentfile"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelseparentfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8417,7 +9074,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifparentfileelse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifparentfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8430,21 +9087,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="splitfilename"> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="splitofffull"/> - <cd:command file="file-ini.mkvi" name="splitoffpath"/> - <cd:command file="file-ini.mkvi" name="splitoffbase"/> - <cd:command file="file-ini.mkvi" name="splitoffname"/> - <cd:command file="file-ini.mkvi" name="splitofftype"/> - <cd:command file="file-ini.mkvi" name="splitoffkind"/> - <cd:command file="file-ini.mkvi" name="splitoffroot"/> - <cd:command file="file-job.mkvi" name="doifelseinputfile"> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitofffull"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffpath"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffbase"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffname"/> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8457,7 +9114,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="doifinputfileelse"> + <cd:command category="structure conditional" file="file-job.mkvi" level="system" name="doifinputfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8470,45 +9127,45 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="processfile"> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="processfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="usepath"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="usepath"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:path"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="usesubpath"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="usesubpath"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:path"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="file-job.mkvi" name="path" type="environment"> + <cd:command begin="push" category="structure" end="pop" file="file-job.mkvi" level="system" name="path" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:path"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="resetpath"/> - <cd:command file="file-job.mkvi" name="allinputpaths"/> - <cd:command file="file-ini.mkvi" name="locatefilepath"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="resetpath"/> + <cd:command category="structure" file="file-job.mkvi" level="system" name="allinputpaths"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="locatefilepath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="locatedfilepath"/> - <cd:command file="file-job.mkvi" name="usezipfile"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="locatedfilepath"/> + <cd:command category="structure" file="file-job.mkvi" level="style" name="usezipfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -8518,91 +9175,98 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="processfilemany"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="processfilemany"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="processfileonce"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="processfileonce"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="processfilenone"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="processfilenone"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadtexfile"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="loadtexfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadluafile"> + <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadluafile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadcldfile"> + <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadcldfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadanyfile"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="loadanyfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadtexfileonce"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="loadtexfileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadluafileonce"> + <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadluafileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadcldfileonce"> + <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadcldfileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadanyfileonce"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="loadanyfileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="continueifinputfile"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="continueifinputfile"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="file-job.mkvi" level="document" name="samplefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readjobfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readjobfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8615,7 +9279,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readlocfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readlocfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8628,7 +9292,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readsysfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readsysfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8641,7 +9305,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readfixfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readfixfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8657,7 +9321,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readsetfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readsetfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8673,7 +9337,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8686,14 +9350,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="ReadFile"> + <cd:command category="structure" file="file-res.mkvi" level="system" name="ReadFile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readtexfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readtexfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8706,7 +9370,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readxmlfile"> + <cd:command category="structure conditional xml" file="file-res.mkvi" level="system" name="readxmlfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8719,7 +9383,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="doifelselocfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="doifelselocfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8732,7 +9396,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="doiflocfileelse"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="doiflocfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8745,14 +9409,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="locfilename"> + <cd:command category="structure" file="file-res.mkvi" level="system" name="locfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-sys.mkvi" name="definefilesynonym"> + <cd:command category="structure" file="file-sys.mkvi" level="system" name="definefilesynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8762,7 +9426,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-sys.mkvi" name="definefilefallback"> + <cd:command category="structure" file="file-sys.mkvi" level="system" name="definefilefallback"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8772,7 +9436,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-sys.mkvi" name="truefilename"> + <cd:command category="structure" file="file-sys.mkvi" level="system" name="truefilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8781,7 +9445,7 @@ </cd:command> </cd:interface> <cd:interface file="i-filler.xml"> - <cd:command file="spac-flr.mkiv" name="definefiller"> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="definefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8794,7 +9458,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-flr.mkiv" name="setupfiller"> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="setupfiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8861,7 +9525,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-flr.mkiv" name="filler"> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="filler"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -8873,7 +9537,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-flr.mkiv" name="checkedfiller"> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="checkedfiller"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="sym"/> @@ -8886,7 +9550,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="definelinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8899,7 +9563,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setuplinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8955,7 +9619,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setuplinefillers"> + <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"/> @@ -8965,7 +9629,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="linefiller" type="environment"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="linefiller" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -8976,7 +9640,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setlinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setlinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -8986,7 +9650,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fillinline.xml"> - <cd:command file="pack-mrl.mkiv" name="setupfillinlines"> + <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setupfillinlines"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -9013,7 +9677,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="fillinline"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="fillinline"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfillinlines"/> @@ -9022,7 +9686,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fillinrule.xml"> - <cd:command file="pack-mrl.mkiv" name="setupfillinrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setupfillinrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -9061,7 +9725,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="fillinrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="fillinrules"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -9074,7 +9738,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="fillintext"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="fillintext"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -9089,7 +9753,7 @@ </cd:command> </cd:interface> <cd:interface file="i-firstline.xml"> - <cd:command file="typo-fln.mkiv" name="definefirstline"> + <cd:command category="fonts colors" file="typo-fln.mkiv" level="style" name="definefirstline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9102,7 +9766,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-fln.mkiv" name="setupfirstline"> + <cd:command category="fonts colors" file="typo-fln.mkiv" level="style" name="setupfirstline"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9126,14 +9790,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-fln.mkiv" name="setfirstline"> + <cd:command category="fonts colors" file="typo-fln.mkiv" level="document" name="setfirstline"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-fln.mkiv" name="applytofirstcharacter"> + <cd:command category="fonts colors" file="typo-fln.mkiv" level="system" name="applytofirstcharacter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -9143,7 +9807,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fittingpage.xml"> - <cd:command file="page-app.mkiv" name="definefittingpage"> + <cd:command category="background layout" file="page-app.mkiv" level="style" name="definefittingpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9156,7 +9820,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" name="setupfittingpage"> + <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupfittingpage"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9177,14 +9841,14 @@ </cd:parameter> <cd:parameter name="paper"> <cd:constant type="auto"/> - <cd:constant default="yes" type="defaut"/> + <cd:constant default="yes" type="default"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" name="fittingpage" type="environment"> + <cd:command category="background layout" file="page-app.mkiv" level="document" name="fittingpage" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9194,9 +9858,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" generated="yes" name="fittingpage" type="environment" variant="example"> + <cd:command category="background layout" file="page-app.mkiv" generated="yes" level="document" name="fittingpage" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="fittingpage"/> + <cd:instance value="fittingpage"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -9208,28 +9872,14 @@ <cd:constant value="MPpage"/> </cd:instances> </cd:command> - <cd:command file="page-app.mkiv" name="TEXpage" type="environment"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command file="page-app.mkiv" name="setupTEXpage"> + <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupTEXpage"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-fig.mkiv" name="MPpage" type="environment"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command file="meta-fig.mkiv" name="setupMPpage"> + <cd:command category="background layout metapost" file="meta-fig.mkiv" level="style" name="setupMPpage"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> @@ -9238,12 +9888,13 @@ </cd:command> </cd:interface> <cd:interface file="i-floats.xml"> - <cd:command file="strc-flt.mkvi" name="definefloat"> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="definefloat"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> </cd:keywords> <cd:keywords optional="yes"> + <cd:constant type="cd:singular"/> <cd:constant type="cd:plural"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> @@ -9258,7 +9909,7 @@ <cd:constant value="graphic"/> </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" name="definefloat" variant="name"> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="definefloat" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -9278,7 +9929,7 @@ <cd:constant value="graphic"/> </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" name="setupfloat"> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="setupfloat"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:singular"/> @@ -9319,7 +9970,7 @@ <cd:constant default="yes" type="normal"/> </cd:parameter> <cd:parameter name="grid"> - <cd:constant type="cd:string"/> + <cd:inherit name="snaptogrid"/> </cd:parameter> <cd:parameter name="local"> <cd:constant type="yes"/> @@ -9385,6 +10036,26 @@ <cd:parameter name="bottomafter"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:constant type="+"/> + <cd:constant type="-"/> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="catcodes"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="freeregion"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:parameter name="spacebefore"> <cd:constant type="none"/> <cd:inherit name="blank"/> @@ -9412,6 +10083,18 @@ <cd:constant type="none"/> <cd:inherit name="blank"/> </cd:parameter> + <cd:parameter name="spacebeforeside"> + <cd:constant type="none"/> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceafterside"> + <cd:constant type="none"/> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="sidethreshold"> + <cd:constant type="old"/> + <cd:constant default="yes" type="dimension"/> + </cd:parameter> <cd:parameter name="margin"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -9438,7 +10121,17 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="setupfloatcaption"> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="setupfloats"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:singular"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupfloatcaption"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9473,6 +10166,8 @@ <cd:constant type="top"/> <cd:constant default="yes" type="bottom"/> <cd:constant type="stretch"/> + <cd:constant type="tolerant"/> + <cd:constant type="verytolerant"/> <cd:constant type="none"/> <cd:constant type="default"/> </cd:parameter> @@ -9497,6 +10192,9 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="headseparator"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="inbetween"> <cd:constant type="cd:command"/> </cd:parameter> @@ -9552,7 +10250,17 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="setupcaption"> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupfloatcaption"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaptions"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9562,7 +10270,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" generated="yes" name="placefloat" variant="instance"> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="placefloat" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> @@ -9620,10 +10328,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <cd:constant type="somewhere"/> <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -9641,7 +10349,7 @@ <cd:constant value="graphic"/> </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" name="placefloat"> + <cd:command category="structure" file="strc-flt.mkvi" level="document" name="placefloat"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -9698,10 +10406,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <cd:constant type="somewhere"/> <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -9712,7 +10420,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" generated="yes" name="placefloat" type="environment" variant="instance"> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="placefloat" type="environment" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> @@ -9783,10 +10491,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <cd:constant type="somewhere"/> <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> </cd:parameter> <cd:parameter name="reference"> <cd:constant type="cd:reference"/> @@ -9806,9 +10514,95 @@ <cd:constant value="graphic"/> </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" generated="yes" name="floattext" type="environment" variant="example"> + <cd:command category="structure" file="strc-flt.mkvi" level="document" name="placefloat" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:singular"/> + </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="location"> + <cd:constant type="split"/> + <cd:constant type="always"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inmargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="text"/> + <cd:constant type="opposite"/> + <cd:constant type="reset"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant method="none" prefix="cd:sign" type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="grid"/> + <cd:constant type="high"/> + <cd:constant type="low"/> + <cd:constant type="fit"/> + <cd:constant type="90"/> + <cd:constant type="180"/> + <cd:constant type="270"/> + <cd:constant type="nonumber"/> + <cd:constant type="none"/> + <cd:constant type="local"/> + <cd:constant type="here"/> + <cd:constant type="force"/> + <cd:constant type="margin"/> + <cd:constant method="none" prefix="cd:sign" type="hang"/> + <cd:constant type="hanging"/> + <cd:constant type="tall"/> + <cd:constant type="both"/> + <cd:constant type="middle"/> + <cd:constant type="offset"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="auto"/> + <cd:constant type="page"/> + <cd:constant type="leftpage"/> + <cd:constant type="rightpage"/> + <cd:constant type="somewhere"/> + <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> + </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" generated="yes" level="document" name="floattext" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="float"/> + <cd:instance value="float"/> <cd:string value="text"/> </cd:sequence> <cd:arguments> @@ -9864,10 +10658,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <cd:constant type="somewhere"/> <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -9876,37 +10670,58 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:constant value="chemical"/> + <cd:constant value="figure"/> + <cd:constant value="table"/> + <cd:constant value="intermezzo"/> + <cd:constant value="graphic"/> + </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" generated="yes" name="placelistoffloats" variant="example"> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="placelistoffloats" variant="instance"> <cd:sequence> <cd:string value="placelistof"/> - <cd:variable value="floats"/> + <cd:instance value="floats"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> + <cd:instances> + <cd:constant value="chemicals"/> + <cd:constant value="figures"/> + <cd:constant value="tables"/> + <cd:constant value="intermezzi"/> + <cd:constant value="graphics"/> + </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" generated="yes" name="completelistoffloats" variant="example"> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="completelistoffloats" variant="instance"> <cd:sequence> <cd:string value="completelistof"/> - <cd:variable value="floats"/> + <cd:instance value="floats"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> + <cd:instances> + <cd:constant value="chemicals"/> + <cd:constant value="figures"/> + <cd:constant value="tables"/> + <cd:constant value="intermezzi"/> + <cd:constant value="graphics"/> + </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" name="floatuserdataparameter"> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="floatuserdataparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifelserightpagefloat"> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelserightpagefloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9916,7 +10731,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifrightpagefloatelse"> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifrightpagefloatelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9926,7 +10741,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifelseoddpagefloat"> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelseoddpagefloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9936,7 +10751,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifoddpagefloatelse"> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifoddpagefloatelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9946,7 +10761,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifelsemainfloatbody"> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelsemainfloatbody"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9956,7 +10771,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifmainfloatbodyelse"> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifmainfloatbodyelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9966,7 +10781,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="setuplocalfloats"> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="setuplocalfloats"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -9981,20 +10796,20 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="noflocalfloats"/> - <cd:command file="strc-flt.mkvi" name="resetlocalfloats"/> - <cd:command file="strc-flt.mkvi" name="somelocalfloat"/> - <cd:command file="strc-flt.mkvi" name="getlocalfloats"/> - <cd:command file="strc-flt.mkvi" name="flushlocalfloats"/> - <cd:command file="strc-flt.mkvi" name="getlocalfloat"> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="noflocalfloats"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="resetlocalfloats"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="somelocalfloat"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="getlocalfloats"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="flushlocalfloats"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="getlocalfloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="forcelocalfloats"/> - <cd:command file="tabl-tsp.mkiv" name="setupfloatsplitting"> + <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:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -10016,7 +10831,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tsp.mkiv" name="splitfloat"> + <cd:command category="structure" file="tabl-tsp.mkiv" level="system" name="splitfloat"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfloatsplitting"/> @@ -10027,14 +10842,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="tabl-tsp.mkiv" name="doifnotinsidesplitfloat"> + <cd:command category="structure conditional" file="tabl-tsp.mkiv" level="system" name="doifnotinsidesplitfloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flt.mkiv" name="placenamedfloat"> + <cd:command category="structure" file="page-flt.mkiv" level="document" name="placenamedfloat"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10044,7 +10859,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flt.mkiv" name="placefloatwithsetups"> + <cd:command category="structure" file="page-flt.mkiv" level="document" name="placefloatwithsetups"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10101,10 +10916,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <cd:constant type="somewhere"/> <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -10117,7 +10932,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fontfamily.xml"> - <cd:command file="font-sel.mkvi" name="definefontfamily"> + <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefontfamily"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10184,7 +10999,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefontfamily" variant="preset"> + <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefontfamily" variant="preset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10218,7 +11033,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefallbackfamily"> + <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefallbackfamily"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10301,7 +11116,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefallbackfamily" variant="preset"> + <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefallbackfamily" variant="preset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10335,7 +11150,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefontfamilypreset"> + <cd:command category="fonts" file="font-sel.mkvi" level="system" name="definefontfamilypreset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10345,7 +11160,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefontfamilypreset" variant="name"> + <cd:command category="fonts" file="font-sel.mkvi" level="system" name="definefontfamilypreset" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10357,7 +11172,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fonts.xml"> - <cd:command file="font-col.mkvi" name="definefontfallback"> + <cd:command category="fonts" file="font-col.mkvi" level="style" name="definefontfallback"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10386,10 +11201,16 @@ <cd:constant type="cd:number"/> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="features"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-col.mkvi" name="resetfontfallback"> + <cd:command category="fonts" file="font-col.mkvi" level="style" name="resetfontfallback"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10399,15 +11220,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-emp.mkvi" name="emphasistypeface"/> - <cd:command file="font-emp.mkvi" name="emphasisboldface"/> - <cd:command file="font-emp.mkvi" name="normalboldface"/> - <cd:command file="font-emp.mkvi" name="normaltypeface"/> - <cd:command file="font-emp.mkvi" name="swaptypeface"/> - <cd:command file="font-emp.mkvi" name="typeface"/> - <cd:command file="font-emp.mkvi" name="boldface"/> - <cd:command file="font-emp.mkvi" name="swapface"/> - <cd:command file="font-fea.mkvi" name="definefontfeature"> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="emphasistypeface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="emphasisboldface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="normalboldface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="normalitalicface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="normalslantedface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="normaltypeface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="swaptypeface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="typeface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="boldface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="italicface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="slantedface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="swapface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="em"/> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="definefontfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10503,6 +11329,10 @@ <cd:parameter name="boundingbox"> <cd:constant type="yes"/> <cd:constant type="no"/> + <cd:constant type="background"/> + <cd:constant type="frame"/> + <cd:constant type="empty"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="compose"> <cd:constant type="yes"/> @@ -10583,10 +11413,14 @@ <cd:parameter name="mathnolimitsmode"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="blockligatures"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="adaptfontfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="adaptfontfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10596,7 +11430,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="fontfeaturelist"> + <cd:command category="fonts" file="font-fea.mkvi" level="document" name="fontfeaturelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10606,72 +11440,72 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="addfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="addfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="addfeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="addfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="subtractfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="subtractfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="subtractfeature" variant="direct"> + <cd:command ategory="fonts" clevel="style" file="font-fea.mkvi" name="subtractfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="replacefeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="replacefeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="replacefeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="replacefeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="resetandaddfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="resetandaddfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="resetandaddfeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="resetandaddfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="resetfeature"/> - <cd:command file="font-fea.mkvi" name="revivefeature"/> - <cd:command file="font-fea.mkvi" name="setfontfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="resetfeature"/> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="revivefeature"/> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="setfontfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="feature"> + <cd:command category="fonts" file="font-fea.mkvi" level="document" name="feature"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -10688,12 +11522,12 @@ <cd:constant type="old"/> <cd:constant type="local"/> </cd:keywords> - <cd:keywords> + <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="feature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="document" name="feature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -10710,12 +11544,12 @@ <cd:constant type="old"/> <cd:constant type="local"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doifelsecurrentfonthasfeature"> + <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifelsecurrentfonthasfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10728,7 +11562,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doifcurrentfonthasfeatureelse"> + <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifcurrentfonthasfeatureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10741,35 +11575,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doaddfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doaddfeature"> <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="dosubtractfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="dosubtractfeature"> <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doreplacefeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doreplacefeature"> <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doresetandafffeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doresetandafffeature"> <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="fontclass" type="environment"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="fontclass" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="each"/> @@ -10777,7 +11611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="classfont"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="classfont"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10787,7 +11621,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="definefontsynonym"> + <cd:command category="fonts" file="font-fil.mkvi" level="style" name="definefontsynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10812,7 +11646,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="definefontfile"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="definefontfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10837,14 +11671,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="truefontname"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="truefontname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="expandfontsynonym"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="expandfontsynonym"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -10852,7 +11686,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="doifelsefontsynonym"> + <cd:command category="fonts conditional" file="font-fil.mkvi" level="system" name="doifelsefontsynonym"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10865,7 +11699,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="doiffontsynonymelse"> + <cd:command category="fonts conditional" file="font-fil.mkvi" level="system" name="doiffontsynonymelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10878,14 +11712,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="tracedfontname"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="tracedfontname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="fontclassname"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="fontclassname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10895,37 +11729,37 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-gds.mkvi" name="loadfontgoodies"> + <cd:command category="fonts" file="font-gds.mkvi" level="style" name="loadfontgoodies"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-gds.mkvi" name="setfontcolorsheme"> + <cd:command category="fonts" file="font-gds.mkvi" level="style" name="setfontcolorsheme"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-gds.mkvi" name="resetfontcolorsheme"/> - <cd:command file="font-ini.mkvi" name="definedfont"> + <cd:command category="fonts" file="font-gds.mkvi" level="style" name="resetfontcolorsheme"/> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definedfont"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="font" type="environment"> + <cd:command category="fonts" file="font-ini.mkvi" level="document" name="font" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="bodyfontsize"/> - <cd:command file="font-ini.mkvi" name="normalizebodyfontsize"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="bodyfontsize"/> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="normalizebodyfontsize"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -10933,14 +11767,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="thenormalizedbodyfontsize"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="thenormalizedbodyfontsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="mapfontsize"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="mapfontsize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:dimension"/> @@ -10950,7 +11784,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefontstyle"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="definefontstyle"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -10960,21 +11794,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefontsize"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="definefontsize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefontalternative"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="definefontalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefont"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definefont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10987,7 +11821,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefont" variant="argument"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definefont" variant="argument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11000,7 +11834,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefrozenfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="definefrozenfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11010,7 +11844,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definebodyfontenvironment"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definebodyfontenvironment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -11079,29 +11913,29 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="processbodyfontenvironmentlist"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="processbodyfontenvironmentlist"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="bodyfontenvironmentlist"/> - <cd:command file="font-fil.mkvi" name="registerfontclass"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="bodyfontenvironmentlist"/> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="registerfontclass"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="setcurrentfontclass"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="setcurrentfontclass"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="tx"/> - <cd:command file="font-ini.mkvi" name="txx"/> - <cd:command file="font-fil.mkvi" name="definebodyfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="document" name="tx"/> + <cd:command category="fonts" file="font-ini.mkvi" level="document" name="txx"/> + <cd:command category="fonts" file="font-fil.mkvi" level="style" name="definebodyfont"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11161,7 +11995,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="definebodyfont" variant="argument"> + <cd:command category="fonts" file="font-fil.mkvi" level="style" name="definebodyfont" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11183,7 +12017,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="setupfonts"> + <cd:command category="fonts" file="font-ini.mkiv" level="style" name="setupfonts"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="language"> @@ -11193,7 +12027,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="setupbodyfont"> + <cd:command category="fonts" file="font-ini.mkiv" level="style" name="setupbodyfont"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:dimension"/> @@ -11225,14 +12059,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="switchtobodyfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="switchtobodyfont"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="fastswitchtobodyfont"> + <cd:command category="fonts" file="font-ini.mkiv" level="system" name="fastswitchtobodyfont"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="x"/> @@ -11244,40 +12078,48 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="usebodyfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="usebodyfont"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="usebodyfontparameter"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="usebodyfontparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="fontchar"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="fontchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="fontcharbyindex"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="fontcharbyindex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="tochar"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="tochar"> <cd:arguments> <cd:keywords delimiters="braces"> - <cd:constant type="cd:name"/> + <cd:constant method="range" prefix="e" type="cd:name"/> + <cd:constant method="range" prefix="x" type="cd:number"/> + <cd:constant method="range" prefix="d" type="cd:number"/> + <cd:constant method="range" prefix="s" type="cd:number"/> + <cd:constant method="range" prefix="i" type="cd:number"/> + <cd:constant method="range" prefix="n" type="cd:name"/> + <cd:constant method="range" prefix="c" type="cd:name"/> + <cd:constant method="range" prefix="u" type="cd:name"/> + <cd:constant method="range" prefix="a" type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="switchstyleonly"> + <cd:command ategory="fonts" clevel="style" file="font-ini.mkiv" name="switchstyleonly"> <cd:arguments> <cd:keywords> <cd:constant type="rm"/> @@ -11299,12 +12141,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="switchstyleonly" variant="command"> + <cd:command category="fonts" file="font-ini.mkiv" level="style" name="switchstyleonly" variant="command"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definebodyfontswitch"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definebodyfontswitch"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11314,11 +12156,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="setsmallbodyfont"/> - <cd:command file="font-ini.mkvi" name="setbigbodyfont"/> - <cd:command file="font-ini.mkvi" name="setmainbodyfont"/> - <cd:command file="font-ini.mkvi" name="restoreglobalbodyfont"/> - <cd:command file="font-ini.mkvi" name="predefinefont"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setsmallbodyfont"/> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setbigbodyfont"/> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setmainbodyfont"/> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="restoreglobalbodyfont"/> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="predefinefont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11328,28 +12170,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="predefinedfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="predefinedfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showbodyfont"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showbodyfont"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showbodyfontenvironment"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showbodyfontenvironment"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showfont"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> @@ -11359,7 +12201,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showfontstyle"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showfontstyle"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setupbodyfont"/> @@ -11386,88 +12228,87 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showligature"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showligature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showligatures"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showligatures"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showfontstrip"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showfontstrip"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showminimalbaseline"/> - <cd:command file="font-run.mkiv" name="showkerning"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showminimalbaseline"/> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showkerning"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showcharratio"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showcharratio"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showfontparameters"/> - <cd:command file="font-pre.mkiv" name="setsmallcaps"/> - <cd:command file="font-pre.mkiv" name="setoldstyle"/> - <cd:command file="font-pre.mkiv" name="settabular"/> - <cd:command file="font-pre.mkiv" name="setfractions"/> - <cd:command file="font-pre.mkiv" name="setsuperiors"/> - <cd:command file="font-pre.mkiv" name="tinyfont"/> - <cd:command file="font-pre.mkiv" name="infofont"/> - <cd:command file="font-pre.mkiv" name="infofontbold"/> - <cd:command file="font-pre.mkiv" name="smallbodyfont"/> - <cd:command file="font-pre.mkiv" name="bigbodyfont"/> - <cd:command file="font-pre.mkiv" name="smaller"/> - <cd:command file="font-pre.mkiv" name="bigger"/> - <cd:command file="font-pre.mkiv" name="normal"/> - <cd:command file="font-pre.mkiv" name="bold"/> - <cd:command file="font-pre.mkiv" name="mono"/> - <cd:command file="font-pre.mkiv" name="monobold"/> - <cd:command file="font-pre.mkiv" name="slanted"/> - <cd:command file="font-pre.mkiv" name="italic"/> - <cd:command file="font-pre.mkiv" name="boldslanted"/> - <cd:command file="font-pre.mkiv" name="slantedbold"/> - <cd:command file="font-pre.mkiv" name="bolditalic"/> - <cd:command file="font-pre.mkiv" name="italicbold"/> - <cd:command file="font-pre.mkiv" name="small"/> - <cd:command file="font-pre.mkiv" name="smallnormal"/> - <cd:command file="font-pre.mkiv" name="smallbold"/> - <cd:command file="font-pre.mkiv" name="smalltype"/> - <cd:command file="font-pre.mkiv" name="smallslanted"/> - <cd:command file="font-pre.mkiv" name="smallboldslanted"/> - <cd:command file="font-pre.mkiv" name="smallslantedbold"/> - <cd:command file="font-pre.mkiv" name="smallbolditalic"/> - <cd:command file="font-pre.mkiv" name="smallitalicbold"/> - <cd:command file="font-pre.mkiv" name="sans"/> - <cd:command file="font-pre.mkiv" name="sansserif"/> - <cd:command file="font-pre.mkiv" name="roman"/> - <cd:command file="font-pre.mkiv" name="serif"/> - <cd:command file="font-pre.mkiv" name="regular"/> - <cd:command file="font-pre.mkiv" name="handwritten"/> - <cd:command file="font-pre.mkiv" name="calligraphic"/> - <cd:command file="font-pre.mkiv" name="sansnormal"/> - <cd:command file="font-pre.mkiv" name="sansbold"/> - <cd:command file="font-pre.mkiv" name="serifnormal"/> - <cd:command file="font-pre.mkiv" name="serifbold"/> - <cd:command file="font-pre.mkiv" name="mononormal"/> - <cd:command file="font-pre.mkiv" name="monobold"/> - <cd:command file="font-sol.mkvi" name="definefontsolution"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showfontparameters"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="setsmallcaps"/> + <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="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"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="smallbodyfont"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="bigbodyfont"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="smaller"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="bigger"/> + <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"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="slantedbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="bolditalic"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="italicbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="small"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallnormal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smalltype"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallslanted"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallboldslanted"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallslantedbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallbolditalic"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallitalicbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="sans"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="sansserif"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="roman"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="serif"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="regular"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="handwritten"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="calligraphic"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="sansnormal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="sansbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="serifnormal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="serifbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="mononormal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="monobold"/> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="definefontsolution"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11480,7 +12321,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sol.mkvi" name="setupfontsolution"> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="setupfontsolution"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11511,22 +12352,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sol.mkvi" name="setfontsolution"> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="setfontsolution"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sol.mkvi" name="resetfontsolution"/> - <cd:command file="font-sol.mkvi" name="fontsolution" type="environment"> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="resetfontsolution"/> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="fontsolution" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="definealternativestyle"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="definealternativestyle"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -11539,16 +12380,26 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="applyalternativestyle"> + <cd:command category="fonts" file="font-sty.mkvi" level="system" name="applyalternativestyle"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="dontconvertfont"/> - <cd:command file="font-sty.mkvi" name="redoconvertfont"/> - <cd:command file="font-sty.mkvi" name="definestyle"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="setupalternativestyles"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="method"> + <cd:constant default="yes" type="normal"/> + <cd:constant type="auto"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="fonts" file="font-sty.mkvi" level="system" name="dontconvertfont"/> + <cd:command category="fonts" file="font-sty.mkvi" level="system" name="redoconvertfont"/> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="definestyle"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11561,7 +12412,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="setupstyle"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="setupstyle"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11580,14 +12431,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" generated="yes" name="style" type="environment" variant="example"> + <cd:command category="fonts" file="font-sty.mkvi" generated="yes" level="document" name="style" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="style"/> + <cd:instance value="style"/> </cd:sequence> </cd:command> - <cd:command file="font-sty.mkvi" generated="yes" name="style" variant="example"> + <cd:command category="fonts" file="font-sty.mkvi" generated="yes" level="document" name="style" variant="instance"> <cd:sequence> - <cd:variable value="style"/> + <cd:instance value="style"/> </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> @@ -11595,7 +12446,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="style" type="environment" variant="argument"> + <cd:command category="fonts" file="font-sty.mkvi" level="document" name="style" type="environment" variant="argument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11603,14 +12454,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="style" type="environment"> + <cd:command category="fonts" file="font-sty.mkvi" level="document" name="style" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="style" variant="argument"> + <cd:command category="fonts" file="font-sty.mkvi" level="document" name="style" variant="argument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11621,7 +12472,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="style"> + <cd:command category="fonts" file="font-sty.mkvi" level="document" name="style"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -11631,7 +12482,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="definestyleinstance"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="definestyleinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11658,14 +12509,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="styleinstance"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="styleinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="doifelseitalic"> + <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifelseitalic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11675,7 +12526,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="doifitalicelse"> + <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifitalicelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11685,28 +12536,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="getprivateslot"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="getprivateslot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="getprivatechar"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="getprivatechar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="glyphfontfile"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="glyphfontfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="getnamedglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="getnamedglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11716,7 +12567,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="getnamedglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="getnamedglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11726,7 +12577,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="getglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="getglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11737,7 +12588,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="getglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="getglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11748,34 +12599,50 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="resolvedglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="resolvedglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant method="range" prefix="e" type="cd:name"/> + <cd:constant method="range" prefix="x" type="cd:number"/> + <cd:constant method="range" prefix="d" type="cd:number"/> + <cd:constant method="range" prefix="s" type="cd:number"/> + <cd:constant method="range" prefix="i" type="cd:number"/> + <cd:constant method="range" prefix="n" type="cd:name"/> + <cd:constant method="range" prefix="c" type="cd:name"/> + <cd:constant method="range" prefix="u" type="cd:name"/> + <cd:constant method="range" prefix="a" type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="resolvedglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="resolvedglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant method="range" prefix="e" type="cd:name"/> + <cd:constant method="range" prefix="x" type="cd:number"/> + <cd:constant method="range" prefix="d" type="cd:number"/> + <cd:constant method="range" prefix="s" type="cd:number"/> + <cd:constant method="range" prefix="i" type="cd:number"/> + <cd:constant method="range" prefix="n" type="cd:name"/> + <cd:constant method="range" prefix="c" type="cd:name"/> + <cd:constant method="range" prefix="u" type="cd:name"/> + <cd:constant method="range" prefix="a" type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="setfont"> + <cd:command category="fonts" file="font-sym.mkvi" level="system" name="setfont"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="doifelsefontchar"> + <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifelsefontchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11791,7 +12658,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="doiffontcharelse"> + <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doiffontcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11807,15 +12674,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-tra.mkiv" name="showchardata"> + <cd:command category="fonts" file="font-tra.mkiv" level="document" name="showchardata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-tra.mkiv" name="showfontdata"/> - <cd:command file="font-tra.mkiv" name="doifelsefontpresent"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11828,7 +12695,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-tra.mkiv" name="doiffontpresentelse"> + <cd:command category="fonts conditional" file="font-tra.mkiv" level="system" name="doiffontpresentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11841,7 +12708,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-tra.mkiv" name="showotfcomposition"> + <cd:command category="fonts" file="font-tra.mkiv" level="document" name="showotfcomposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11858,23 +12725,23 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-var.mkvi" name="fontclass"/> - <cd:command file="font-var.mkvi" name="fontbody"/> - <cd:command file="font-var.mkvi" name="fontstyle"/> - <cd:command file="font-var.mkvi" name="fontalternative"/> - <cd:command file="font-var.mkvi" name="fontsize"/> - <cd:command file="font-var.mkvi" name="fontface"/> - <cd:command file="type-ini.mkvi" name="typescriptone"/> - <cd:command file="type-ini.mkvi" name="typescripttwo"/> - <cd:command file="type-ini.mkvi" name="typescriptthree"/> - <cd:command file="type-ini.mkvi" name="typescriptcollection" type="environment"> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontclass"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontbody"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontstyle"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontalternative"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontsize"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontface"/> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="typescriptone"/> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="typescripttwo"/> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="typescriptthree"/> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="typescriptcollection" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="usetypescriptfile"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="usetypescriptfile"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -11882,7 +12749,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="usetypescript"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="usetypescript"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="serif"/> @@ -11907,15 +12774,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="loadtypescriptfile"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="loadtypescriptfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="quittypescriptscanning"/> - <cd:command file="type-ini.mkvi" name="definetypescriptsynonym"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="quittypescriptscanning"/> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="definetypescriptsynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11925,7 +12792,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="typescript" type="environment"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="typescript" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="serif"/> @@ -11944,7 +12811,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="definetypescriptprefix"> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="definetypescriptprefix"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11954,14 +12821,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="typescriptprefix"> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="typescriptprefix"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="definetypeface"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="definetypeface"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12013,7 +12880,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="hand-ini.mkiv" name="setupfontexpansion"> + <cd:command category="fonts" file="hand-ini.mkiv" level="style" name="setupfontexpansion"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12037,7 +12904,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="hand-ini.mkiv" name="setupfontprotrusion"> + <cd:command category="fonts" file="hand-ini.mkiv" level="style" name="setupfontprotrusion"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12058,16 +12925,23 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkiv" name="blockligatures"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="blockligatures"> <cd:arguments> - <cd:keywords> - <cd:constant type="cd:list"/> + <cd:keywords list="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="addfontpath"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="cd:path"/> </cd:keywords> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-form.xml"> - <cd:command file="scrn-fld.mkvi" name="setupforms"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="setupforms"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -12084,7 +12958,7 @@ </cd:command> </cd:interface> <cd:interface file="i-formula.xml"> - <cd:command file="math-for.mkiv" name="defineformula"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="defineformula"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12097,7 +12971,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" name="setupformula"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="setupformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12116,6 +12990,11 @@ <cd:constant type="flushright"/> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="split"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="page"/> + </cd:parameter> <cd:parameter name="strut"> <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> @@ -12153,6 +13032,11 @@ <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="depth"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> <cd:inherit name="setupbodyfont"/> </cd:parameter> <cd:parameter name="margin"> @@ -12181,11 +13065,41 @@ <cd:parameter name="frame"> <cd:constant type="number"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant default="yes" type="none"/> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:constant type="+"/> + <cd:constant type="-"/> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="catcodes"> + <cd:constant type="cd:name"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" name="definesubformula"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="setupformulas"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupformula"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="definesubformula"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12198,7 +13112,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" name="setupsubformula"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="setupsubformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12212,9 +13126,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" generated="yes" name="formula" type="environment" variant="example"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="setupsubformulas"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupsubformula"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="strc-mat.mkiv" generated="yes" level="document" name="formula" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="formula"/> + <cd:instance value="formula"/> <cd:string value="formula"/> </cd:sequence> <cd:arguments> @@ -12223,6 +13147,11 @@ <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="depth"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> @@ -12233,62 +13162,50 @@ <cd:constant value="md"/> </cd:instances> </cd:command> - <cd:command file="strc-mat.mkiv" name="formula" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="packed"/> - <cd:constant type="tight"/> - <cd:constant type="middle"/> - <cd:constant type="frame"/> - <cd:inherit name="setupbodyfont"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="strc-mat.mkiv" name="spformula" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="packed"/> - <cd:constant type="tight"/> - <cd:constant type="middle"/> - <cd:constant type="frame"/> - <cd:inherit name="setupbodyfont"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="strc-mat.mkiv" name="sdformula" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="packed"/> - <cd:constant type="tight"/> - <cd:constant type="middle"/> - <cd:constant type="frame"/> - <cd:inherit name="setupbodyfont"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="strc-mat.mkiv" name="mpformula" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="formula" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="packed"/> <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="depth"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="mdformula" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="formula" type="environment" variant="assignment"> <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="packed"/> - <cd:constant type="tight"/> - <cd:constant type="middle"/> - <cd:constant type="frame"/> - <cd:inherit name="setupbodyfont"/> - </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="option"> + <cd:constant type="packed"/> + <cd:constant type="tight"/> + <cd:constant type="middle"/> + <cd:constant type="frame"/> + <cd:constant type="depth"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> + <cd:inherit name="setupbodyfont"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="snaptogrid"/> + </cd:parameter> + </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="defineformulaalternative"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="system" name="defineformulaalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12301,20 +13218,25 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="formula"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="formula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="packed"/> <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="depth"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> <cd:inherit name="setupbodyfont"/> </cd:keywords> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="displaymath" type="environment"/> - <cd:command file="strc-mat.mkiv" name="formulas" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="system" name="displaymath" type="environment"/> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="formulas" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12323,7 +13245,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="subformulas" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="subformulas" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12332,7 +13254,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="namedsubformulas" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="namedsubformulas" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12344,7 +13266,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placeformula"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12353,7 +13275,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placeformula" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="title"> @@ -12370,7 +13292,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placeformula" type="environment" variant="argument"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula" type="environment" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12379,7 +13301,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placenamedformula"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placenamedformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12391,7 +13313,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placesubformula"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placesubformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12400,17 +13322,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat" name="formulanumber"> + <cd:command category="mathematics" file="strc-mat" level="document" name="formulanumber"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat" name="placecurrentformulanumber"/> + <cd:command category="mathematics" file="strc-mat" level="system" name="placecurrentformulanumber"/> + <cd:command category="mathematics" file="strc-mat" level="document" name="alignhere" scope="formula"/> + <cd:command category="mathematics" file="strc-mat" level="document" name="breakhere" scope="formula"/> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="splitformula" type="environment"/> </cd:interface> <cd:interface file="i-fraction.xml"> - <cd:command file="math-frc.mkiv" name="definemathfraction"> + <cd:command category="mathematics" file="math-frc.mkiv" level="style" name="definemathfraction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12423,7 +13348,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-frc.mkiv" name="setupmathfraction"> + <cd:command category="mathematics" file="math-frc.mkiv" level="style" name="setupmathfraction"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12475,12 +13400,33 @@ <cd:constant default="yes" type="none"/> <cd:constant type="overlay"/> </cd:parameter> + <cd:parameter name="inlinethreshold"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="displaythreshold"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="fences"> + <cd:constant type="cd:name"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-frc.mkiv" level="style" name="setupmathfractions"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupmathfraction"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-frc.mkiv" generated="yes" name="fraction" variant="example"> + <cd:command category="mathematics" file="math-frc.mkiv" generated="yes" level="document" name="fraction" variant="instance"> <cd:sequence> - <cd:variable value="fraction"/> + <cd:instance value="fraction"/> </cd:sequence> <cd:arguments> <cd:content/> @@ -12497,73 +13443,19 @@ <cd:constant value="tbinom"/> </cd:instances> </cd:command> - <cd:command file="math-frc.mkiv" name="frac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="xfrac"> + <cd:command category="mathematics" file="math-frc.mkiv" level="document" name="splitfrac"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-frc.mkiv" name="xxfrac"> + <cd:command category="mathematics" file="math-frc.mkiv" level="document" name="splitdfrac"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-frc.mkiv" name="tfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="sfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="dfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="binom"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="dbinom"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="tbinom"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="splitfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="splitdfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="cfrac"> + <cd:command category="mathematics" file="math-frc.mkiv" level="document" name="cfrac"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="l"/> @@ -12585,7 +13477,7 @@ </cd:command> </cd:interface> <cd:interface file="i-framed.xml"> - <cd:command file="pack-rul.mkiv" name="defineframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12598,7 +13490,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="setupframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12794,21 +13686,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="frameddimension"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="frameddimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="framedparameter"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="framedparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="framed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="framed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -12816,9 +13708,9 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" name="framed" variant="example"> + <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framed" variant="instance"> <cd:sequence> - <cd:variable value="framed"/> + <cd:instance value="framed"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -12831,7 +13723,7 @@ <cd:constant value="fitfieldframed"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" name="normalframedwithsettings"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="normalframedwithsettings"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupframed"/> @@ -12839,7 +13731,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="framed" type="environment"> + <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="framed" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -12849,7 +13741,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="fastlocalframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="fastlocalframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12860,7 +13752,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="localframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="localframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12871,7 +13763,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="directlocalframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="directlocalframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12879,7 +13771,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="localframedwithsettings"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="localframedwithsettings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12890,7 +13782,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="placeframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="placeframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12901,15 +13793,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="inframed"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="unframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="inframed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -12917,7 +13801,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="definemathframed"> + <cd:command category="background rules mathematics" file="pack-rul.mkiv" level="style" name="definemathframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12930,7 +13814,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="setupmathframed"> + <cd:command category="background rules mathematics" file="pack-rul.mkiv" level="style" name="setupmathframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12940,9 +13824,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" name="mathframed" variant="example"> + <cd:command category="background rules mathematics" file="pack-rul.mkiv" generated="yes" level="document" name="mathframed" variant="instance"> <cd:sequence> - <cd:variable value="mathframed"/> + <cd:instance value="mathframed"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -12956,31 +13840,7 @@ <cd:constant value="mcframed"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" name="mframed"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="inmframed"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="mcframed"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-for.mkiv" name="defineformulaframed"> + <cd:command category="background rules mathematics" file="math-for.mkiv" level="style" name="defineformulaframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12993,7 +13853,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" name="setupformulaframed"> + <cd:command category="background rules mathematics" file="math-for.mkiv" level="style" name="setupformulaframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13003,7 +13863,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="defineframedtext"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13016,7 +13876,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="setupframedtext"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13059,9 +13919,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" name="framedtext" variant="example"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedtexts"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframedtext"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" variant="instance"> <cd:sequence> - <cd:variable value="framedtext"/> + <cd:instance value="framedtext"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -13073,9 +13943,9 @@ <cd:constant value="framedtext"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" name="framedtext" type="environment" variant="example"> + <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="framedtext"/> + <cd:instance value="framedtext"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -13092,28 +13962,7 @@ <cd:constant value="framedtext"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" name="framedtext"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="framedtext" type="environment"> - <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 file="pack-rul.mkiv" name="defineframedcontent"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframedcontent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13126,7 +13975,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="setupframedcontent"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedcontent"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13158,7 +14007,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="framedcontent" type="environment"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="framedcontent" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -13166,7 +14015,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" name="installleftframerenderer"> + <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installleftframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13176,7 +14025,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" name="installrightframerenderer"> + <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installrightframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13186,7 +14035,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" name="installtopframerenderer"> + <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installtopframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13196,7 +14045,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" name="installbottomframerenderer"> + <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installbottomframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13207,8 +14056,94 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-framedtable.xml"> + <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="defineframedtable"> + <cd:arguments> + <cd:keywords> + <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="tables" file="tabl-frm.mkiv" level="style" name="setupframedtable"> + <cd:arguments> + <cd:keywords 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="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtablerow"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords> + <cd:constant type="cd:number"/> + <cd:constant type="each"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtablecolumn"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords> + <cd:constant type="cd:number"/> + <cd:constant type="each"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedtable" type="environment"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <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="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:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-graphics.xml"> - <cd:command file="grph-inc.mkiv" name="defineexternalfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="defineexternalfigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13221,7 +14156,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkvi" name="setupexternalfigure"> + <cd:command category="graphics" file="grph-inc.mkvi" level="style" name="setupexternalfigure"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13373,9 +14308,6 @@ <cd:parameter name="backgroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> <cd:parameter name="xmax"> <cd:constant type="cd:number"/> </cd:parameter> @@ -13431,7 +14363,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="useexternalfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="useexternalfigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13447,7 +14379,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="document" name="externalfigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -13460,7 +14392,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="getfiguredimensions"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="getfiguredimensions"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -13470,16 +14402,16 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="figurewidth"/> - <cd:command file="grph-inc.mkiv" name="figureheight"/> - <cd:command file="grph-inc.mkiv" name="figurenaturalwidth"/> - <cd:command file="grph-inc.mkiv" name="figurenaturalheight"/> - <cd:command file="grph-inc.mkiv" name="figurefullname"/> - <cd:command file="grph-inc.mkiv" name="figurefilename"/> - <cd:command file="grph-inc.mkiv" name="figurefilepath"/> - <cd:command file="grph-inc.mkiv" name="figurefiletype"/> - <cd:command file="grph-inc.mkiv" name="noffigurepages"/> - <cd:command file="grph-inc.mkiv" name="definegraphictypesynonym"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurewidth"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figureheight"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurenaturalwidth"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurenaturalheight"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurefullname"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurefilename"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurefilepath"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurefiletype"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="noffigurepages"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="definegraphictypesynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13489,7 +14421,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="doifelsefigure"> + <cd:command category="graphics conditional" file="grph-inc.mkiv" level="system" name="doifelsefigure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -13502,7 +14434,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="doiffigureelse"> + <cd:command category="graphics conditional" file="grph-inc.mkiv" level="system" name="doiffigureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -13515,7 +14447,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="registerexternalfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="registerexternalfigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -13528,7 +14460,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="usefigurebase"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="usefigurebase"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -13536,42 +14468,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollection" type="environment"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollection" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionminwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollectionminwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionmaxwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollectionmaxwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionminheight"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollectionminheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionmaxheight"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollectionmaxheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionparameter"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="externalfigurecollectionparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13581,35 +14513,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcminwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcminwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcmaxwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcmaxwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcminheight"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcminheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcmaxheight"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcmaxheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcparameter"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13619,14 +14551,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="overlayfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="overlayfigure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="bitmapimage"> + <cd:command category="graphics" file="grph-inc.mkiv" level="document" name="bitmapimage"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -13652,7 +14584,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="bitmapimage" type="environment"> + <cd:command category="graphics" file="grph-inc.mkiv" level="document" name="bitmapimage" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -13675,7 +14607,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="typesetbuffer"> + <cd:command category="graphics buffer" file="grph-fig.mkiv" level="document" name="typesetbuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="*"/> @@ -13686,7 +14618,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="definetypesetting"> + <cd:command category="graphics structure" file="grph-fig.mkiv" level="style" name="definetypesetting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13699,7 +14631,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="typesetfile"> + <cd:command category="graphics structure" file="grph-fig.mkiv" level="document" name="typesetfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13714,7 +14646,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="backgroundimage"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="backgroundimage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -13730,7 +14662,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="backgroundimagefill"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="backgroundimagefill"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -13748,7 +14680,7 @@ </cd:command> </cd:interface> <cd:interface file="i-grid.xml"> - <cd:command file="page-grd.mkiv" name="showgrid"> + <cd:command category="layout" file="page-grd.mkiv" level="document" name="showgrid"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -13766,7 +14698,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="definegridsnapping"> + <cd:command category="layout" file="spac-ver.mkiv" level="style" name="definegridsnapping"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13803,7 +14735,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="snaptogrid"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="snaptogrid"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="normal"/> @@ -13828,13 +14760,18 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant method="range" prefix="math" type="line"/> + <cd:constant method="range" prefix="math" type="halfline"/> + <cd:constant method="range" prefix="math" type="-line"/> + <cd:constant method="range" prefix="math" type="-halfline"/> <cd:constant type="cd:name"/> </cd:keywords> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="snaptogrid" variant="list"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="snaptogrid" variant="list"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -13843,7 +14780,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="placeongrid"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="placeongrid"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="normal"/> @@ -13868,12 +14805,17 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant method="range" prefix="math" type="line"/> + <cd:constant method="range" prefix="math" type="halfline"/> + <cd:constant method="range" prefix="math" type="-line"/> + <cd:constant method="range" prefix="math" type="-halfline"/> <cd:constant type="cd:name"/> </cd:keywords> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="placeongrid" variant="list"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="placeongrid" variant="list"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -13881,7 +14823,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="gridsnapping" type="environment"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="gridsnapping" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="normal"/> @@ -13906,24 +14848,29 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant method="range" prefix="math" type="line"/> + <cd:constant method="range" prefix="math" type="halfline"/> + <cd:constant method="range" prefix="math" type="-line"/> + <cd:constant method="range" prefix="math" type="-halfline"/> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="gridsnapping" type="environment" variant="list"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="gridsnapping" type="environment" variant="list"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="usegridparameter"> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="usegridparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="showgridsnapping"/> - <cd:command file="meta-grd.mkiv" name="basegrid"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="showgridsnapping"/> + <cd:command category="graphics" file="meta-grd.mkiv" level="document" name="basegrid"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -13980,7 +14927,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-grd.mkiv" name="grid"> + <cd:command category="graphics" file="meta-grd.mkiv" level="document" name="grid"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="basegrid"/> @@ -13989,7 +14936,7 @@ </cd:command> </cd:interface> <cd:interface file="i-help.xml"> - <cd:command file="scrn-hlp.mkvi" name="definehelp"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="style" name="definehelp"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14002,7 +14949,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="setuphelp"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="style" name="setuphelp"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14012,9 +14959,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" generated="yes" name="help" variant="example"> + <cd:command category="pdf" file="scrn-hlp.mkvi" generated="yes" level="document" name="help" variant="instance"> <cd:sequence> - <cd:variable value="help"/> + <cd:instance value="help"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -14031,9 +14978,9 @@ <cd:constant value="helptext"/> </cd:instances> </cd:command> - <cd:command file="scrn-hlp.mkvi" generated="yes" name="help" type="environment" variant="example"> + <cd:command category="pdf" file="scrn-hlp.mkvi" generated="yes" level="document" name="help" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="help"/> + <cd:instance value="help"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -14044,7 +14991,7 @@ <cd:constant value="helptext"/> </cd:instances> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="doifelsehelp"> + <cd:command category="pdf conditional" file="scrn-hlp.mkvi" level="system" name="doifelsehelp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -14054,7 +15001,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="doifhelpelse"> + <cd:command category="pdf conditional" file="scrn-hlp.mkvi" level="system" name="doifhelpelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -14064,8 +15011,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="placehelp"/> - <cd:command file="scrn-hlp.mkvi" name="showhelp"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="document" name="placehelp"/> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="document" name="showhelp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -14075,7 +15022,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="helptext"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="document" name="helptext"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:reference"/> @@ -14088,7 +15035,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="helptext" type="environment"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="document" name="helptext" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:reference"/> @@ -14097,7 +15044,7 @@ </cd:command> </cd:interface> <cd:interface file="i-highlight.xml"> - <cd:command file="core-sys.mkiv" name="definehighlight"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="style" name="definehighlight"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14110,7 +15057,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="setuphighlight"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="style" name="setuphighlight"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14130,7 +15077,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" generated="yes" name="highlight" variant="example"> + <cd:command category="fonts colors" file="core-sys.mkiv" generated="yes" level="document" name="highlight" variant="example"> <cd:sequence> <cd:variable value="highlight"/> </cd:sequence> @@ -14140,7 +15087,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="highlight"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="highlight"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14150,14 +15097,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="highlight" type="environment"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="highlight" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="directhighlight"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="directhighlight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14169,7 +15116,7 @@ </cd:command> </cd:interface> <cd:interface file="i-hspace.xml"> - <cd:command file="spac-hor.mkiv" name="definehspace"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="definehspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14182,7 +15129,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="hspace"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="document" name="hspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14208,22 +15155,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="hairspace"/> - <cd:command file="spac-hor.mkiv" name="thinspace"/> - <cd:command file="spac-hor.mkiv" name="medspace"/> - <cd:command file="spac-hor.mkiv" name="thickspace"/> - <cd:command file="spac-hor.mkiv" name="autoinsertnextspace"/> - <cd:command file="spac-ver.mkiv" name="hglue"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="hairspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="thinspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="medspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="thickspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="autoinsertnextspace"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="hglue"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="frenchspacing"/> - <cd:command file="spac-hor.mkiv" name="newfrenchspacing"/> - <cd:command file="spac-hor.mkiv" name="nonfrenchspacing"/> - <cd:command file="spac-hor.mkiv" name="setupspacing"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="frenchspacing"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="newfrenchspacing"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="nonfrenchspacing"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="setupspacing"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="fixed"/> @@ -14232,30 +15179,30 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="space"/> - <cd:command file="spac-hor.mkiv" name="removelastspace"/> - <cd:command file="spac-hor.mkiv" name="nospace"/> - <cd:command file="spac-hor.mkiv" name="fixedspace"/> - <cd:command file="spac-hor.mkiv" name="fixedspaces"/> - <cd:command file="spac-hor.mkiv" name="keepunwantedspaces"/> - <cd:command file="spac-hor.mkiv" name="removeunwantedspaces"/> - <cd:command file="spac-hor.mkiv" name="thinspace"/> - <cd:command file="spac-hor.mkiv" name="negthinspace"/> - <cd:command file="spac-hor.mkiv" name="enspace"/> - <cd:command file="spac-hor.mkiv" name="enskip"/> - <cd:command file="spac-hor.mkiv" name="quad"/> - <cd:command file="spac-hor.mkiv" name="qquad"/> - <cd:command file="spac-hor.mkiv" name="emspace"/> - <cd:command file="spac-hor.mkiv" name="dotfskip"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="space"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="removelastspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="nospace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="document" name="fixedspace"/> + <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="enskip"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="quad"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="qquad"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="emspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="dotfskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="leftskipadaption"/> - <cd:command file="spac-hor.mkiv" name="rightskipadaption"/> - <cd:command file="spac-hor.mkiv" name="dosetleftskipadaption"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -14265,7 +15212,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="dosetrightskipadaption"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="dosetrightskipadaption"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -14275,7 +15222,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="doadaptleftskip"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="doadaptleftskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -14285,7 +15232,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="doadaptrightskip"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="doadaptrightskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -14295,7 +15242,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="activatespacehandler"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="activatespacehandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="on"/> @@ -14305,7 +15252,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="quads"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="quads"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -14314,7 +15261,7 @@ </cd:command> </cd:interface> <cd:interface file="i-hyphenation.xml"> - <cd:command file="lang-hyp.mkiv" name="setuphyphenation"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="setuphyphenation"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -14329,7 +15276,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="hyphenation" type="environment"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="hyphenation" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="original"/> @@ -14342,7 +15289,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="definehypenationfeatures"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="definehypenationfeatures"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14397,7 +15344,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="sethyphenationfeatures"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="sethyphenationfeatures"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14405,8 +15352,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="resethyphenationfeatures"/> - <cd:command file="lang-hyp.mkiv" name="registerhyphenationpattern"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="resethyphenationfeatures"/> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="registerhyphenationpattern"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -14416,7 +15363,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="unregisterhyphenationpattern"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="unregisterhyphenationpattern"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -14426,7 +15373,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="showhyphenationtrace"> + <cd:command category="language" file="lang-hyp.mkiv" level="document" name="showhyphenationtrace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -14436,7 +15383,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="registerhyphenationexception"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="registerhyphenationexception"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -14446,7 +15393,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="setuphyphenmark"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="setuphyphenmark"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="sign"> @@ -14456,14 +15403,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" name="definebreakpoints"> + <cd:command category="language" file="typo-brk.mkiv" level="style" name="definebreakpoints"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" name="definebreakpoint"> + <cd:command category="language" file="typo-brk.mkiv" level="style" name="definebreakpoint"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14504,7 +15451,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" name="setbreakpoints"> + <cd:command category="language" file="typo-brk.mkiv" level="style" name="setbreakpoints"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -14512,76 +15459,76 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" name="resetbreakpoints"/> - <cd:command file="supp-box.mkiv" name="showhyphens"> + <cd:command category="language" file="typo-brk.mkiv" level="style" name="resetbreakpoints"/> + <cd:command category="language" file="supp-box.mkiv" level="document" name="showhyphens"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedword"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedword"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedpar"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedpar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedfile"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedcoloredword"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedcoloredword"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedhbox"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="sethyphenatedurlbefore"> + <cd:command category="language" file="lang-url.mkiv" level="style" name="sethyphenatedurlbefore"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="sethyphenatedurlafter"> + <cd:command category="language" file="lang-url.mkiv" level="style" name="sethyphenatedurlafter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="sethyphenatedurlnormal"> + <cd:command category="language" file="lang-url.mkiv" level="style" name="sethyphenatedurlnormal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="hyphenatedurl"> + <cd:command category="language" file="lang-url.mkiv" level="document" name="hyphenatedurl"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="hyphenatedfilename"> + <cd:command category="language" file="lang-url.mkiv" level="document" name="hyphenatedfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -14590,7 +15537,7 @@ </cd:command> </cd:interface> <cd:interface file="i-imposition.xml"> - <cd:command file="page-imp.mkiv" name="installshipoutmethod"> + <cd:command category="layout" file="page-imp.mkiv" level="system" name="installshipoutmethod"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14600,7 +15547,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" name="invokepageheandler"> + <cd:command category="layout" file="page-imp.mkiv" level="system" name="invokepageheandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> @@ -14610,7 +15557,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" name="setuparranging"> + <cd:command category="layout" file="page-imp.mkiv" level="style" name="setuparranging"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="disable"/> @@ -14655,7 +15602,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" name="installpagearrangement"> + <cd:command category="layout" file="page-imp.mkiv" level="system" name="installpagearrangement"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -14665,10 +15612,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="page-imp.mkiv" name="arrangedpages" type="environment"/> + <cd:command begin="push" category="layout" end="pop" file="page-imp.mkiv" level="system" name="arrangedpages" type="environment"/> </cd:interface> <cd:interface file="i-indent.xml"> - <cd:command file="spac-hor.mkiv" name="defineindenting"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="defineindenting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14694,7 +15641,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="setupindenting"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="setupindenting"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant method="none" prefix="cd:sign" type="small"/> @@ -14718,16 +15665,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="synchronizeindenting"/> - <cd:command file="spac-hor.mkiv" name="useindentingparameter"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="synchronizeindenting"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="useindentingparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command coreprimitive="yes" file="spac-hor.mkiv" name="indentation"/> - <cd:command coreprimitive="yes" file="spac-hor.mkiv" name="noindentation"/> - <cd:command coreprimitive="yes" file="spac-hor.mkiv" name="doindentation"/> - <cd:command file="spac-hor.mkiv" name="checknextindentation"> + <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="document" name="indentation"/> + <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="document" name="noindentation"/> + <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="system" name="doindentation"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="checknextindentation"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -14736,16 +15683,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="useindentnextparameter"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="useindentnextparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="dorechecknextindentation"/> - <cd:command begin="push" end="pop" file="spac-hor.mkiv" name="indentation" type="environment"/> + <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:interface> <cd:interface file="i-indentedtext.xml"> - <cd:command file="strc-ind.mkiv" name="defineindentedtext"> + <cd:command category="structure" file="strc-ind.mkiv" level="style" name="defineindentedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14758,7 +15705,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ind.mkiv" name="setupindentedtext"> + <cd:command category="structure" file="strc-ind.mkiv" level="style" name="setupindentedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14804,12 +15751,12 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ind.mkiv" generated="yes" name="indentedtext" type="environment" variant="example"> + <cd:command category="structure" file="strc-ind.mkiv" generated="yes" level="document" name="indentedtext" type="environment" variant="example"> <cd:sequence> <cd:variable value="indentedtext"/> </cd:sequence> </cd:command> - <cd:command file="strc-ind.mkiv" name="indentedtext" type="environment"> + <cd:command category="structure" file="strc-ind.mkiv" level="document" name="indentedtext" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14818,7 +15765,7 @@ </cd:command> </cd:interface> <cd:interface file="i-initial.xml"> - <cd:command file="typo-drp.mkiv" name="defineinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" level="style" name="defineinitial"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14831,7 +15778,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-drp.mkiv" name="setupinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" level="style" name="setupinitial"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14882,14 +15829,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-drp.mkiv" name="placeinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" level="document" name="placeinitial"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-drp.mkiv" name="setinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" level="document" name="setinitial"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14901,42 +15848,42 @@ </cd:command> </cd:interface> <cd:interface file="i-injector.xml"> - <cd:command file="typo-inj.mkiv" name="resetinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="resetinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="markinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="markinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="checkinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="checkinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="checkpreviousinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="checkpreviousinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="checknextinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="checknextinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="setinjector"> + <cd:command file="typo-inj.mkiv" level="document" name="setinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14949,7 +15896,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="showinjector"> + <cd:command file="typo-inj.mkiv" level="document" name="showinjector"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14958,7 +15905,7 @@ </cd:command> </cd:interface> <cd:interface file="i-insertion.xml"> - <cd:command file="page-ins.mkiv" name="defineinsertion"> + <cd:command category="structure" file="page-ins.mkiv" level="system" name="defineinsertion"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14971,7 +15918,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" name="setupinsertion"> + <cd:command category="structure" file="page-ins.mkiv" level="system" name="setupinsertion"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14987,7 +15934,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" name="doifelseinsertion"> + <cd:command category="structure conditional" file="page-ins.mkiv" level="system" name="doifelseinsertion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15000,7 +15947,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" name="doifinsertionelse"> + <cd:command category="structure conditional" file="page-ins.mkiv" level="system" name="doifinsertionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15015,7 +15962,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interaction.xml"> - <cd:command file="scrn-ini.mkvi" name="defineinteraction"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="style" name="defineinteraction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15028,7 +15975,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="setupinteraction"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="style" name="setupinteraction"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15126,14 +16073,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="setupinteraction" variant="name"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="style" name="setupinteraction" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="interaction" type="environment"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="system" name="interaction" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="hidden"/> @@ -15141,7 +16088,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="setinteraction"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="system" name="setinteraction"> <cd:arguments> <cd:keywords> <cd:constant type="hidden"/> @@ -15149,7 +16096,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="doifelselocation"> + <cd:command category="pdf conditional" file="scrn-ini.mkvi" level="system" name="doifelselocation"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -15159,7 +16106,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="doiflocationelse"> + <cd:command category="pdf conditional" file="scrn-ini.mkvi" level="system" name="doiflocationelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -15171,7 +16118,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionbar.xml"> - <cd:command file="scrn-bar.mkvi" name="defineinteractionbar"> + <cd:command category="pdf" file="scrn-bar.mkvi" level="style" name="defineinteractionbar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15184,7 +16131,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-bar.mkvi" name="setupinteractionbar"> + <cd:command category="pdf" file="scrn-bar.mkvi" level="style" name="setupinteractionbar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15247,7 +16194,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-bar.mkvi" name="interactionbar"> + <cd:command category="pdf" file="scrn-bar.mkvi" level="style" name="interactionbar"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -15257,7 +16204,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-bar.mkvi" name="interactionbuttons"> + <cd:command category="pdf" file="scrn-bar.mkvi" level="style" name="interactionbuttons"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupinteractionbar"/> @@ -15271,7 +16218,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionmenu.xml"> - <cd:command file="scrn-but.mkvi" name="defineinteractionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="defineinteractionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15284,7 +16231,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="setupinteractionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="setupinteractionmenu"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15395,28 +16342,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="interactionmenu" type="environment"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="interactionmenu" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="resetinteractionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="resetinteractionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="includemenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="includemenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="interactionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="interactionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15426,7 +16373,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="menubutton" variant="interactionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="menubutton" variant="interactionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15442,7 +16389,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="menubutton" variant="button"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="menubutton" variant="button"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -15455,7 +16402,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="registermenubuttons"> + <cd:command category="pdf" file="scrn-but.mkvi" level="system" name="registermenubuttons"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15467,7 +16414,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionscreen.xml"> - <cd:command file="scrn-pag.mkvi" name="setupinteractionscreen"> + <cd:command category="pdf" file="scrn-pag.mkvi" level="style" name="setupinteractionscreen"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -15508,10 +16455,15 @@ <cd:constant type="portrait"/> <cd:constant type="page"/> <cd:constant type="paper"/> + <cd:constant type="attachment"/> + <cd:constant type="layer"/> </cd:parameter> <cd:parameter name="copies"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="print"> + <cd:constant type="cd:list"/> + </cd:parameter> <cd:parameter name="delay"> <cd:constant default="yes" type="none"/> <cd:constant type="cd:number"/> @@ -15519,7 +16471,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-pag.mkvi" name="screen"> + <cd:command category="pdf" file="scrn-pag.mkvi" level="document" name="screen"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="page"/> @@ -15528,10 +16480,10 @@ </cd:command> </cd:interface> <cd:interface file="i-interface.xml"> - <cd:command file="mult-ini.mkiv" name="defaultinterface"/> - <cd:command file="mult-ini.mkiv" name="currentinterface"/> - <cd:command file="mult-ini.mkiv" name="currentresponses"/> - <cd:command file="mult-ini.mkiv" name="interface" type="environment"> + <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:arguments> <cd:keywords delimiters="none"> <cd:constant type="all"/> @@ -15539,7 +16491,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="defineinterfaceconstant"> + <cd:command file="mult-ini.mkiv" level="system" name="defineinterfaceconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15549,7 +16501,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="defineinterfacevariable"> + <cd:command file="mult-ini.mkiv" level="system" name="defineinterfacevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15559,7 +16511,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="defineinterfaceelement"> + <cd:command file="mult-ini.mkiv" level="system" name="defineinterfaceelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15569,7 +16521,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="definefileconstant"> + <cd:command file="mult-ini.mkiv" level="system" name="definefileconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15579,28 +16531,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="definesystemconstant"> + <cd:command 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" name="definemessageconstant"> + <cd:command 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" name="definesystemvariable"> + <cd:command 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" name="setinterfacemessage"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfacemessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15615,7 +16567,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setmessagetext"> + <cd:command file="mult-ini.mkiv" level="system" name="setmessagetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15626,8 +16578,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="currentmessagetext"/> - <cd:command file="mult-ini.mkiv" name="getmessage"> + <cd:command file="mult-ini.mkiv" level="system" name="currentmessagetext"/> + <cd:command file="mult-ini.mkiv" level="system" name="getmessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15638,7 +16590,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="doifelsemessage"> + <cd:command file="mult-ini.mkiv" level="system" name="doifelsemessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15655,7 +16607,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="doifmessageelse"> + <cd:command file="mult-ini.mkiv" level="system" name="doifmessageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15672,7 +16624,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="showmessage"> + <cd:command file="mult-ini.mkiv" level="system" name="showmessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15686,7 +16638,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="writestatus"> + <cd:command file="mult-ini.mkiv" level="system" name="writestatus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -15696,28 +16648,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="message"> + <cd:command 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" name="inlinemessage"> + <cd:command 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" name="displaymessage"> + <cd:command 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" name="showwarning"> + <cd:command file="mult-ini.mkiv" level="system" name="showwarning"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15731,7 +16683,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfaceconstant"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfaceconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15741,7 +16693,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfacevariable"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfacevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15751,7 +16703,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfaceelements"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfaceelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15761,7 +16713,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfacecommand"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfacecommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15773,7 +16725,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interlinespace.xml"> - <cd:command file="spac-ver.mkiv" name="defineinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="defineinterlinespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15786,7 +16738,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace"> + <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"/> @@ -15826,7 +16778,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace" variant="argument"> + <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"/> @@ -15841,14 +16793,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace" variant="name"> + <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 file="spac-ver.mkiv" name="setuplocalinterlinespace"> + <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"/> @@ -15858,7 +16810,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setuplocalinterlinespace" variant="argument"> + <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"/> @@ -15873,14 +16825,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setuplocalinterlinespace" variant="name"> + <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 file="spac-ver.mkiv" name="switchtointerlinespace"> + <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"/> @@ -15890,7 +16842,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace" variant="argument"> + <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"/> @@ -15905,21 +16857,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace" variant="name"> + <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 file="spac-ver.mkiv" name="dosetupcheckedinterlinespace"> + <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 file="spac-ver.mkiv" name="dosetupcheckedinterlinespace" variant="argument"> + <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"/> @@ -15934,21 +16886,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="dosetupcheckedinterlinespace" variant="name"> + <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 file="spac-ver.mkiv" name="useinterlinespaceparameter"> + <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-interlinespace.xml"> - <cd:command file="spac-ver.mkiv" name="defineinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="defineinterlinespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15961,7 +16913,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace"> + <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"/> @@ -16001,7 +16953,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace" variant="argument"> + <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"/> @@ -16016,14 +16968,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace" variant="name"> + <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 file="spac-ver.mkiv" name="setuplocalinterlinespace"> + <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"/> @@ -16033,7 +16985,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setuplocalinterlinespace" variant="argument"> + <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"/> @@ -16048,14 +17000,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setuplocalinterlinespace" variant="name"> + <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 file="spac-ver.mkiv" name="switchtointerlinespace"> + <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"/> @@ -16065,7 +17017,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace" variant="argument"> + <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"/> @@ -16080,21 +17032,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace" variant="name"> + <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 file="spac-ver.mkiv" name="dosetupcheckedinterlinespace"> + <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 file="spac-ver.mkiv" name="dosetupcheckedinterlinespace" variant="argument"> + <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"/> @@ -16109,21 +17061,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="dosetupcheckedinterlinespace" variant="name"> + <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 file="spac-ver.mkiv" name="useinterlinespaceparameter"> + <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 file="typo-itc.mkvi" name="setitaliccorrection"> + <cd:command category="fonts" file="typo-itc.mkvi" level="system" name="setitaliccorrection"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -16132,9 +17084,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-itc.mkvi" name="resetitaliccorrection"/> - <cd:command file="typo-itc.mkvi" name="italiccorrection"/> - <cd:command file="typo-itc.mkvi" name="setupitaliccorrection"> + <cd:command category="fonts" file="typo-itc.mkvi" level="style" name="resetitaliccorrection"/> + <cd:command category="fonts" file="typo-itc.mkvi" level="style" name="italiccorrection"/> + <cd:command category="fonts" file="typo-itc.mkvi" level="style" name="setupitaliccorrection"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="text"/> @@ -16146,7 +17098,7 @@ </cd:command> </cd:interface> <cd:interface file="i-itemgroup.xml"> - <cd:command file="strc-itm.mkvi" name="defineitemgroup"> + <cd:command category="structure" file="strc-itm.mkvi" level="style" name="defineitemgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16159,7 +17111,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="setupitemgroup"> + <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16190,6 +17142,7 @@ <cd:constant type="joinedup"/> <cd:constant type="serried"/> <cd:constant type="stopper"/> + <cd:constant type="nostopper"/> <cd:constant type="unpacked"/> <cd:constant type="repeat"/> <cd:constant type="norepeat"/> @@ -16361,11 +17314,14 @@ <cd:parameter name="symcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="setupitemgroup" variant="assignment"> + <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroup" variant="assignment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16564,11 +17520,14 @@ <cd:parameter name="symcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="setupitemgroups"> + <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroups"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16579,7 +17538,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" generated="yes" name="setupitemgroup" variant="instance"> + <cd:command category="structure counter" file="strc-itm.mkvi" generated="yes" level="style" name="setupitemgroup" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="itemgroup"/> @@ -16600,7 +17559,7 @@ <cd:constant value="itemize"/> </cd:instances> </cd:command> - <cd:command file="strc-itm.mkvi" generated="yes" name="itemgroup" type="environment" variant="instance"> + <cd:command category="structure" file="strc-itm.mkvi" generated="yes" level="document" name="itemgroup" type="environment" variant="instance"> <cd:sequence> <cd:instance value="itemgroup"/> </cd:sequence> @@ -16616,7 +17575,7 @@ <cd:constant value="itemize"/> </cd:instances> </cd:command> - <cd:command file="strc-itm.mkvi" name="itemgroup" type="environment"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="itemgroup" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16629,29 +17588,29 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="item" scope="itemgroup"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="item" scope="itemgroup"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="noitem" scope="itemgroup"/> - <cd:command file="strc-itm.mkvi" name="itemtag" scope="itemgroup"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="noitem" scope="itemgroup"/> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="itemtag" scope="itemgroup"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="item" scope="itemgroup" type="environment"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="item" scope="itemgroup" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="head" scope="itemgroup" type="environment"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="head" scope="itemgroup" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -16661,7 +17620,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="specialitem" scope="itemgroup" type="environment" variant="item"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="item"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="item"/> @@ -16671,7 +17630,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="specialitem" scope="itemgroup" type="environment" variant="symbol"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="symbol"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -16683,7 +17642,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="specialitem" scope="itemgroup" type="environment" variant="none"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="none"> <cd:arguments> <cd:keywords> <cd:constant type="sub"/> @@ -16693,7 +17652,7 @@ </cd:command> </cd:interface> <cd:interface file="i-items.xml"> - <cd:command file="typo-itm.mkiv" name="defineitems"> + <cd:command category="symbols" file="typo-itm.mkiv" level="style" name="defineitems"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16706,7 +17665,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-itm.mkiv" name="setupitems"> + <cd:command category="symbols" file="typo-itm.mkiv" level="style" name="setupitems"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16766,7 +17725,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-itm.mkiv" name="items"> + <cd:command category="symbols" file="typo-itm.mkiv" level="document" name="items"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupitems"/> @@ -16778,7 +17737,7 @@ </cd:command> </cd:interface> <cd:interface file="i-javascript.xml"> - <cd:command file="java-ini.mkiv" name="JScode" type="environment"> + <cd:command category="pdf" file="java-ini.mkiv" level="system" name="JScode" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -16791,7 +17750,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" name="JSpreamble" type="environment"> + <cd:command category="pdf" file="java-ini.mkiv" level="system" name="JSpreamble" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -16805,7 +17764,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" name="setJSpreamble"> + <cd:command category="pdf" file="java-ini.mkiv" level="system" name="setJSpreamble"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -16813,7 +17772,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" name="addtoJSpreamble"> + <cd:command category="pdf" file="java-ini.mkiv" level="system" name="addtoJSpreamble"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -16821,7 +17780,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" name="useJSscripts"> + <cd:command category="pdf" file="java-ini.mkiv" level="style" name="useJSscripts"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -16833,7 +17792,7 @@ </cd:command> </cd:interface> <cd:interface file="i-kerning.xml"> - <cd:command file="typo-krn.mkiv" name="definecharacterkerning"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="definecharacterkerning"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16846,7 +17805,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="setupcharacterkerning"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setupcharacterkerning"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16872,7 +17831,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="setcharacterkerning"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setcharacterkerning"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -16880,8 +17839,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="resetcharacterkerning"/> - <cd:command file="typo-krn.mkiv" generated="yes" name="characterkerning" variant="example"> + <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:sequence> <cd:variable value="characterkerning"/> </cd:sequence> @@ -16894,7 +17853,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="kerncharacters"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="kerncharacters"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -16904,7 +17863,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="letterspacing"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="letterspacing"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -16914,7 +17873,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="stretched"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="stretched"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupstretched"/> @@ -16924,7 +17883,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="setupstretched"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setupstretched"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacterkerning"/> @@ -16933,7 +17892,7 @@ </cd:command> </cd:interface> <cd:interface file="i-label.xml"> - <cd:command file="strc-lab.mkiv" name="definelabel"> + <cd:command category="structure" file="strc-lab.mkiv" level="style" name="definelabel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16946,7 +17905,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" name="setuplabel"> + <cd:command category="structure" file="strc-lab.mkiv" level="style" name="setuplabel"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17067,6 +18026,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </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:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -17117,7 +18082,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" generated="yes" name="label" variant="example"> + <cd:command category="structure" file="strc-lab.mkiv" generated="yes" level="document" name="label" variant="example"> <cd:sequence> <cd:variable value="label"/> </cd:sequence> @@ -17130,7 +18095,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" generated="yes" name="currentlabel" variant="example"> + <cd:command category="structure" file="strc-lab.mkiv" generated="yes" level="document" name="currentlabel" variant="example"> <cd:sequence> <cd:string value="current"/> <cd:variable value="label"/> @@ -17146,7 +18111,7 @@ </cd:command> </cd:interface> <cd:interface file="i-labeltext.xml"> - <cd:command file="lang-lab.mkiv" name="definelabelclass"> + <cd:command category="language" file="lang-lab.mkiv" level="system" name="definelabelclass"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17156,7 +18121,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="setuplabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="setuplabeltext" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="label"/> @@ -17172,9 +18137,19 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="presetlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="presetlabeltext" variant="instance"> <cd:sequence> <cd:string value="preset"/> <cd:instance value="label"/> @@ -17190,9 +18165,19 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="copylabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="copylabeltext" variant="instance"> <cd:sequence> <cd:string value="copy"/> <cd:instance value="label"/> @@ -17208,9 +18193,19 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="labeltext" type="environment" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="labeltext" type="environment" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -17223,16 +18218,36 @@ <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="labellanguage" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="system" name="labellanguage" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="language"/> </cd:sequence> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="labeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="labeltext" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -17242,9 +18257,19 @@ <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="labeltexts" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="labeltexts" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="texts"/> @@ -17257,9 +18282,13 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="leftlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="leftlabeltext" variant="instance"> <cd:sequence> <cd:string value="left"/> <cd:instance value="label"/> @@ -17270,9 +18299,13 @@ <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="rightlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="rightlabeltext" variant="instance"> <cd:sequence> <cd:string value="right"/> <cd:instance value="label"/> @@ -17283,11 +18316,15 @@ <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-language.xml"> - <cd:command file="lang-ini.mkiv" name="installlanguage"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="installlanguage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17297,7 +18334,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="installlanguage" variant="name"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="installlanguage" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17307,7 +18344,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="setuplanguage"> + <cd:command category="language" file="lang-ini.mkiv" level="style" name="setuplanguage"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -17349,6 +18386,12 @@ <cd:parameter name="font"> <cd:constant type="auto"/> </cd:parameter> + <cd:parameter name="bidi"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="l2r"/> + <cd:constant type="r2l"/> + </cd:parameter> <cd:parameter name="text"> <cd:constant type="cd:text"/> </cd:parameter> @@ -17410,7 +18453,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="doifelselanguage"> + <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifelselanguage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17423,7 +18466,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="doiflanguageelse"> + <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doiflanguageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17436,7 +18479,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="doifelsepatterns"> + <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifelsepatterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17449,7 +18492,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="doifpatternselse"> + <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifpatternselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17462,40 +18505,40 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" generated="yes" name="language" variant="example"> + <cd:command category="language" file="lang-ini.mkiv" generated="yes" level="document" name="language" variant="example"> <cd:sequence> <cd:variable value="language"/> </cd:sequence> </cd:command> - <cd:command file="lang-ini.mkiv" name="language"> + <cd:command category="language" file="lang-ini.mkiv" level="document" name="language"> <cd:arguments> <cd:keywords> <cd:constant type="cd:language"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="mainlanguage"> + <cd:command category="language" file="lang-ini.mkiv" level="style" name="mainlanguage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:language"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="uselanguageparameter"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="uselanguageparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="exceptions" type="environment"> + <cd:command category="language" file="lang-ini.mkiv" level="style" name="exceptions" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:language"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="currentlanguage"/> - <cd:command file="lang-ini.mkiv" name="currentmainlanguage"/> - <cd:command file="lang-lab.mkiv" name="commalistsentence"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="currentlanguage"/> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="currentmainlanguage"/> + <cd:command category="language" file="lang-lab.mkiv" level="document" name="commalistsentence"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:text"/> @@ -17507,7 +18550,7 @@ </cd:command> </cd:interface> <cd:interface file="i-layer.xml"> - <cd:command file="pack-box.mkiv" name="setuplayeredtext"> + <cd:command category="background" file="pack-box.mkiv" level="style" name="setuplayeredtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17524,7 +18567,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="layeredtext"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="layeredtext"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplayer"/> @@ -17538,7 +18581,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="placelayeredtext"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="placelayeredtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17555,7 +18598,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setlayerframed"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="setlayerframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17569,7 +18612,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setlayerframed" variant="combination"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="setlayerframed" variant="combination"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17581,7 +18624,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setlayertext"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="setlayertext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17609,7 +18652,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="definelayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="style" name="definelayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17622,7 +18665,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="setuplayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="style" name="setuplayer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17752,42 +18795,42 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="resetlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="style" name="resetlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="flushlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="flushlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="tightlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="tightlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="placelayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="placelayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="composedlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="composedlayer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="setlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="setlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17804,7 +18847,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="definelayerpreset"> + <cd:command category="background" file="pack-lyr.mkiv" level="system" name="definelayerpreset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17814,7 +18857,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="definelayerpreset" variant="name"> + <cd:command category="background" file="pack-lyr.mkiv" level="system" name="definelayerpreset" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17824,7 +18867,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="doifelselayerdata"> + <cd:command category="background conditional" file="pack-lyr.mkiv" level="system" name="doifelselayerdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17837,7 +18880,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="doiflayerdataelse"> + <cd:command category="background conditional" file="pack-lyr.mkiv" level="system" name="doiflayerdataelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17850,9 +18893,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="layerwidth"/> - <cd:command file="pack-lyr.mkiv" name="layerheight"/> - <cd:command file="pack-lyr.mkiv" name="setMPlayer"> + <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:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17866,7 +18909,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="getMPlayer"> + <cd:command category="background metapost" file="pack-lyr.mkiv" level="document" name="getMPlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17879,7 +18922,7 @@ </cd:command> </cd:interface> <cd:interface file="i-layout.xml"> - <cd:command file="page-lay.mkiv" name="definelayout"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="definelayout"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17892,7 +18935,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuplayout"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuplayout"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -18090,7 +19133,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuplayout" variant="name"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuplayout" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -18098,7 +19141,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifelselayoutdefined"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelselayoutdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -18111,7 +19154,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doiflayoutdefinedelse"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doiflayoutdefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -18124,7 +19167,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="adaptlayout"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="adaptlayout"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -18140,14 +19183,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="layout" type="environment"> + <cd:command category="layout" file="page-lay.mkiv" level="document" name="layout" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifelseoddpage"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelseoddpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18157,7 +19200,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifoddpageelse"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifoddpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18167,7 +19210,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifbothsidesoverruled"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifbothsidesoverruled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18180,7 +19223,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifbothsides"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifbothsides"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18193,7 +19236,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="rightorleftpageaction"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="rightorleftpageaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18203,7 +19246,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showprint"> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showprint"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setuppapersize"/> @@ -18216,7 +19259,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showframe"> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showframe"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="top"/> @@ -18234,7 +19277,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showsetups"> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showsetups"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant default="yes" type="pt"/> @@ -18251,7 +19294,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showlayout"> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showlayout"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant default="yes" type="pt"/> @@ -18268,11 +19311,31 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showmargins"/> - <cd:command file="page-spr.mkiv" name="spread" type="environment"/> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showmargins"/> + <cd:command category="layout" file="page-spr.mkiv" level="document" name="spread" type="environment"/> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelsetopofpage"> + <cd: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="layout conditional" file="page-lay.mkiv" level="system" name="doiftopofpageelse"> + <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-linenumber.xml"> - <cd:command file="page-lin.mkvi" name="definelinenumbering"> + <cd:command category="structure" file="page-lin.mkvi" level="style" name="definelinenumbering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18285,7 +19348,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="setuplinenumbering"> + <cd:command category="structure" file="page-lin.mkvi" level="style" name="setuplinenumbering"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18362,7 +19425,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="linenumbering" type="environment"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="linenumbering" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -18386,7 +19449,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="linenumbering" type="environment" variant="argument"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="linenumbering" type="environment" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -18397,28 +19460,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="someline"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="someline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="startline"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="startline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="stopline"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="stopline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="doifelsesamelinereference"> + <cd:command category="structure conditional" file="page-lin.mkvi" level="system" name="doifelsesamelinereference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -18431,7 +19494,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="doifsamelinereferenceelse"> + <cd:command category="structure conditional" file="page-lin.mkvi" level="system" name="doifsamelinereferenceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -18444,7 +19507,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="inline"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="inline"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -18454,7 +19517,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="inlinerange"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="inlinerange"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -18463,34 +19526,34 @@ </cd:command> </cd:interface> <cd:interface file="i-lines.xml"> - <cd:command file="supp-box.mkiv" name="noflines"/> - <cd:command file="supp-box.mkiv" name="getnoflines"> + <cd:command file="supp-box.mkiv" level="system" name="noflines"/> + <cd:command file="supp-box.mkiv" 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" name="getroundednoflines"> + <cd:command file="supp-box.mkiv" 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" name="getrawnoflines"> + <cd:command file="supp-box.mkiv" 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" name="determinenoflines"> + <cd:command file="supp-box.mkiv" level="system" name="determinenoflines"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" name="definelines"> + <cd:command file="spac-lin.mkiv" level="style" name="definelines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18503,7 +19566,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" name="setuplines"> + <cd:command file="spac-lin.mkiv" level="style" name="setuplines"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18553,7 +19616,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" generated="yes" name="lines" type="environment" variant="instance"> + <cd:command file="spac-lin.mkiv" generated="yes" level="document" name="lines" type="environment" variant="instance"> <cd:sequence> <cd:instance value="lines"/> </cd:sequence> @@ -18562,9 +19625,11 @@ <cd:inherit name="setuplines"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="lines"/> + </cd:instances> </cd:command> - <cd:command file="spac-lin.mkiv" name="emptylines"> + <cd:command file="spac-lin.mkiv" level="document" name="emptylines"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -18573,7 +19638,7 @@ </cd:command> </cd:interface> <cd:interface file="i-linetable.xml"> - <cd:command file="tabl-ltb.mkiv" name="setuplinetable"> + <cd:command category="tables" file="tabl-ltb.mkiv" level="style" name="setuplinetable"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="r"/> @@ -18665,24 +19730,24 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ltb.mkiv" name="linetablecell" type="environment"> + <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetablecell" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ltb.mkiv" name="linetable" type="environment"/> - <cd:command file="tabl-ltb.mkiv" name="linetablehead" type="environment"/> - <cd:command file="tabl-ltb.mkiv" name="linetablebody" type="environment"/> - <cd:command file="tabl-ltb.mkiv" name="processlinetablebuffer"> + <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:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-ltb.mkiv" name="processlinetablefile"> + <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="processlinetablefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -18691,7 +19756,7 @@ </cd:command> </cd:interface> <cd:interface file="i-linewidth.xml"> - <cd:command file="pack-rul.mkiv" name="setuplinewidth"> + <cd:command category="layout" file="pack-rul.mkiv" level="style" name="setuplinewidth"> <cd:arguments> <cd:keywords> <cd:constant type="small"/> @@ -18701,10 +19766,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="linewidth"/> + <cd:command category="layout" file="pack-rul.mkiv" level="style" name="linewidth"/> </cd:interface> <cd:interface file="i-list.xml"> - <cd:command file="strc-lst.mkvi" name="definelist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="definelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18717,7 +19782,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="setuplist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="setuplist"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:list"/> @@ -18978,7 +20043,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifelselist"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelselist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:list"/> @@ -18991,7 +20056,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doiflistelse"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doiflistelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:list"/> @@ -19004,7 +20069,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="writebetweenlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="writebetweenlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19017,7 +20082,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="writedatatolist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="writedatatolist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19032,7 +20097,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="writetolist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="writetolist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19048,7 +20113,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="placelist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="placelist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:list"/> @@ -19058,7 +20123,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="placerawlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="placerawlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19068,7 +20133,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="completelist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="completelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19078,7 +20143,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="definecombinedlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="definecombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19091,7 +20156,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="setupcombinedlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="setupcombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19101,7 +20166,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="placecombinedlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="placecombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19111,7 +20176,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" generated="yes" name="setupcombinedlist" variant="instance"> + <cd:command category="structure" file="strc-lst.mkvi" generated="yes" level="style" name="setupcombinedlist" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="combinedlist"/> @@ -19121,9 +20186,11 @@ <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="content"/> + </cd:instances> </cd:command> - <cd:command file="strc-lst.mkvi" generated="yes" name="placecombinedlist" variant="instance"> + <cd:command category="structure" file="strc-lst.mkvi" generated="yes" level="document" name="placecombinedlist" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="combinedlist"/> @@ -19133,9 +20200,11 @@ <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="content"/> + </cd:instances> </cd:command> - <cd:command file="strc-lst.mkvi" generated="yes" name="completecombinedlist" variant="instance"> + <cd:command category="structure" file="strc-lst.mkvi" generated="yes" level="document" name="completecombinedlist" variant="instance"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="combinedlist"/> @@ -19145,23 +20214,25 @@ <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="content"/> + </cd:instances> </cd:command> - <cd:command file="strc-lst.mkvi" name="structurelistuservariable"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="structurelistuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="rawstructurelistuservariable"> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="rawstructurelistuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifelsestructurelisthaspage"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelsestructurelisthaspage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19171,7 +20242,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifstructurelisthaspageelse"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifstructurelisthaspageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19181,7 +20252,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifelsestructurelisthasnumber"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelsestructurelisthasnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19191,7 +20262,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifstructurelisthasnumberelse"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifstructurelisthasnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19201,7 +20272,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="definelistextra"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="definelistextra"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19214,7 +20285,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="setuplistextra"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="setuplistextra"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19229,7 +20300,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="definelistalternative"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="definelistalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19242,7 +20313,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="setuplistalternative"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="setuplistalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19275,7 +20346,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="determinelistcharacteristics"> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="determinelistcharacteristics"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:list"/> @@ -19285,14 +20356,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="currentlistentrynumber"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrytitle"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrytitlerendered"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrypagenumber"/> - <cd:command file="strc-lst.mkvi" name="currentlistsymbol"/> - <cd:command file="strc-lst.mkvi" name="listlength"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrywrapper" type="environment"/> - <cd:command file="strc-lst.mkvi" name="currentlistentryreferenceattribute"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="currentlistentrynumber"/> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="currentlistentrytitle"/> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="currentlistentrytitlerendered"/> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="currentlistentrypagenumber"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistsymbol"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="listlength"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistentrywrapper" type="environment"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistentryreferenceattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="number"/> @@ -19302,8 +20373,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="currentlistentrydestinationattribute"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrylimitedtext"> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistentrydestinationattribute"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistentrylimitedtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -19312,58 +20383,58 @@ </cd:command> </cd:interface> <cd:interface file="i-logo.xml"> - <cd:command file="cont-log.mkiv" name="TeX"/> - <cd:command file="cont-log.mkiv" name="ConTeXt"/> - <cd:command file="cont-log.mkiv" name="PPCHTeX"/> - <cd:command file="cont-log.mkiv" name="PRAGMA"/> - <cd:command file="cont-log.mkiv" name="LaTeX"/> - <cd:command file="cont-log.mkiv" name="TaBlE"/> - <cd:command file="cont-log.mkiv" name="PiCTeX"/> - <cd:command file="cont-log.mkiv" name="AmSTeX"/> - <cd:command file="cont-log.mkiv" name="LamSTeX"/> - <cd:command file="cont-log.mkiv" name="Context"/> - <cd:command file="cont-log.mkiv" name="MetaFont"/> - <cd:command file="cont-log.mkiv" name="MetaPost"/> - <cd:command file="cont-log.mkiv" name="MetaFun"/> - <cd:command file="cont-log.mkiv" name="eTeX"/> - <cd:command file="cont-log.mkiv" name="pdfTeX"/> - <cd:command file="cont-log.mkiv" name="pdfeTeX"/> - <cd:command file="cont-log.mkiv" name="Lua"/> - <cd:command file="cont-log.mkiv" name="luaTeX"/> - <cd:command file="cont-log.mkiv" name="luajitTeX"/> - <cd:command file="cont-log.mkiv" name="metaTeX"/> - <cd:command file="cont-log.mkiv" name="XeTeX"/> - <cd:command file="cont-log.mkiv" name="LuaTeX"/> - <cd:command file="cont-log.mkiv" name="LuajitTeX"/> - <cd:command file="cont-log.mkiv" name="MKII"/> - <cd:command file="cont-log.mkiv" name="MKIV"/> - <cd:command file="cont-log.mkiv" name="MKVI"/> - <cd:command file="cont-log.mkiv" name="MKIX"/> - <cd:command file="cont-log.mkiv" name="MKXI"/> - <cd:command file="cont-log.mkiv" name="MPII"/> - <cd:command file="cont-log.mkiv" name="MPIV"/> - <cd:command file="cont-log.mkiv" name="MPVI"/> - <cd:command file="cont-log.mkiv" name="METAFONT"/> - <cd:command file="cont-log.mkiv" name="METAPOST"/> - <cd:command file="cont-log.mkiv" name="PPCHTEX"/> - <cd:command file="cont-log.mkiv" name="CONTEXT"/> - <cd:command file="cont-log.mkiv" name="METAFUN"/> - <cd:command file="cont-log.mkiv" name="TEX"/> - <cd:command file="cont-log.mkiv" name="LATEX"/> - <cd:command file="cont-log.mkiv" name="PICTEX"/> - <cd:command file="cont-log.mkiv" name="TABLE"/> - <cd:command file="cont-log.mkiv" name="AMSTEX"/> - <cd:command file="cont-log.mkiv" name="LAMSTEX"/> - <cd:command file="cont-log.mkiv" name="INRSTEX"/> - <cd:command file="cont-log.mkiv" name="ETEX"/> - <cd:command file="cont-log.mkiv" name="PDFTEX"/> - <cd:command file="cont-log.mkiv" name="PDFETEX"/> - <cd:command file="cont-log.mkiv" name="LUATEX"/> - <cd:command file="cont-log.mkiv" name="LUAJITTEX"/> - <cd:command file="cont-log.mkiv" name="XETEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="ConTeXt"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PRAGMA"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LaTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TaBlE"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PiCTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="AmSTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LamSTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="Context"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaFont"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaPost"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaFun"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="eTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="pdfTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="pdfeTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="Lua"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luaTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luajitTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="metaTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="XeTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuaTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuajitTeX"/> + <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="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="METAFONT"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAPOST"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="CONTEXT"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAFUN"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LATEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PICTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TABLE"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="AMSTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LAMSTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="INRSTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="ETEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PDFTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PDFETEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LUATEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LUAJITTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="XETEX"/> </cd:interface> <cd:interface file="i-lohi.xml"> - <cd:command file="typo-scr.mkiv" name="definelow"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="definelow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19376,7 +20447,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="setuplow"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="setuplow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19398,21 +20469,23 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" name="low" variant="instance"> + <cd:command category="fonts" file="typo-scr.mkiv" generated="yes" level="document" name="low" variant="instance"> <cd:sequence> <cd:instance value="low"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="unitslow"/> + </cd:instances> </cd:command> - <cd:command file="typo-scr.mkiv" name="low"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="low"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="definehigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="definehigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19425,7 +20498,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="setuphigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="setuphigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19447,21 +20520,23 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" name="high" variant="instance"> + <cd:command category="fonts" file="typo-scr.mkiv" generated="yes" level="document" name="high" variant="instance"> <cd:sequence> <cd:instance value="high"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="unitshigh"/> + </cd:instances> </cd:command> - <cd:command file="typo-scr.mkiv" name="high"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="high"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="definelowhigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="definelowhigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19474,7 +20549,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="setuplowhigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="setuplowhigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19499,7 +20574,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" name="lowhigh" variant="instance"> + <cd:command category="fonts" file="typo-scr.mkiv" generated="yes" level="document" name="lowhigh" variant="instance"> <cd:sequence> <cd:instance value="lowhigh"/> </cd:sequence> @@ -19512,7 +20587,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="lohi"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="lohi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -19522,7 +20597,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="hilo"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="hilo"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -19532,7 +20607,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="definelowmidhigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="definelowmidhigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19545,7 +20620,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="setuplowmidhigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="setuplowmidhigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19567,7 +20642,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" name="lowmidhigh" variant="instance"> + <cd:command category="fonts" file="typo-scr.mkiv" generated="yes" level="document" name="lowmidhigh" variant="instance"> <cd:sequence> <cd:instance value="lowmidhigh"/> </cd:sequence> @@ -19577,14 +20652,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="lomihi"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="lomihi"> <cd:arguments> <cd:content/> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="himilo"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="himilo"> <cd:arguments> <cd:content/> <cd:content/> @@ -19593,127 +20668,127 @@ </cd:command> </cd:interface> <cd:interface file="i-lua.xml"> - <cd:command file="back-exp.mkiv" name="taggedctxcommand"> + <cd:command category="lua" file="back-exp.mkiv" level="system" name="taggedctxcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" name="luafunction"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="luafunction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" name="cldprocessfile"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="cldprocessfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" name="cldloadfile"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="cldloadfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" name="cldcontext"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="cldcontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" name="cldcommand"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="cldcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxdirectlua"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxdirectlua"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxlatelua"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxlatelua"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxsprint"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxsprint"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxcommand"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxdirectcommand"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxdirectcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxlatecommand"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxlatecommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxreport"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxreport"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxlua"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxlua"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="luacode"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="luacode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="lateluacode"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="lateluacode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="directluacode"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="directluacode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="luaversion"/> - <cd:command file="luat-cod.mkiv" name="registerctxluafile"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="luaversion"/> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="registerctxluafile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -19723,32 +20798,32 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxloadluafile"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxloadluafile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="lua" type="environment"/> - <cd:command file="luat-ini.mkiv" name="luacode" type="environment"/> - <cd:command file="luat-ini.mkiv" name="luamajorversion"/> - <cd:command file="luat-ini.mkiv" name="luaminorversion"/> - <cd:command file="luat-ini.mkiv" name="luaexpanded"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="lua" type="environment"/> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luacode" type="environment"/> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luamajorversion"/> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaminorversion"/> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="luaparameterset" type="environment"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaparameterset" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="luaparameterset"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaparameterset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -19756,52 +20831,52 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="luaconditional"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaconditional"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="ctxluacode"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxluacode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="ctxfunctiondefinition" type="environment"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxfunctiondefinition" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" generated="yes" name="ctxfunctiondefinition" variant="example"> + <cd:command category="lua" file="luat-ini.mkiv" generated="yes" level="system" name="ctxfunctiondefinition" variant="example"> <cd:sequence> <cd:variable value="ctxfunctiondefinition"/> </cd:sequence> </cd:command> - <cd:command file="luat-ini.mkiv" name="ctxfunction" type="environment"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxfunction" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="ctxfunction"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxfunction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" generated="yes" name="ctxfunction" variant="example"> + <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:interface> <cd:interface file="i-makeup.xml"> - <cd:command file="page-mak.mkvi" name="definemakeup"> + <cd:command category="structure layout" file="page-mak.mkvi" level="style" name="definemakeup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19814,7 +20889,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" name="setupmakeup"> + <cd:command category="structure layout" file="page-mak.mkvi" level="style" name="setupmakeup"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19906,7 +20981,8 @@ <cd:constant default="yes" type="empty"/> </cd:parameter> <cd:parameter name="style"> - <cd:inherit name="value-style"/> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="color"> <cd:constant type="cd:color"/> @@ -19914,7 +20990,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" name="makeup" type="environment"> + <cd:command category="structure layout" file="page-mak.mkvi" level="document" name="makeup" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19924,7 +21000,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" generated="yes" name="makeup" type="environment" variant="instance"> + <cd:command category="structure layout" file="page-mak.mkvi" generated="yes" level="document" name="makeup" type="environment" variant="instance"> <cd:sequence> <cd:instance value="makeup"/> <cd:string value="makeup"/> @@ -19934,11 +21010,16 @@ <cd:inherit name="setupmakeup"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="standard"/> + <cd:constant value="page"/> + <cd:constant value="text"/> + <cd:constant value="middle"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-marginblock.xml"> - <cd:command file="page-mbk.mkvi" name="definemarginblock"> + <cd:command category="structure layout" file="page-mbk.mkvi" level="style" name="definemarginblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19951,7 +21032,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mbk.mkvi" name="setupmarginblock"> + <cd:command category="structure layout" file="page-mbk.mkvi" level="style" name="setupmarginblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20004,7 +21085,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mbk.mkvi" name="marginblock" type="environment"> + <cd:command category="structure layout" file="page-mbk.mkvi" level="document" name="marginblock" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -20013,7 +21094,7 @@ </cd:command> </cd:interface> <cd:interface file="i-margindata.xml"> - <cd:command file="typo-mar.mkiv" name="definemargindata"> + <cd:command category="structure" file="typo-mar.mkiv" level="style" name="definemargindata"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20026,7 +21107,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" name="setupmargindata"> + <cd:command category="structure" file="typo-mar.mkiv" level="style" name="setupmargindata"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20121,7 +21202,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" name="setupmarginframed"> + <cd:command category="structure" file="typo-mar.mkiv" level="style" name="setupmarginframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20131,7 +21212,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" generated="yes" name="margindata" variant="instance"> + <cd:command category="structure" file="typo-mar.mkiv" generated="yes" level="document" name="margindata" variant="instance"> <cd:sequence> <cd:instance value="margindata"/> </cd:sequence> @@ -20147,9 +21228,27 @@ </cd:assignments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="inleftmargin"/> + <cd:constant value="inrightmargin"/> + <cd:constant value="inoutermargin"/> + <cd:constant value="ininnermargin"/> + <cd:constant value="inleftedge"/> + <cd:constant value="inrightedge"/> + <cd:constant value="inouteredge"/> + <cd:constant value="ininneredge"/> + <cd:constant value="atleftmargin"/> + <cd:constant value="atrightmargin"/> + <cd:constant value="inleft"/> + <cd:constant value="inright"/> + <cd:constant value="inouter"/> + <cd:constant value="ininner"/> + <cd:constant value="inmargin"/> + <cd:constant value="inother"/> + <cd:constant value="margintext"/> + </cd:instances> </cd:command> - <cd:command file="typo-mar.mkiv" name="margindata"> + <cd:command category="structure" file="typo-mar.mkiv" level="document" name="margindata"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20168,14 +21267,14 @@ </cd:command> </cd:interface> <cd:interface file="i-marker.xml"> - <cd:command file="attr-mkr.mkiv" name="definemarker"> + <cd:command category="attribute" file="attr-mkr.mkiv" level="system" name="definemarker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-mkr.mkiv" name="setmarker"> + <cd:command category="attribute" file="attr-mkr.mkiv" level="system" name="setmarker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20185,14 +21284,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-mkr.mkiv" name="resetmarker"> + <cd:command category="attribute" file="attr-mkr.mkiv" level="system" name="resetmarker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-mkr.mkiv" name="boxmarker"> + <cd:command category="attribute" file="attr-mkr.mkiv" level="system" name="boxmarker"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -20204,7 +21303,7 @@ </cd:command> </cd:interface> <cd:interface file="i-marking.xml"> - <cd:command file="strc-mar.mkiv" name="definemarking"> + <cd:command file="strc-mar.mkiv" level="style" name="definemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20217,7 +21316,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="setupmarking"> + <cd:command file="strc-mar.mkiv" level="style" name="setupmarking"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:mark"/> @@ -20240,7 +21339,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="relatemarking"> + <cd:command file="strc-mar.mkiv" level="system" name="relatemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20250,7 +21349,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="setmarking"> + <cd:command file="strc-mar.mkiv" level="style" name="setmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20260,14 +21359,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="resetmarking"> + <cd:command file="strc-mar.mkiv" level="system" name="resetmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="synchronizemarking"> + <cd:command file="strc-mar.mkiv" level="system" name="synchronizemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20280,7 +21379,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="doifelsemarking"> + <cd:command category="conditional" file="strc-mar.mkiv" level="system" name="doifelsemarking"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:mark"/> @@ -20293,7 +21392,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="doifmarkingelse"> + <cd:command category="conditional" file="strc-mar.mkiv" level="system" name="doifmarkingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:mark"/> @@ -20306,7 +21405,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="getmarking"> + <cd:command file="strc-mar.mkiv" level="style" name="getmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20335,7 +21434,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchonemark"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchonemark"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20360,21 +21459,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchtwomarks"> + <cd:command 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" name="fetchallmarks"> + <cd:command 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" name="fetchmark"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchmark"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20399,7 +21498,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchmarking"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20428,7 +21527,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchonemarking"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchonemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20457,7 +21556,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchtwomarkings"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchtwomarkings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20468,7 +21567,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchallmarkings"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchallmarkings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20481,7 +21580,7 @@ </cd:command> </cd:interface> <cd:interface file="i-math.xml"> - <cd:command category="mathematics" file="math-ini.mkiv" name="definemathematics"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="definemathematics"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20494,7 +21593,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="setupmathematics"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="setupmathematics"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20546,10 +21645,14 @@ <cd:constant type="none"/> <cd:constant type="reset"/> </cd:parameter> - <cd:parameter name="autopunctuation"> + <cd:parameter list="yes" name="autopunctuation"> <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> <cd:constant type="all"/> + <cd:constant type="comma"/> + <cd:constant type="yes,semicolon"/> + <cd:constant type="comma,semicolon"/> + <cd:constant type="all,semicolon"/> </cd:parameter> <cd:parameter name="setups"> <cd:constant type="cd:name"/> @@ -20586,16 +21689,19 @@ <cd:constant type="ams"/> <cd:constant default="yes" type="ctx"/> </cd:parameter> + <cd:parameter name="ampersand"> + <cd:constant type="normal"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="inlineordisplaymath"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="inlineordisplaymath"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathematics"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathematics"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -20603,7 +21709,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="math"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="math"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -20611,7 +21717,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="m"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="m"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -20619,7 +21725,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="definemathcommand"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="definemathcommand"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20650,7 +21756,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" generated="yes" name="mathcommand" variant="example"> + <cd:command category="mathematics" file="math-ini.mkiv" generated="yes" level="document" name="mathcommand" variant="example"> <cd:sequence> <cd:variable value="mathcommand"/> </cd:sequence> @@ -20663,58 +21769,51 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathcommand"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:name"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-ini.mkiv" name="mathop"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="mathop"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mbox"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mtext"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mtext"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathfunction"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="mathfunction"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="mfunction"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="mfunction"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mfunctionlabeltext"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="mfunctionlabeltext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="stackrel"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="stackrel"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="apply"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="apply"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="definemathstyle"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="definemathstyle"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20733,7 +21832,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="setupmathstyle"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="setupmathstyle"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="display"/> @@ -20750,7 +21849,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="setmathstyle"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="setmathstyle"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="display"/> @@ -20767,7 +21866,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathstyle" type="environment"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="mathstyle" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="display"/> @@ -20784,18 +21883,18 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="math-ini.mkiv" name="mathstyle" type="environment"/> - <cd:command file="math-ini.mkiv" name="usemathstyleparameter"> + <cd:command begin="push" category="mathematics" end="pop" file="math-ini.mkiv" level="system" name="mathstyle" type="environment"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="usemathstyleparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="usemathstyleparameter" type="environment"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="usemathstyleparameter" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtext"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtext"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20805,7 +21904,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtexttf"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtexttf"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20815,7 +21914,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextit"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextit"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20825,7 +21924,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextsl"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextsl"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20835,7 +21934,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextbf"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextbf"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20845,7 +21944,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextbi"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextbi"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20855,7 +21954,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextbs"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextbs"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20865,7 +21964,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathword"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathword"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20875,7 +21974,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordtf"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordtf"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20885,7 +21984,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordit"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordit"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20895,7 +21994,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordsl"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordsl"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20905,7 +22004,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordbf"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordbf"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20915,7 +22014,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordbi"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordbi"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20925,7 +22024,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordbs"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordbs"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20935,82 +22034,95 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathrm"/> - <cd:command file="math-ini.mkiv" name="mathss"/> - <cd:command file="math-ini.mkiv" name="mathtt"/> - <cd:command file="math-ini.mkiv" name="mathtf"/> - <cd:command file="math-ini.mkiv" name="mathsl"/> - <cd:command file="math-ini.mkiv" name="mathit"/> - <cd:command file="math-ini.mkiv" name="mathbf"/> - <cd:command file="math-ini.mkiv" name="mathbi"/> - <cd:command file="math-ini.mkiv" name="mathbs"/> - <cd:command file="math-ini.mkiv" name="mathitalic"/> - <cd:command file="math-ini.mkiv" name="mathupright"/> - <cd:command file="math-ini.mkiv" name="mathdefault"/> - <cd:command file="math-ini.mkiv" name="mathscript"/> - <cd:command file="math-ini.mkiv" name="mathfraktur"/> - <cd:command file="math-ini.mkiv" name="mathblackboard"/> - <cd:command file="supp-mat.mkiv" name="displaymath"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathrm"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathss"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtt"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtf"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathsl"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathit"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathbf"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathbi"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathbs"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathitalic"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathupright"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathdefault"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathscript"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathfraktur"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathblackboard"/> + <cd:command category="mathematics" file="supp-mat.mkiv" level="style" name="displaymath"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="inlinemath"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="style" name="inlinemath"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="textmath"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="style" name="textmath"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="imath" type="environment"/> - <cd:command file="supp-mat.mkiv" name="dmath" type="environment"/> - <cd:command file="supp-mat.mkiv" name="mathmode" type="environment"/> - <cd:command file="supp-mat.mkiv" name="nonmathematics"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="imath" type="environment"/> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="dmath" type="environment"/> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="mathmode" type="environment"/> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="nonmathematics"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="displaymathematics"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="displaymathematics"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="inlinemathematics"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="inlinemathematics"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="automathematics"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="automathematics"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="cramped"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="cramped"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="crampedllap"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="crampedllap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="crampedrlap"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="crampedrlap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="crampedclap"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="crampedclap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> + <cd:command category="mathematics" file="math-del.mkiv" level="system" name="autointegral"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-mathalignment.xml"> - <cd:command file="math-ali.mkiv" name="definemathalignment"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathalignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21023,7 +22135,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="setupmathalignment"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="setupmathalignment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21038,16 +22150,32 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="number"> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="separator"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="align"> <cd:constant type="left"/> <cd:constant type="middle"/> <cd:constant type="right"/> <cd:constant default="yes" type="normal"/> </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="top"/> + <cd:constant type="center"/> + <cd:constant type="bottom"/> + <cd:constant default="yes" type="normal"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:constant default="yes" type="math"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" generated="yes" name="mathalignment" type="environment" variant="instance"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" generated="yes" level="document" name="mathalignment" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathalignment"/> </cd:sequence> @@ -21056,11 +22184,14 @@ <cd:inherit name="setupmathalignment"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="align"/> + <cd:constant value="mathalignment"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-mathcases.xml"> - <cd:command file="math-ali.mkiv" name="definemathcases"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathcases"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21073,7 +22204,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="setupmathcases"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="setupmathcases"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21102,7 +22233,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" generated="yes" name="mathcases" type="environment" variant="instance"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" generated="yes" level="document" name="mathcases" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathcases"/> </cd:sequence> @@ -21111,11 +22242,14 @@ <cd:inherit name="setupmathcases"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="cases"/> + <cd:constant value="mathcases"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-mathfence.xml"> - <cd:command file="math-fen.mkiv" name="definemathfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="style" name="definemathfence"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21128,7 +22262,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="setupmathfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="style" name="setupmathfence"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21165,15 +22299,21 @@ <cd:parameter name="state"> <cd:constant type="auto"/> </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="auto"/> + </cd:parameter> <cd:parameter name="factor"> - <cd:constant default="yes" type="auto"/> <cd:constant type="none"/> - <cd:constant type="number"/> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="mathclass"> + <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" generated="yes" name="fence" variant="example"> + <cd:command category="mathematics" file="math-fen.mkiv" generated="yes" level="document" name="fence" variant="example"> <cd:sequence> <cd:variable value="fence"/> </cd:sequence> @@ -21181,7 +22321,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="fenced"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="fenced"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21189,165 +22329,165 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="fence"/> - <cd:command file="math-fen.mkiv" name="left"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="fence"/> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="left"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="middle"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="middle"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="right"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="right"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="big"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="big"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Big"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Big"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="bigg"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="bigg"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Bigg"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Bigg"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="bigl"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="bigl"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="bigm"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="bigm"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="bigr"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="bigr"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Bigl"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Bigl"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Bigm"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Bigm"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Bigr"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Bigr"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="biggl"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="biggl"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="biggm"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="biggm"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="biggr"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="biggr"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Biggl"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Biggl"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Biggm"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Biggm"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Biggr"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Biggr"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="lfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="lfence"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="mfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="mfence"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="rfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="rfence"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="checkedfences" type="environment"/> + <cd:command category="mathematics" file="math-fen.mkiv" level="style" name="checkedfences" type="environment"/> </cd:interface> <cd:interface file="i-mathmatrix.xml"> - <cd:command file="math-ali.mkiv" name="definemathmatrix"> + <cd:command category="mathematics tables" file="math-ali.mkiv" level="style" name="definemathmatrix"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21360,7 +22500,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="setupmathmatrix"> + <cd:command category="mathematics tables" file="math-ali.mkiv" level="style" name="setupmathmatrix"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21390,6 +22530,9 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="simplecommand"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="location"> <cd:constant type="top"/> <cd:constant type="bottom"/> @@ -21401,7 +22544,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" generated="yes" name="mathmatrix" type="environment" variant="instance"> + <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathmatrix"/> </cd:sequence> @@ -21410,25 +22553,28 @@ <cd:inherit name="setupmathmatrix"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="matrix"/> + <cd:constant value="mathmatrix"/> + </cd:instances> </cd:command> - <cd:command file="math-ali.mkiv" name="matrices" type="environment"> + <cd:command category="mathematics tables" file="math-ali.mkiv" level="document" name="matrices" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="intertext" type="environment"/> - <cd:command file="math-ali.mkiv" name="intertext"> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="intertext" type="environment"/> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="intertext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="substack" type="environment"/> - <cd:command file="math-ali.mkiv" name="overset"> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="substack" type="environment"/> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="overset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -21438,7 +22584,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="underset"> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="underset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -21448,9 +22594,21 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="mathematics tables" file="math-pln.mkiv" 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: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:interface> <cd:interface file="i-mathornament.xml"> - <cd:command file="math-rad.mkvi" name="definemathornament"> + <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="definemathornament"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21463,7 +22621,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" name="setupmathornament"> + <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="setupmathornament"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21484,7 +22642,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" generated="yes" name="mathornament" variant="example"> + <cd:command category="mathematics" file="math-rad.mkvi" generated="yes" level="document" name="mathornament" variant="example"> <cd:sequence> <cd:variable value="mathornament"/> </cd:sequence> @@ -21494,7 +22652,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mathradical.xml"> - <cd:command file="math-rad.mkvi" name="definemathradical"> + <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="definemathradical"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21507,7 +22665,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" name="setupmathradical"> + <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="setupmathradical"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21530,7 +22688,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" generated="yes" name="mathradical" variant="example"> + <cd:command category="mathematics" file="math-rad.mkvi" generated="yes" level="document" name="mathradical" variant="example"> <cd:sequence> <cd:variable value="mathradical"/> </cd:sequence> @@ -21541,7 +22699,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" name="sqrt"> + <cd:command category="mathematics" file="math-rad.mkvi" level="document" name="sqrt"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -21551,7 +22709,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mathstackers.xml"> - <cd:command file="math-stc.mkvi" name="definemathstackers"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="definemathstackers"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21564,7 +22722,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="setupmathstackers"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="setupmathstackers"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21658,7 +22816,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reverse"/> @@ -21674,17 +22832,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathextensible" variant="instance"> <cd:sequence> - <cd:variable value="mathextensible"/> + <cd:instance value="mathextensible"/> </cd:sequence> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> @@ -21692,8 +22844,92 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:constant value="xrel"/> + <cd:constant value="xequal"/> + <cd:constant value="xleftarrow"/> + <cd:constant value="xrightarrow"/> + <cd:constant value="xleftrightarrow"/> + <cd:constant value="xLeftarrow"/> + <cd:constant value="xRightarrow"/> + <cd:constant value="xLeftrightarrow"/> + <cd:constant value="xtwoheadleftarrow"/> + <cd:constant value="xtwoheadrightarrow"/> + <cd:constant value="xmapsto"/> + <cd:constant value="xhookleftarrow"/> + <cd:constant value="xhookrightarrow"/> + <cd:constant value="xleftharpoondown"/> + <cd:constant value="xleftharpoonup"/> + <cd:constant value="xrightharpoondown"/> + <cd:constant value="xrightharpoonup"/> + <cd:constant value="xrightoverleftarrow"/> + <cd:constant value="xleftrightharpoons"/> + <cd:constant value="xrightleftharpoons"/> + <cd:constant value="xtriplerel"/> + <cd:constant value="mrel"/> + <cd:constant value="mequal"/> + <cd:constant value="mleftarrow"/> + <cd:constant value="mrightarrow"/> + <cd:constant value="mleftrightarrow"/> + <cd:constant value="mLeftarrow"/> + <cd:constant value="mRightarrow"/> + <cd:constant value="mLeftrightarrow"/> + <cd:constant value="mtwoheadleftarrow"/> + <cd:constant value="mtwoheadrightarrow"/> + <cd:constant value="mmapsto"/> + <cd:constant value="mhookleftarrow"/> + <cd:constant value="mhookrightarrow"/> + <cd:constant value="mleftharpoondown"/> + <cd:constant value="mleftharpoonup"/> + <cd:constant value="mrightharpoondown"/> + <cd:constant value="mrightharpoonup"/> + <cd:constant value="mrightoverleftarrow"/> + <cd:constant value="mleftrightharpoons"/> + <cd:constant value="mrightleftharpoons"/> + <cd:constant value="mtriplerel"/> + <cd:constant value="eleftarrowfill"/> + <cd:constant value="erightarrowfill"/> + <cd:constant value="eleftrightarrowfill"/> + <cd:constant value="etwoheadrightarrowfill"/> + <cd:constant value="eleftharpoondownfill"/> + <cd:constant value="eleftharpoonupfill"/> + <cd:constant value="erightharpoondownfill"/> + <cd:constant value="erightharpoonupfill"/> + <cd:constant value="eoverbarfill"/> + <cd:constant value="eunderbarfill"/> + <cd:constant value="eoverbracefill"/> + <cd:constant value="eunderbracefill"/> + <cd:constant value="eoverparentfill"/> + <cd:constant value="eunderparentfill"/> + <cd:constant value="eoverbracketfill"/> + <cd:constant value="eunderbracketfill"/> + <cd:constant value="trel"/> + <cd:constant value="tequal"/> + <cd:constant value="tmapsto"/> + <cd:constant value="tleftarrow"/> + <cd:constant value="trightarrow"/> + <cd:constant value="tleftrightarrow"/> + <cd:constant value="tLeftarrow"/> + <cd:constant value="tRightarrow"/> + <cd:constant value="tLeftrightarrow"/> + <cd:constant value="ttwoheadleftarrow"/> + <cd:constant value="ttwoheadrightarrow"/> + <cd:constant value="thookleftarrow"/> + <cd:constant value="thookrightarrow"/> + <cd:constant value="tleftharpoondown"/> + <cd:constant value="tleftharpoonup"/> + <cd:constant value="trightharpoondown"/> + <cd:constant value="trightharpoonup"/> + <cd:constant value="trightoverleftarrow"/> + <cd:constant value="tleftrightharpoons"/> + <cd:constant value="trightleftharpoons"/> + <cd:constant value="ttriplerel"/> + <cd:constant value="cleftarrow"/> + <cd:constant value="crightarrow"/> + <cd:constant value="crightoverleftarrow"/> + </cd:instances> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathoverextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathoverextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -21707,7 +22943,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathoverextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathoverextensible" variant="example"> <cd:sequence> <cd:variable value="mathoverextensible"/> </cd:sequence> @@ -21717,11 +22953,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathunderextensible"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="definemathover"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="bottom"/> + <cd:keywords> + <cd:constant type="top"/> <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords> <cd:constant type="cd:name"/> @@ -21731,20 +22968,24 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathunderextensible" variant="example"> - <cd:sequence> - <cd:variable value="mathunderextensible"/> - </cd:sequence> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="mathover"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="top"/> + <cd:constant type="vfenced"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathdoubleextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathunderextensible"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="both"/> + <cd:constant type="bottom"/> <cd:constant type="vfenced"/> </cd:keywords> <cd:keywords> @@ -21753,14 +22994,11 @@ <cd:keywords> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords> - <cd:constant type="cd:number"/> - </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathdoubleextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathunderextensible" variant="example"> <cd:sequence> - <cd:variable value="mathdoubleextensible"/> + <cd:variable value="mathunderextensible"/> </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> @@ -21768,10 +23006,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathovertextextensible"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="definemathunder"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="bothtext"/> + <cd:keywords> + <cd:constant type="bottom"/> + <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords> <cd:constant type="cd:name"/> @@ -21781,23 +23021,25 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathovertextextensible" variant="example"> - <cd:sequence> - <cd:variable value="mathovertextextensible"/> - </cd:sequence> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="mathunder"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="bottom"/> + <cd:constant type="vfenced"/> + </cd:keywords> <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathundertextextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathdoubleextensible"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="bothtext"/> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> </cd:keywords> <cd:keywords> <cd:constant type="cd:name"/> @@ -21805,11 +23047,14 @@ <cd:keywords> <cd:constant type="cd:number"/> </cd:keywords> + <cd:keywords> + <cd:constant type="cd:number"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathundertextextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathdoubleextensible" variant="instance"> <cd:sequence> - <cd:variable value="mathundertextextensible"/> + <cd:instance value="mathdoubleextensible"/> </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> @@ -21819,1124 +23064,98 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:constant value="doublebar"/> + <cd:constant value="doublebrace"/> + <cd:constant value="doubleparent"/> + <cd:constant value="doublebracket"/> + <cd:constant value="overbarunderbar"/> + <cd:constant value="overbraceunderbrace"/> + <cd:constant value="overparentunderparent"/> + <cd:constant value="overbracketunderbracket"/> + </cd:instances> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathtriplet"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="definemathdouble"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> <cd:keywords> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathtriplet" variant="example"> - <cd:sequence> - <cd:variable value="mathtriplet"/> - </cd:sequence> - <cd:arguments> - <cd:keywords optional="yes"> + <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mathtriplet"> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="mathdouble"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xrel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xequal"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xLeftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xRightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xLeftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xtwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xtwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xmapsto"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xhookleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xhookrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xrightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xrightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xrightoverleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xleftrightharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xrightleftharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="xtriplerel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mrel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mequal"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mLeftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mRightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mLeftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mtwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mtwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mmapsto"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mhookleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mhookrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mrightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mrightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mrightoverleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mleftrightharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mrightleftharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="mtriplerel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eleftarrowfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="erightarrowfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eleftrightarrowfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="etwoheadrightarrowfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eleftharpoondownfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eleftharpoonupfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="erightharpoondownfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="erightharpoonupfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eoverbarfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eunderbarfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eoverbracefill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eunderbracefill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eoverparentfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eunderparentfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eoverbracketfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="eunderbracketfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="trel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tequal"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tmapsto"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="trightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tLeftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tRightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tLeftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="ttwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="ttwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="thookleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="thookrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="trightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="trightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="trightoverleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="tleftrightharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="trightleftharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="ttriplerel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="cleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="crightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="crightoverleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="undertwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="undertwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underrightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underrightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underbar"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underbrace"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underparent"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underbracket"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overtwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overtwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overrightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overrightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overbar"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overbrace"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overparent"> - <cd:arguments> <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant type="cd:number"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overbracket"> - <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="doublebar"> - <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="doublebrace"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathovertextextensible"> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="doubleparent"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="bothtext"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="doublebracket"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:name"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overbarunderbar"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overbraceunderbrace"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathovertextextensible" variant="instance"> + <cd:sequence> + <cd:instance value="mathovertextextensible"/> + </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overparentunderparent"> - <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathovertextextensible"/> + </cd:instances> </cd:command> - <cd:command file="math-stc.mkvi" name="overbracketunderbracket"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathundertextextensible"> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="bothtext"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overbartext"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overbracetext"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathundertextextensible" variant="instance"> + <cd:sequence> + <cd:instance value="mathundertextextensible"/> + </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22945,71 +23164,62 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathundertextextensible"/> + </cd:instances> </cd:command> - <cd:command file="math-stc.mkvi" name="overparenttext"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathtriplet"> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="overbrackettext"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="underbartext"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathtriplet" variant="example"> + <cd:sequence> + <cd:variable value="mathtriplet"/> + </cd:sequence> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underbracetext"> - <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="underparenttext"> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="mathtriplet"> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-stc.mkvi" name="underbrackettext"> - <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="singlebond"/> - <cd:command file="math-stc.mkvi" name="doublebond"/> - <cd:command file="math-stc.mkvi" name="triplebond"/> - <cd:command file="math-stc.mkvi" name="definemathunstacked"> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="singlebond"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="doublebond"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="triplebond"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="definemathunstacked"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="wide"/> @@ -23022,33 +23232,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathunstacked" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathunstacked" variant="example"> <cd:sequence> <cd:variable value="mathunstacked"/> </cd:sequence> </cd:command> - <cd:command file="math-stc.mkvi" name="And"/> - <cd:command file="math-stc.mkvi" name="impliedby"/> - <cd:command file="math-stc.mkvi" name="implies"/> - <cd:command file="math-stc.mkvi" name="iff"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="And"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="impliedby"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="implies"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="iff"/> </cd:interface> <cd:interface file="i-metapost.xml"> - <cd:command file="meta-ini.mkiv" name="MPdefinitions" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPdefinitions" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPextensions" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPextensions" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPinitializations" type="environment"/> - <cd:command file="meta-ini.mkiv" name="MPinclusions" type="environment"> + <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:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -23058,7 +23268,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPinclusions"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinclusions"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -23069,7 +23279,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="defineMPinstance"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="defineMPinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23082,7 +23292,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setupMPinstance"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setupMPinstance"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23120,50 +23330,50 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="resetMPinstance"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="system" name="resetMPinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="processMPfigurefile"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="processMPfigurefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPdrawing" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPdrawing" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="-"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="resetMPdrawing"/> - <cd:command file="meta-ini.mkiv" name="getMPdrawing"/> - <cd:command begin="push" end="pop" file="meta-ini.mkiv" name="MPdrawing" type="environment"/> - <cd:command file="meta-ini.mkiv" name="MPdrawing"> + <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:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPclip" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" 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 file="meta-ini.mkiv" name="MPfontsizehskip"> + <cd:command category="graphics metapost fonts" file="meta-ini.mkiv" 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" name="setupMPvariables"> + <cd:command file="meta-ini.mkiv" level="style" name="setupMPvariables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -23175,7 +23385,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setMPvariables"> + <cd:command file="meta-ini.mkiv" level="style" name="setMPvariables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -23187,7 +23397,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setMPvariable"> + <cd:command file="meta-ini.mkiv" level="style" name="setMPvariable"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23199,7 +23409,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPrawvar"> + <cd:command file="meta-ini.mkiv" level="system" name="MPrawvar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23209,21 +23419,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPvariable"> + <cd:command file="meta-ini.mkiv" 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" name="MPvar"> + <cd:command file="meta-ini.mkiv" 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" name="useMPvariables"> + <cd:command file="meta-ini.mkiv" level="style" name="useMPvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23233,7 +23443,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="uniqueMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23243,7 +23453,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="uniqueMPgraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23255,7 +23465,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="useMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23265,7 +23475,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="useMPgraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23277,7 +23487,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="usableMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="usableMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23287,7 +23497,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="reuseMPgraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reuseMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23299,7 +23509,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="reusableMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reusableMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23309,7 +23519,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="reusableMPgraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reusableMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23321,7 +23531,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="uniqueMPpagegraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPpagegraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23331,7 +23541,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="uniqueMPpagegraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPpagegraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23343,21 +23553,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="processMPbuffer"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" 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 file="meta-ini.mkiv" name="runMPbuffer"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" 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 file="meta-ini.mkiv" name="MPenvironment" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPenvironment" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -23366,22 +23576,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="resetMPenvironment"/> - <cd:command file="meta-ini.mkiv" name="useMPenvironmentbuffer"> + <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:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPcode" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPcode" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPcode"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPcode"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> @@ -23389,14 +23599,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPrun" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" 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 file="meta-ini.mkiv" name="useMPrun"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="useMPrun"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23406,14 +23616,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="useMPlibrary"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPlibrary"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setMPtext"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setMPtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23423,28 +23633,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPtext"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPstring"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPbetex"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPbetex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="doifelseMPgraphic"> + <cd:command category="graphics metapost conditional" file="meta-ini.mkiv" level="style" name="doifelseMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23457,7 +23667,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="doifMPgraphicelse"> + <cd:command category="graphics metapost conditional" file="meta-ini.mkiv" level="style" name="doifMPgraphicelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23470,14 +23680,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="staticMPfigure" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" 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 file="meta-ini.mkiv" name="staticMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="staticMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23487,7 +23697,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="usestaticMPfigure"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="usestaticMPfigure"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupscale"/> @@ -23497,7 +23707,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setupMPgraphics"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setupMPgraphics"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -23512,7 +23722,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mixedcolumns.xml"> - <cd:command file="page-mix.mkiv" name="definemixedcolumns"> + <cd:command category="structure layout" file="page-mix.mkiv" level="style" name="definemixedcolumns"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23525,7 +23735,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" name="setupmixedcolumns"> + <cd:command category="structure layout" file="page-mix.mkiv" level="style" name="setupmixedcolumns"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23608,7 +23818,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" name="mixedcolumns" type="environment"> + <cd:command category="structure layout" file="page-mix.mkiv" level="document" name="mixedcolumns" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -23618,7 +23828,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" generated="yes" name="mixedcolumns" type="environment" variant="instance"> + <cd:command category="structure layout" file="page-mix.mkiv" generated="yes" level="document" name="mixedcolumns" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mixedcolumns"/> </cd:sequence> @@ -23627,95 +23837,98 @@ <cd:inherit name="setupmixedcolumns"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="itemgroupcolumns"/> + <cd:constant value="boxedcolumns"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-modes.xml"> - <cd:command file="core-env.mkiv" name="newmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="newmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="setmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="resetmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="resetmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="newsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="newsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="setsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="resetsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="resetsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="preventmode"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="preventmode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="enablemode"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="enablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="disablemode"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="disablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="globalpreventmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="globalpreventmode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="globalenablemode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="globalenablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="globaldisablemode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="globaldisablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="definemode"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="definemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -23727,14 +23940,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="booleanmodevalue"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="booleanmodevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelsemode"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifelsemode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23747,7 +23960,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifmodeelse"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifmodeelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23760,7 +23973,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifmode"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifmode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23770,7 +23983,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotmode"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifnotmode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23780,21 +23993,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="mode" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="mode" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="notmode" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="notmode" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelseallmodes"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifelseallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23807,7 +24020,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifallmodeselse"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifallmodeselse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23820,7 +24033,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifallmodes"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23833,7 +24046,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotallmodes"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifnotallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23846,21 +24059,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="allmodes" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="allmodes" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="notallmodes" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="notallmodes" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="modeset" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="modeset" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -23869,28 +24082,28 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="pushmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="pushmode"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="popmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="popmode"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="pushsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="pushsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="popsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="popsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23899,7 +24112,7 @@ </cd:command> </cd:interface> <cd:interface file="i-modules.xml"> - <cd:command file="file-mod.mkvi" name="usemodule"> + <cd:command file="file-mod.mkvi" level="style" name="usemodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -23918,7 +24131,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="usetexmodule"> + <cd:command file="file-mod.mkvi" level="style" name="usetexmodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -23937,21 +24150,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="module" type="environment"> + <cd:command 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" name="module" type="environment" variant="string"> + <cd:command 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" name="setupmodule"> + <cd:command file="file-mod.mkvi" level="system" name="setupmodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:file"/> @@ -23967,7 +24180,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="moduleparameter"> + <cd:command file="file-mod.mkvi" level="system" name="moduleparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -23977,15 +24190,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="currentmoduleparameter"> + <cd:command 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" name="moduletestsection" type="environment"/> - <cd:command file="file-mod.mkvi" name="fetchruntinecommand"> + <cd:command file="file-mod.mkvi" level="system" name="moduletestsection" type="environment"/> + <cd:command file="file-mod.mkvi" level="system" name="fetchruntinecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -23993,14 +24206,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="luaenvironment"> + <cd:command 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" name="useluamodule"> + <cd:command file="file-mod.mkvi" level="system" name="useluamodule"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -24009,7 +24222,7 @@ </cd:command> </cd:interface> <cd:interface file="i-narrow.xml"> - <cd:command file="spac-hor.mkiv" name="definenarrower"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="style" name="definenarrower"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24022,7 +24235,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="setupnarrower"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="style" name="setupnarrower"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24055,7 +24268,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="narrower" type="environment"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrower" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant method="none" prefix="cd:sign" type="left"/> @@ -24065,10 +24278,11 @@ <cd:constant method="factor" prefix="cd:number" type="middle"/> <cd:constant method="factor" prefix="cd:number" type="right"/> <cd:constant type="reset"/> + <cd:constant type="reverse"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" generated="yes" name="narrower" type="environment" variant="example"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" generated="yes" level="document" name="narrower" type="environment" variant="example"> <cd:sequence> <cd:variable value="narrower"/> </cd:sequence> @@ -24081,10 +24295,11 @@ <cd:constant method="factor" prefix="cd:number" type="middle"/> <cd:constant method="factor" prefix="cd:number" type="right"/> <cd:constant type="reset"/> + <cd:constant type="reverse"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="narrow" type="environment"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24094,7 +24309,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="narrow" type="environment" variant="name"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24107,10 +24322,11 @@ <cd:constant method="factor" prefix="cd:number" type="middle"/> <cd:constant method="factor" prefix="cd:number" type="right"/> <cd:constant type="reset"/> + <cd:constant type="reverse"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="narrow" type="environment" variant="assignment"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnarrower"/> @@ -24123,12 +24339,13 @@ <cd:constant method="factor" prefix="cd:number" type="middle"/> <cd:constant method="factor" prefix="cd:number" type="right"/> <cd:constant type="reset"/> + <cd:constant type="reverse"/> </cd:keywords> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-naturaltable.xml"> - <cd:command file="tabl-ntb.mkiv" name="setupTABLE"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="style" name="setupTABLE"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="r"/> @@ -24248,14 +24465,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TABLE" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TD" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TD" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -24283,77 +24500,77 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TR" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TC" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TX" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TY" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TH" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TN" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TABLEhead" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TABLEnext" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TABLEbody" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TABLEfoot" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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 file="tabl-ntb.mkiv" name="defineTABLEsetup"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="style" name="defineTABLEsetup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24363,49 +24580,49 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TDs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" 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" end="e" file="tabl-ntb.mkiv" name="TRs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TRs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-ntb.mkiv" name="TABLE" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" 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 file="tabl-ntb.mkiv" name="TABLEhead" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" 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 file="tabl-ntb.mkiv" name="TABLEnext" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" 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 file="tabl-ntb.mkiv" name="TABLEbody" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" 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 file="tabl-ntb.mkiv" name="TABLEfoot" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEfoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -24414,7 +24631,7 @@ </cd:command> </cd:interface> <cd:interface file="i-note.xml"> - <cd:command file="strc-not.mkvi" name="setupnotation"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotation"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24538,6 +24755,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </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:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -24588,7 +24811,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setupnotations"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotations"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24598,7 +24821,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" generated="yes" name="note" type="environment" variant="instance:assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance:assignment"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24618,9 +24841,12 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> + </cd:instances> </cd:command> - <cd:command file="strc-not.mkvi" generated="yes" name="note" type="environment" variant="instance"> + <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24629,9 +24855,12 @@ <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> + </cd:instances> </cd:command> - <cd:command file="strc-not.mkvi" generated="yes" name="note" variant="instance"> + <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24643,9 +24872,12 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> + </cd:instances> </cd:command> - <cd:command file="strc-not.mkvi" generated="yes" name="note" variant="instance:assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance:assignment"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24665,9 +24897,12 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> + </cd:instances> </cd:command> - <cd:command file="strc-not.mkvi" name="definenote"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="definenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24680,7 +24915,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setupnote"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24813,11 +25048,17 @@ <cd:parameter name="anchor"> <cd:constant type="next"/> </cd:parameter> + <cd:parameter name="spacebefore"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setupnotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotes"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24827,7 +25068,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setnote"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24840,7 +25081,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setnote" variant="assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote" variant="assignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24861,7 +25102,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setnotetext"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnotetext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24874,7 +25115,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setnotetext" variant="assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnotetext" variant="assignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24895,7 +25136,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="placenotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placenotes"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -24905,14 +25146,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="localnotes" type="environment"> + <cd:command category="structure notes" file="strc-not.mkvi" 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 file="strc-not.mkvi" name="placelocalnotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placelocalnotes"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24922,9 +25163,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="postponenotes"/> - <cd:command file="strc-not.mkvi" name="flushnotes"/> - <cd:command file="strc-not.mkvi" name="doifelsenoteonsamepage"> + <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 conditional" file="strc-not.mkvi" level="system" name="doifelsenoteonsamepage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24937,7 +25178,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="doifnoteonsamepageelse"> + <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifnoteonsamepageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24950,7 +25191,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="doifnotescollected"> + <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifnotescollected"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24960,7 +25201,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="notesymbol"> + <cd:command category="structure notes" file="strc-not.mkvi" level="system" name="notesymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24970,7 +25211,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="note"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="note"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24980,7 +25221,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="footnotetext"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="footnotetext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -24990,7 +25231,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="footnotetext" variant="assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="footnotetext" variant="assignment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -25008,22 +25249,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="placefootnotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placefootnotes"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="localfootnotes" type="environment"/> - <cd:command file="strc-not.mkvi" name="placelocalfootnotes"> + <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:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lnt.mkvi" name="definelinenote"> + <cd:command category="structure notes" file="strc-lnt.mkvi" level="style" name="definelinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25036,7 +25277,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lnt.mkvi" name="setuplinenote"> + <cd:command category="structure notes" file="strc-lnt.mkvi" level="style" name="setuplinenote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25061,7 +25302,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lnt.mkvi" generated="yes" name="linenote" variant="instance"> + <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="linenote" variant="instance"> <cd:sequence> <cd:instance value="linenote"/> </cd:sequence> @@ -25070,9 +25311,11 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="linenote"/> + </cd:instances> </cd:command> - <cd:command file="strc-lnt.mkvi" generated="yes" name="startlinenote" variant="instance"> + <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="startlinenote" variant="instance"> <cd:sequence> <cd:string value="start"/> <cd:instance value="linenote"/> @@ -25085,9 +25328,11 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="linenote"/> + </cd:instances> </cd:command> - <cd:command file="strc-lnt.mkvi" generated="yes" name="stoplinenote" variant="instance"> + <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="stoplinenote" variant="instance"> <cd:sequence> <cd:string value="stop"/> <cd:instance value="linenote"/> @@ -25097,9 +25342,11 @@ <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="linenote"/> + </cd:instances> </cd:command> - <cd:command file="strc-lnt.mkvi" name="fromlinenote"> + <cd:command category="structure notes" file="strc-lnt.mkvi" level="document" name="fromlinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -25109,7 +25356,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lnt.mkvi" name="tolinenote"> + <cd:command category="structure notes" file="strc-lnt.mkvi" level="document" name="tolinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -25118,7 +25365,7 @@ </cd:command> </cd:interface> <cd:interface file="i-object.xml"> - <cd:command file="pack-obj.mkiv" name="ifinobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="ifinobject"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -25130,11 +25377,11 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="objectmargin"/> - <cd:command file="pack-obj.mkiv" name="objectwidth"/> - <cd:command file="pack-obj.mkiv" name="objectheight"/> - <cd:command file="pack-obj.mkiv" name="objectdepth"/> - <cd:command file="pack-obj.mkiv" name="setreferencedobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="objectmargin"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="objectwidth"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="objectheight"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="objectdepth"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="setreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25146,7 +25393,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="settightreferencedobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="settightreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25158,7 +25405,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="setunreferencedobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="setunreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25170,7 +25417,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="settightunreferencedobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="settightunreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25182,7 +25429,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="setobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="setobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25194,7 +25441,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="settightobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="settightobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25206,7 +25453,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="getobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="getobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25216,7 +25463,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="getobjectdimensions"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="getobjectdimensions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25226,9 +25473,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="defaultobjectreference"/> - <cd:command file="pack-obj.mkiv" name="defaultobjectpage"/> - <cd:command file="pack-obj.mkiv" name="doifelseobjectfound"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25244,7 +25491,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="doifobjectfoundelse"> + <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifobjectfoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25260,7 +25507,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="doifelseobjectreferencefound"> + <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifelseobjectreferencefound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25276,7 +25523,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="doifobjectreferencefoundelse"> + <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifobjectreferencefoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25294,7 +25541,7 @@ </cd:command> </cd:interface> <cd:interface file="i-offset.xml"> - <cd:command file="pack-box.mkiv" name="setupoffsetbox"> + <cd:command category="layout" file="pack-box.mkiv" level="style" name="setupoffsetbox"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="x"> @@ -25345,14 +25592,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setupoffset"> + <cd:command category="layout" file="pack-box.mkiv" level="style" name="setupoffset"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupoffsetbox"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="offsetbox"> + <cd:command category="layout" file="pack-box.mkiv" level="system" name="offsetbox"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffsetbox"/> @@ -25361,7 +25608,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="offset"> + <cd:command category="layout" file="pack-box.mkiv" level="document" name="offset"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffset"/> @@ -25371,7 +25618,7 @@ </cd:command> </cd:interface> <cd:interface file="i-opposite.xml"> - <cd:command file="page-fac.mkiv" name="setupoppositeplacing"> + <cd:command category="layout" file="page-fac.mkiv" level="style" name="setupoppositeplacing"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -25390,10 +25637,10 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-fac.mkiv" name="opposite" type="environment"/> + <cd:command category="layout" file="page-fac.mkiv" level="document" name="opposite" type="environment"/> </cd:interface> <cd:interface file="i-ornament.xml"> - <cd:command file="pack-box.mkiv" name="ornamenttext" variant="collector"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="collector"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -25418,7 +25665,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="ornamenttext" variant="layer"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="layer"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -25436,7 +25683,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="ornamenttext" variant="direct"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="direct"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25447,7 +25694,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="defineornament" variant="collector"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="style" name="defineornament" variant="collector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25471,7 +25718,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="defineornament" variant="layer"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="style" name="defineornament" variant="layer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25488,7 +25735,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" generated="yes" name="ornament" variant="example"> + <cd:command category="background fonts colors" file="pack-box.mkiv" generated="yes" level="document" name="ornament" variant="example"> <cd:sequence> <cd:variable value="ornament"/> </cd:sequence> @@ -25501,7 +25748,7 @@ </cd:command> </cd:interface> <cd:interface file="i-output.xml"> - <cd:command file="page-otr.mkvi" name="defineoutputroutine"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="defineoutputroutine"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25514,7 +25761,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" name="setupoutputroutine"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="setupoutputroutine"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25526,22 +25773,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" name="setupoutputroutine" variant="name"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="setupoutputroutine" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" name="defineoutputroutinecommand"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="defineoutputroutinecommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" name="traceoutputroutines"/> - <cd:command file="page-otr.mkvi" name="installoutputroutine"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="traceoutputroutines"/> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="installoutputroutine"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -25551,7 +25798,7 @@ </cd:command> </cd:interface> <cd:interface file="i-overlay.xml"> - <cd:command file="pack-lyr.mkiv" name="defineoverlay"> + <cd:command category="background" file="pack-lyr.mkiv" level="style" name="defineoverlay"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -25564,14 +25811,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="overlaycolor"/> - <cd:command file="pack-rul.mkiv" name="overlaylinecolor"/> - <cd:command file="pack-rul.mkiv" name="overlaywidth"/> - <cd:command file="pack-rul.mkiv" name="overlayheight"/> - <cd:command file="pack-rul.mkiv" name="overlaydepth"/> - <cd:command file="pack-rul.mkiv" name="overlayoffset"/> - <cd:command file="pack-rul.mkiv" name="overlaylinewidth"/> - <cd:command file="pack-rul.mkiv" name="doifelseoverlay"> + <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" 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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25584,7 +25831,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="doifoverlayelse"> + <cd:command category="background conditional" file="pack-rul.mkiv" level="system" name="doifoverlayelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25599,7 +25846,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagebreak.xml"> - <cd:command file="page-brk.mkiv" name="definepagebreak"> + <cd:command file="page-brk.mkiv" level="style" name="definepagebreak"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25633,7 +25880,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="pagebreak"> + <cd:command file="page-brk.mkiv" level="document" name="pagebreak"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="empty"/> @@ -25665,14 +25912,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="page"> + <cd:command 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" name="definecolumnbreak"> + <cd:command file="page-brk.mkiv" level="style" name="definecolumnbreak"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25689,7 +25936,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="columnbreak"> + <cd:command file="page-brk.mkiv" level="document" name="columnbreak"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="yes"/> @@ -25704,14 +25951,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="column"> + <cd:command file="page-brk.mkiv" 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" name="definepagechecker"> + <cd:command file="page-brk.mkiv" level="style" name="definepagechecker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25724,7 +25971,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="setuppagechecker"> + <cd:command file="page-brk.mkiv" level="style" name="setuppagechecker"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25754,7 +26001,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="checkpage"> + <cd:command file="page-brk.mkiv" level="document" name="checkpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25764,7 +26011,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="testpage"> + <cd:command file="page-brk.mkiv" level="document" name="testpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -25774,7 +26021,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="testpageonly"> + <cd:command file="page-brk.mkiv" level="system" name="testpageonly"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -25784,7 +26031,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="testpagesync"> + <cd:command file="page-brk.mkiv" level="system" name="testpagesync"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -25794,7 +26041,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="testcolumn"> + <cd:command file="page-brk.mkiv" level="document" name="testcolumn"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -25806,7 +26053,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagecomment.xml"> - <cd:command file="page-com.mkiv" name="setuppagecomment"> + <cd:command category="pdf" file="page-com.mkiv" level="style" name="setuppagecomment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -25836,32 +26083,42 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-com.mkiv" name="pagecomment" type="environment"/> + <cd:command category="pdf" file="page-com.mkiv" level="document" name="pagecomment" type="environment"/> </cd:interface> <cd:interface file="i-pagefigure.xml"> - <cd:command file="page-app.mkiv" name="pagefigure"> + <cd:command category="graphics" file="page-app.mkiv" level="document" name="pagefigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupexternalfigure"/> + <cd:parameter name="offset"> + <cd:constant type="default"/> + <cd:constant type="overlay"/> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" name="pagefigure" type="environment"> + <cd:command category="graphics" file="page-app.mkiv" level="document" name="pagefigure" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupexternalfigure"/> + <cd:parameter name="offset"> + <cd:constant type="default"/> + <cd:constant type="overlay"/> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-pagegrid.xml"> - <cd:command file="page-cst.mkiv" name="definepagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegrid"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25874,7 +26131,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegrid"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25916,7 +26173,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" generated="yes" name="pagegrid" type="environment" variant="example"> + <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="pagegrid" type="environment" variant="example"> <cd:sequence> <cd:variable value="pagegrid"/> </cd:sequence> @@ -25926,7 +26183,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="pagegrid" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegrid" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25936,7 +26193,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setpagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="setpagegrid"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="c"> @@ -25952,7 +26209,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="definepagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridspan"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25965,7 +26222,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridspan"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25991,7 +26248,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="pagegridspan" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegridspan" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26001,14 +26258,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="pagegridspanwidth"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="pagegridspanwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="definepagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridarea"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26021,7 +26278,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridarea"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26061,7 +26318,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridareatext"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridareatext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26071,7 +26328,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridlines"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridlines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26087,7 +26344,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridstart"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridstart"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26105,7 +26362,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pageinjection.xml"> - <cd:command file="page-inj.mkvi" name="definepageinjection"> + <cd:command category="structure" file="page-inj.mkvi" level="style" name="definepageinjection"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26118,7 +26375,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="setuppageinjection"> + <cd:command category="structure" file="page-inj.mkvi" level="style" name="setuppageinjection"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26154,7 +26411,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="pageinjection"> + <cd:command category="structure" file="page-inj.mkvi" level="document" name="pageinjection"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26166,7 +26423,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="pageinjection" variant="assignment"> + <cd:command category="structure" file="page-inj.mkvi" level="document" name="pageinjection" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppageinjection"/> @@ -26178,7 +26435,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="definepageinjectionalternative"> + <cd:command category="structure" file="page-inj.mkvi" level="style" name="definepageinjectionalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26191,7 +26448,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="setuppageinjectionalternative"> + <cd:command category="structure" file="page-inj.mkvi" level="style" name="setuppageinjectionalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26205,7 +26462,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagelayout.xml"> - <cd:command file="page-plg.mkiv" name="pagearea"> + <cd:command category="layout" file="page-plg.mkiv" level="style" name="pagearea"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -26228,7 +26485,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-plg.mkiv" name="pagelayout" type="environment"> + <cd:command category="layout" file="page-plg.mkiv" level="style" name="pagelayout" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="page"/> @@ -26239,14 +26496,14 @@ </cd:command> </cd:interface> <cd:interface file="i-pagenumber.xml"> - <cd:command file="strc-pag.mkiv" name="setuprealpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="setuprealpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="setupuserpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setupuserpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="viewerprefix"> @@ -26263,24 +26520,24 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="setupsubpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setupsubpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="setuppagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupuserpagenumber"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="resetuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="resetsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="resetpagenumber"/> - <cd:command file="strc-pag.mkiv" name="setuppagenumbering"> + <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:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -26333,44 +26590,44 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="firstrealpagenumber"/> - <cd:command file="strc-pag.mkiv" name="firstuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="firstsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="lastrealpagenumber"/> - <cd:command file="strc-pag.mkiv" name="lastuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="lastsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="prevrealpagenumber"/> - <cd:command file="strc-pag.mkiv" name="prevuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="prevsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="nextrealpagenumber"/> - <cd:command file="strc-pag.mkiv" name="nextuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="nextsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="firstrealpage"/> - <cd:command file="strc-pag.mkiv" name="firstuserpage"/> - <cd:command file="strc-pag.mkiv" name="firstsubpage"/> - <cd:command file="strc-pag.mkiv" name="prevrealpage"/> - <cd:command file="strc-pag.mkiv" name="prevuserpage"/> - <cd:command file="strc-pag.mkiv" name="prevsubpage"/> - <cd:command file="strc-pag.mkiv" name="nextrealpage"/> - <cd:command file="strc-pag.mkiv" name="nextuserpage"/> - <cd:command file="strc-pag.mkiv" name="nextsubpage"/> - <cd:command file="strc-pag.mkiv" name="lastrealpage"/> - <cd:command file="strc-pag.mkiv" name="lastuserpage"/> - <cd:command file="strc-pag.mkiv" name="lastsubpage"/> - <cd:command file="strc-pag.mkiv" name="realpagenumber"/> - <cd:command file="strc-pag.mkiv" name="userpagenumber"/> - <cd:command file="strc-pag.mkiv" name="subpagenumber"/> - <cd:command file="strc-pag.mkiv" name="pagenumber"/> - <cd:command file="strc-pag.mkiv" name="prefixedpagenumber"/> - <cd:command file="strc-pag.mkiv" name="incrementpagenumber"/> - <cd:command file="strc-pag.mkiv" name="incrementsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="decrementpagenumber"/> - <cd:command file="strc-pag.mkiv" name="decrementsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="completepagenumber"/> - <cd:command file="strc-pag.mkiv" name="placepagenumber"/> + <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:interface> <cd:interface file="i-pageselection.xml"> - <cd:command file="page-sel.mkvi" name="insertpages"> + <cd:command file="page-sel.mkvi" level="document" name="insertpages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26391,7 +26648,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" name="filterpages"> + <cd:command file="page-sel.mkvi" level="document" name="filterpages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26415,7 +26672,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" name="copypages"> + <cd:command file="page-sel.mkvi" level="document" name="copypages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26437,7 +26694,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" name="combinepages"> + <cd:command file="page-sel.mkvi" level="document" name="combinepages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26504,7 +26761,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" name="slicepages"> + <cd:command file="page-sel.mkvi" level="document" name="slicepages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26553,7 +26810,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pageshift.xml"> - <cd:command file="page-imp.mkiv" name="definepageshift"> + <cd:command file="page-imp.mkiv" level="style" name="definepageshift"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26567,7 +26824,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" name="setuppageshift"> + <cd:command file="page-imp.mkiv" level="style" name="setuppageshift"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="page"/> @@ -26583,7 +26840,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagestate.xml"> - <cd:command file="core-dat.mkiv" name="definepagestate"> + <cd:command file="core-dat.mkiv" level="system" name="definepagestate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26596,7 +26853,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setuppagestate"> + <cd:command file="core-dat.mkiv" level="system" name="setuppagestate"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26609,7 +26866,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setpagestate"> + <cd:command file="core-dat.mkiv" level="system" name="setpagestate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26620,7 +26877,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="pagestaterealpage"> + <cd:command file="core-dat.mkiv" level="system" name="pagestaterealpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -26631,7 +26888,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setpagestaterealpageno"> + <cd:command file="core-dat.mkiv" level="system" name="setpagestaterealpageno"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -26643,8 +26900,33 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-pagemarks.xml"> + <cd:command file="page-lay.mkiv" level="style" name="markpage"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant method="none" prefix="cd:sign" type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="conditional" file="page-lay.mkiv" level="style" name="doifelsemarkedpage"> + <cd: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:interface> <cd:interface file="i-pairedbox.xml"> - <cd:command file="pack-com.mkiv" name="definepairedbox"> + <cd:command file="pack-com.mkiv" level="style" name="definepairedbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26657,7 +26939,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="setuppairedbox"> + <cd:command file="pack-com.mkiv" level="style" name="setuppairedbox"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26715,7 +26997,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="placepairedbox"> + <cd:command file="pack-com.mkiv" level="document" name="placepairedbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26729,7 +27011,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="placepairedbox" type="environment"> + <cd:command file="pack-com.mkiv" level="document" name="placepairedbox" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26739,7 +27021,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" name="setuppairedbox" variant="instance"> + <cd:command file="pack-com.mkiv" generated="yes" level="style" name="setuppairedbox" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="pairedbox"/> @@ -26749,9 +27031,11 @@ <cd:inherit name="setuppairedbox"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="legend"/> + </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" name="placepairedbox" variant="instance"> + <cd:command file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -26765,9 +27049,11 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="legend"/> + </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" name="placepairedbox" type="environment" variant="instance"> + <cd:command file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" type="environment" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -26777,15 +27063,17 @@ <cd:inherit name="setuppairedbox"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="legend"/> + </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" name="placeontopofeachother"> + <cd:command file="pack-com.mkiv" level="document" name="placeontopofeachother"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="placesidebyside"> + <cd:command file="pack-com.mkiv" level="document" name="placesidebyside"> <cd:arguments> <cd:content/> <cd:content/> @@ -26793,7 +27081,7 @@ </cd:command> </cd:interface> <cd:interface file="i-papersize.xml"> - <cd:command file="page-lay.mkiv" name="definepapersize"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="definepapersize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26829,7 +27117,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="definepapersize" variant="name"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="definepapersize" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26842,7 +27130,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuppapersize" variant="name"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuppapersize" variant="name"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -26868,7 +27156,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuppapersize"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuppapersize"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26953,14 +27241,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuppaper"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuppaper"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppapersize"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="adaptpapersize"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="adaptpapersize"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setuppapersize"/> @@ -26972,7 +27260,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraph.xml"> - <cd:command file="strc-tag.mkiv" name="defineparagraph"> + <cd:command category="structure" file="strc-tag.mkiv" level="style" name="defineparagraph"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26985,7 +27273,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="setupparagraph"> + <cd:command category="structure" file="strc-tag.mkiv" level="style" name="setupparagraph"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27007,7 +27295,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="paragraph" type="environment"> + <cd:command category="structure" file="strc-tag.mkiv" level="document" name="paragraph" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -27017,7 +27305,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="par" type="environment"> + <cd:command category="structure" file="strc-tag.mkiv" level="document" name="par" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -27027,8 +27315,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="strc-tag.mkiv" name="par" type="environment"/> - <cd:command file="spac-par.mkiv" name="setupparagraphintro"> + <cd:command begin="b" category="structure" end="e" file="strc-tag.mkiv" level="document" name="par" type="environment"/> + <cd:command category="structure" file="spac-par.mkiv" level="style" name="setupparagraphintro"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="reset"/> @@ -27043,7 +27331,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraphnumber.xml"> - <cd:command file="page-par.mkiv" name="setupparagraphnumbering"> + <cd:command category="structure counter" file="page-par.mkiv" level="style" name="setupparagraphnumbering"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -27067,7 +27355,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraphs.xml"> - <cd:command file="tabl-mis.mkiv" name="defineparagraphs"> + <cd:command category="tables" file="tabl-mis.mkiv" level="style" name="defineparagraphs"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27080,7 +27368,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="setupparagraphs"> + <cd:command category="tables" file="tabl-mis.mkiv" level="style" name="setupparagraphs"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -27144,7 +27432,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="setupparagraphs" variant="assignment"> + <cd:command category="tables" file="tabl-mis.mkiv" level="style" name="setupparagraphs" variant="assignment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant method="range" prefix="cd:name" type="cd:number"/> @@ -27204,34 +27492,34 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="paragraphs" type="environment"> + <cd:command category="tables" file="tabl-mis.mkiv" level="document" name="paragraphs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="nextparagraphs"/> - <cd:command file="tabl-mis.mkiv" generated="yes" name="paragraphs" type="environment" variant="example"> + <cd:command category="tables" file="tabl-mis.mkiv" level="document" name="nextparagraphs"/> + <cd:command category="tables" file="tabl-mis.mkiv" generated="yes" level="document" name="paragraphs" type="environment" variant="example"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command file="tabl-mis.mkiv" generated="yes" name="paragraphs" variant="example"> + <cd:command category="tables" file="tabl-mis.mkiv" generated="yes" level="document" name="paragraphs" variant="example"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command file="tabl-mis.mkiv" generated="yes" name="nextparagraphs" variant="example"> + <cd:command category="tables" file="tabl-mis.mkiv" generated="yes" level="document" name="nextparagraphs" variant="example"> <cd:sequence> <cd:string value="next"/> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command file="tabl-mis.mkiv" name="paragraphscell" type="environment"/> + <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" name="defineparallel"> + <cd:command file="buff-par.mkvi" level="style" name="defineparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27241,7 +27529,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="setupparallel"> + <cd:command file="buff-par.mkvi" level="style" name="setupparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27265,7 +27553,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="placeparallel"> + <cd:command file="buff-par.mkvi" level="document" name="placeparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27278,7 +27566,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="doifelseparallel"> + <cd:command category="conditional" file="buff-par.mkvi" level="style" name="doifelseparallel"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27295,7 +27583,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="doifparallelelse"> + <cd:command category="conditional" file="buff-par.mkvi" level="style" name="doifparallelelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27312,7 +27600,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="resetparallel"> + <cd:command file="buff-par.mkvi" level="style" name="resetparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27323,21 +27611,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" generated="yes" name="parallel" type="environment" variant="example"> + <cd:command file="buff-par.mkvi" generated="yes" level="document" name="parallel" type="environment" variant="example"> <cd:sequence> <cd:variable value="parallel"/> </cd:sequence> </cd:command> </cd:interface> <cd:interface file="i-parbuilder.xml"> - <cd:command file="typo-bld.mkiv" name="defineparbuilder"> + <cd:command category="layout" file="typo-bld.mkiv" level="system" name="defineparbuilder"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-bld.mkiv" name="parbuilder" type="environment"> + <cd:command category="layout" file="typo-bld.mkiv" level="system" name="parbuilder" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -27347,7 +27635,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-bld.mkiv" name="setmainparbuilder"> + <cd:command category="layout" file="typo-bld.mkiv" level="system" name="setmainparbuilder"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -27359,7 +27647,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pdf.xml"> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetcatalog"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetcatalog"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27369,7 +27657,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetinfo"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetinfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27379,7 +27667,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetname"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27389,7 +27677,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetpageattribute"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetpageattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27399,7 +27687,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetpagesattribute"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetpagesattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27409,7 +27697,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetpageresource"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetpageresource"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27419,7 +27707,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetextgstate"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetextgstate"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27429,7 +27717,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetcolorspace"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetcolorspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27439,7 +27727,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetpattern"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetpattern"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27449,7 +27737,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetshade"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetshade"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27459,31 +27747,31 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendcurrentresources"/> - <cd:command file="back-pdf.mkiv" name="pdfcolor"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendcurrentresources"/> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="PDFcolor"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="PDFcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="TransparencyHack"/> - <cd:command file="pack-obj.mkiv" name="lastpredefinedsymbol"/> - <cd:command file="pack-obj.mkiv" name="predefinesymbol"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="TransparencyHack"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="lastpredefinedsymbol"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="predefinesymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendactualtext"> + <cd:command category="pdf" file="back-pdf.mkiv" level="style" name="pdfbackendactualtext"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -27491,7 +27779,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfactualtext"> + <cd:command category="pdf" file="back-pdf.mkiv" level="document" name="pdfactualtext"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -27499,9 +27787,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-neg.mkiv" name="negative" type="environment"/> - <cd:command file="attr-neg.mkiv" name="positive" type="environment"/> - <cd:command file="scrn-pag.mkvi" name="setuppagetransitions"> + <cd:command category="pdf" file="attr-neg.mkiv" level="document" name="negative" type="environment"/> + <cd:command category="pdf" file="attr-neg.mkiv" level="document" name="positive" type="environment"/> + <cd:command category="pdf" file="scrn-pag.mkvi" level="style" name="setuppagetransitions"> <cd:arguments> <cd:keywords> <cd:constant default="yes" type="reset"/> @@ -27514,12 +27802,12 @@ </cd:command> </cd:interface> <cd:interface file="i-penalty.xml"> - <cd:command file="spac-ver.mkiv" name="resetpenalties"> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="resetpenalties"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setpenalties"> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="setpenalties"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -27530,17 +27818,17 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="keeplinestogether"> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="keeplinestogether"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setdefaultpenalties"/> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="setdefaultpenalties"/> </cd:interface> <cd:interface file="i-periods.xml"> - <cd:command file="enco-ini.mkiv" name="setupperiods"> + <cd:command category="symbols" file="enco-ini.mkiv" level="style" name="setupperiods"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -27559,39 +27847,39 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="periods"> + <cd:command category="symbols" file="enco-ini.mkiv" level="document" name="periods"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="periods" variant="assignment"> + <cd:command category="symbols" file="enco-ini.mkiv" level="document" name="periods" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupperiods"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="unknown"/> + <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" name="phantom"> + <cd:command file="supp-box.mkiv" level="style" name="phantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hphantom"> + <cd:command file="supp-box.mkiv" level="style" name="hphantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vphantom"> + <cd:command file="supp-box.mkiv" level="style" name="vphantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="phantombox"> + <cd:command file="pack-box.mkiv" level="style" name="phantombox"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -27608,7 +27896,7 @@ </cd:command> </cd:interface> <cd:interface file="i-placement.xml"> - <cd:command file="pack-mis.mkiv" name="defineplacement"> + <cd:command category="layout" file="pack-mis.mkiv" level="style" name="defineplacement"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27621,7 +27909,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mis.mkiv" name="setupplacement"> + <cd:command category="layout" file="pack-mis.mkiv" level="style" name="setupplacement"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27658,7 +27946,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mis.mkiv" name="placement"> + <cd:command category="layout" file="pack-mis.mkiv" level="style" name="placement"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27669,7 +27957,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-mis.mkiv" generated="yes" name="placement" variant="example"> + <cd:command category="layout" file="pack-mis.mkiv" generated="yes" level="style" name="placement" variant="example"> <cd:sequence> <cd:variable value="placement"/> </cd:sequence> @@ -27682,7 +27970,7 @@ </cd:command> </cd:interface> <cd:interface file="i-position.xml"> - <cd:command file="anch-pgr.mkiv" name="doifpositionaction"> + <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifpositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27695,7 +27983,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="doifelsepositionaction"> + <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifelsepositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27708,7 +27996,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="doifpositionactionelse"> + <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifpositionactionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27721,28 +28009,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="dopositionaction"> + <cd:command file="anch-pgr.mkiv" level="system" name="dopositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="positionoverlay"> + <cd:command category="background" file="anch-pgr.mkiv" level="system" name="positionoverlay"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPoverlayanchor"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPoverlayanchor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="positionregionoverlay"> + <cd:command category="background" file="anch-pgr.mkiv" level="system" name="positionregionoverlay"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27752,14 +28040,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="positionoverlay" type="environment"> + <cd:command category="background" file="anch-pgr.mkiv" level="system" name="positionoverlay" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPpositiongraphic" type="environment"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositiongraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27769,7 +28057,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPpositiongraphic"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositiongraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27781,14 +28069,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPpositionmethod" type="environment"> + <cd:command category="background metapost" file="anch-pgr.mkiv" 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 file="anch-pgr.mkiv" name="setMPpositiongraphic"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="setMPpositiongraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27803,7 +28091,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="setMPpositiongraphicrange"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="setMPpositiongraphicrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27821,7 +28109,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPgetposboxes"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetposboxes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -27831,7 +28119,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPgetmultipars"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetmultipars"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27841,7 +28129,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPgetmultishape"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetmultishape"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27851,196 +28139,196 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPp"> + <cd:command file="anch-pos.mkiv" level="system" name="MPp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPr"> + <cd:command file="anch-pos.mkiv" level="system" name="MPr"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPc"> + <cd:command file="anch-pos.mkiv" level="system" name="MPc"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPn"> + <cd:command file="anch-pos.mkiv" level="system" name="MPn"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPx"> + <cd:command file="anch-pos.mkiv" level="system" name="MPx"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPy"> + <cd:command file="anch-pos.mkiv" level="system" name="MPy"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPw"> + <cd:command file="anch-pos.mkiv" level="system" name="MPw"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPh"> + <cd:command file="anch-pos.mkiv" level="system" name="MPh"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPd"> + <cd:command file="anch-pos.mkiv" level="system" name="MPd"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPwhd"> + <cd:command file="anch-pos.mkiv" level="system" name="MPwhd"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPxy"> + <cd:command file="anch-pos.mkiv" level="system" name="MPxy"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPll"> + <cd:command file="anch-pos.mkiv" level="system" name="MPll"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPlr"> + <cd:command file="anch-pos.mkiv" level="system" name="MPlr"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPur"> + <cd:command file="anch-pos.mkiv" level="system" name="MPur"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPul"> + <cd:command file="anch-pos.mkiv" level="system" name="MPul"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPpos"> + <cd:command file="anch-pos.mkiv" level="system" name="MPpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPls"> + <cd:command file="anch-pos.mkiv" level="system" name="MPls"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPrs"> + <cd:command file="anch-pos.mkiv" level="system" name="MPrs"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPpardata"> + <cd:command file="anch-pos.mkiv" level="system" name="MPpardata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPxywhd"> + <cd:command file="anch-pos.mkiv" level="system" name="MPxywhd"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPposset"> + <cd:command file="anch-pos.mkiv" level="system" name="MPposset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPpage"> + <cd:command file="anch-pos.mkiv" level="system" name="MPpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPregion"> + <cd:command file="anch-pos.mkiv" level="system" name="MPregion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPcolumn"> + <cd:command file="anch-pos.mkiv" level="system" name="MPcolumn"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPanchor"> + <cd:command file="anch-pos.mkiv" level="system" name="MPanchor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPleftskip"> + <cd:command file="anch-pos.mkiv" level="system" name="MPleftskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPrightskip"> + <cd:command file="anch-pos.mkiv" level="system" name="MPrightskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPplus"> + <cd:command file="anch-pos.mkiv" level="system" name="MPplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28051,7 +28339,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPv"> + <cd:command file="anch-pos.mkiv" level="system" name="MPv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28062,7 +28350,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPrest"> + <cd:command file="anch-pos.mkiv" level="system" name="MPrest"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28070,7 +28358,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPvv"> + <cd:command file="anch-pos.mkiv" level="system" name="MPvv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28078,21 +28366,21 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositiononly"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositiononly"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setposition"> + <cd:command file="anch-pos.mkiv" level="system" name="setposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositiondata"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositiondata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28108,7 +28396,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositionbox"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositionbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28117,14 +28405,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositionstrut"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositionstrut"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositiondataplus"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositiondataplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28143,7 +28431,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositionplus"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositionplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28155,7 +28443,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="copyposition"> + <cd:command file="anch-pos.mkiv" level="system" name="copyposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28165,7 +28453,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifposition"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28178,7 +28466,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelseposition"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelseposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28191,7 +28479,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositionelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28204,7 +28492,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelsepositiononpage"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositiononpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28220,7 +28508,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositiononpageelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositiononpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28236,14 +28524,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="xypos"> + <cd:command file="anch-pos.mkiv" level="system" name="xypos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="hpos"> + <cd:command file="anch-pos.mkiv" level="system" name="hpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28251,7 +28539,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="vpos"> + <cd:command file="anch-pos.mkiv" level="system" name="vpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28259,24 +28547,24 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="bpos"> + <cd:command file="anch-pos.mkiv" level="system" name="bpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="epos"> + <cd:command file="anch-pos.mkiv" level="system" name="epos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="tracepositions"/> - <cd:command file="anch-pos.mkiv" name="enableparpositions"/> - <cd:command file="anch-pos.mkiv" name="disableparpositions"/> - <cd:command file="anch-pos.mkiv" name="doifelseoverlapping"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28292,7 +28580,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifoverlappingelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifoverlappingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28308,7 +28596,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelsepositionsonsamepage"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsonsamepage"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28321,7 +28609,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositionsonsamepageelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsonsamepageelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28334,7 +28622,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelsepositionsonthispage"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsonthispage"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28347,7 +28635,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositionsonthispageelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsonthispageelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28360,7 +28648,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelsepositionsused"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -28370,7 +28658,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositionsusedelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsusedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -28382,7 +28670,7 @@ </cd:command> </cd:interface> <cd:interface file="i-positionbar.xml"> - <cd:command file="pack-bar.mkiv" name="setuppositionbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="setuppositionbar"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -28416,28 +28704,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bar.mkiv" name="horizontalpositionbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="horizontalpositionbar"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bar.mkiv" name="verticalpositionbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="verticalpositionbar"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bar.mkiv" name="horizontalgrowingbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="horizontalgrowingbar"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bar.mkiv" name="verticalgrowingbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="verticalgrowingbar"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -28446,7 +28734,7 @@ </cd:command> </cd:interface> <cd:interface file="i-positioning.xml"> - <cd:command file="pack-pos.mkiv" name="definepositioning"> + <cd:command category="graphics" file="pack-pos.mkiv" level="style" name="definepositioning"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28459,7 +28747,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" name="setuppositioning"> + <cd:command category="graphics" file="pack-pos.mkiv" level="style" name="setuppositioning"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28522,7 +28810,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" name="positioning" type="environment"> + <cd:command category="graphics" file="pack-pos.mkiv" level="document" name="positioning" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -28532,7 +28820,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" name="position"> + <cd:command category="graphics" file="pack-pos.mkiv" level="document" name="position"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppositioning"/> @@ -28543,7 +28831,7 @@ </cd:command> </cd:interface> <cd:interface file="i-postponing.xml"> - <cd:command file="page-pst.mkiv" name="postponing" type="environment"> + <cd:command category="structure" file="page-pst.mkiv" level="document" name="postponing" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant method="none" prefix="cd:sign" type="cd:number"/> @@ -28552,7 +28840,7 @@ </cd:command> </cd:interface> <cd:interface file="i-processor.xml"> - <cd:command file="typo-prc.mkvi" name="defineprocessor"> + <cd:command category="fonts colors" file="typo-prc.mkvi" level="style" name="defineprocessor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28565,7 +28853,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-prc.mkvi" name="setupprocessor"> + <cd:command category="fonts colors" file="typo-prc.mkvi" level="style" name="setupprocessor"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28594,7 +28882,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-prc.mkvi" name="applyprocessor"> + <cd:command category="fonts colors" file="typo-prc.mkvi" level="system" name="applyprocessor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28604,7 +28892,7 @@ </cd:command> </cd:interface> <cd:interface file="i-profile.xml"> - <cd:command file="spac-prf.mkvi" name="defineprofile"> + <cd:command category="pdf" file="spac-prf.mkvi" level="style" name="defineprofile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28617,7 +28905,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="setupprofile"> + <cd:command category="pdf" file="spac-prf.mkvi" level="style" name="setupprofile"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28646,7 +28934,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="setprofile"> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="setprofile"> <cd:arguments> <cd:keywords> <cd:constant type="none"/> @@ -28659,13 +28947,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="resetprofile"/> - <cd:command file="spac-prf.mkvi" name="useprofileparameter"> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="resetprofile"/> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="useprofileparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="profiledbox"> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="profiledbox"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="none"/> @@ -28682,7 +28970,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="profilegivenbox"> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="profilegivenbox"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="none"/> @@ -28701,28 +28989,28 @@ </cd:command> </cd:interface> <cd:interface file="i-publication.xml"> - <cd:command file="publ-ini.mkiv" name="btxrenderingdefinitions" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxrenderingdefinitions" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="loadbtxdefinitionfile"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="loadbtxdefinitionfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="loadbtxreplacementfile"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="loadbtxreplacementfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="definebtx"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="definebtx"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28735,7 +29023,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtx"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="setupbtx"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -28782,6 +29070,9 @@ <cd:parameter name="interaction"> <cd:constant default="yes" type="start"/> <cd:constant type="stop"/> + <cd:constant type="number"/> + <cd:constant type="text"/> + <cd:constant type="page"/> <cd:constant type="all"/> </cd:parameter> <cd:parameter name="alternative"> @@ -28823,21 +29114,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtx" variant="name"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="setupbtx" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="usingbtxspecification" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="usingbtxspecification" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="definebtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="definebtxdataset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28850,7 +29141,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="setupbtxdataset"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28862,7 +29153,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="definebtxregister"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="definebtxregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28875,7 +29166,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtxregister"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="setupbtxregister"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28914,7 +29205,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="definebtxrendering"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="definebtxrendering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28927,7 +29218,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtxrendering"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="setupbtxrendering"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28951,6 +29242,9 @@ <cd:constant type="all"/> <cd:constant type="none"/> </cd:parameter> + <cd:parameter name="filter"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="specification"> <cd:constant type="cd:name"/> </cd:parameter> @@ -29002,7 +29296,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="usebtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="usebtxdataset"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29017,7 +29311,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="publication" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="publication" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29038,7 +29332,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtxlist"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="setupbtxlist"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29048,7 +29342,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="completebtxrendering"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="completebtxrendering"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29058,7 +29352,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="placebtxrendering"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="placebtxrendering"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29068,7 +29362,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="completelistofpublications"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="completelistofpublications"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29078,7 +29372,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="placelistofpublications"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="placelistofpublications"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29088,7 +29382,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxhybridcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhybridcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29130,7 +29424,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxhybridcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhybridcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29174,7 +29468,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxhybridcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhybridcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29198,14 +29492,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxhybridcite" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhybridcite" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxlistcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxlistcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29247,7 +29541,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxlistcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxlistcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29291,7 +29585,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxlistcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxlistcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29315,7 +29609,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxtextcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxtextcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29357,7 +29651,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxtextcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxtextcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29401,7 +29695,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxtextcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxtextcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29425,7 +29719,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxalwayscitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxalwayscitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29467,7 +29761,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxalwayscitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxalwayscitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29511,7 +29805,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxalwayscitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxalwayscitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29535,14 +29829,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="bthiddencitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhiddencitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29584,7 +29878,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29628,7 +29922,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29652,7 +29946,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29694,7 +29988,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29738,7 +30032,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29762,7 +30056,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29804,7 +30098,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29848,7 +30142,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29872,7 +30166,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29914,7 +30208,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29958,7 +30252,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29982,7 +30276,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -30024,7 +30318,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -30068,7 +30362,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -30092,7 +30386,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -30134,7 +30428,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -30178,7 +30472,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -30202,21 +30496,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="hiddencitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="hiddencitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="hiddencite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="hiddencite"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="citation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="citation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -30258,7 +30552,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="citation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="citation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -30302,7 +30596,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="citation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="citation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -30326,14 +30620,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="citation" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="citation" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="cite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="cite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -30375,7 +30669,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="cite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="cite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -30419,7 +30713,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="cite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="cite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -30443,42 +30737,56 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="cite" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="cite" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="nocitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="nocitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="nocitation" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="nocitation" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="nocite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="usecitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="nocite" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="usecitation" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="savebtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="nocite"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:reference"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="nocite" variant="direct"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:reference"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="savebtxdataset"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -30516,21 +30824,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="placecitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="placecitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="usebtxdefinitions"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="usebtxdefinitions"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfield"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfield"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30567,7 +30875,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdetail"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxdetail"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30604,7 +30912,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflush"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflush"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30641,7 +30949,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdirect"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30678,7 +30986,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfieldname"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfieldname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30715,7 +31023,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfieldtype"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfieldtype"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30752,7 +31060,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfoundname"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfoundname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30789,7 +31097,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfoundtype"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfoundtype"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30826,7 +31134,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxauthorfield"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxauthorfield"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="initials"/> @@ -30837,7 +31145,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30880,7 +31188,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoif"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoif"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30920,7 +31228,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifnot"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifnot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30960,14 +31268,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxsetup"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelsesameaspreviouschecked"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsesameaspreviouschecked"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -31014,7 +31322,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelsesameasprevious"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsesameasprevious"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -31057,7 +31365,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelsecombiinlist"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsecombiinlist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -31073,7 +31381,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifsameaspreviouscheckedelse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifsameaspreviouscheckedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -31120,7 +31428,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifsameaspreviouselse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifsameaspreviouselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -31163,7 +31471,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifcombiinlistelse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifcombiinlistelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -31179,14 +31487,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="currentbtxuservariable"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="currentbtxuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelseuservariable"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelseuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -31199,7 +31507,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifuservariableelse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifuservariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -31212,7 +31520,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxremapauthor"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxremapauthor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -31222,7 +31530,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthor"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthor"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="num"/> @@ -31237,8 +31545,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushsuffix"/> - <cd:command file="publ-ini.mkiv" name="btxflushauthorname"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushsuffix"/> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthorname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31246,7 +31554,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthornormal"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthornormal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31254,7 +31562,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthornormalshort"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthornormalshort"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31262,7 +31570,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthorinverted"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthorinverted"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31270,7 +31578,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthorinvertedshort"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthorinvertedshort"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31278,7 +31586,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxsingularplural"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxsingularplural"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -31293,7 +31601,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxsingularorplural"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxsingularorplural"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -31308,7 +31616,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxoneorrange"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxoneorrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -31322,7 +31630,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfirstofrange"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfirstofrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -31330,21 +31638,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxloadjournalist"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxloadjournalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxsavejournalist"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxsavejournalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxaddjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxaddjournal"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -31354,21 +31662,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxexpandedjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxexpandedjournal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxabbreviatedjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxabbreviatedjournal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetfields"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetfields"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31413,14 +31721,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetfields" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetfields" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetcompleteness"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetcompleteness"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31465,14 +31773,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetcompleteness" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetcompleteness" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetauthors"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetauthors"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31517,21 +31825,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetauthors" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetauthors" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxhashedauthors"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxhashedauthors"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxfields"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxfields"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="rotation"> @@ -31543,14 +31851,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxfields" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxfields" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxtables"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxtables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -31559,7 +31867,7 @@ </cd:command> </cd:interface> <cd:interface file="i-random.xml"> - <cd:command file="supp-ran.mkiv" name="getrandomcount"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomcount"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -31570,7 +31878,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="getrandomdimen"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomdimen"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -31581,7 +31889,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="getrandomnumber"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomnumber"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -31592,7 +31900,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="getrandomfloat"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomfloat"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -31603,21 +31911,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="setrandomseed"> + <cd:command 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" name="getrandomseed"> + <cd:command 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" name="randomseed" type="environment"/> - <cd:command file="supp-ran.mkiv" name="reuserandomseed"/> - <cd:command file="supp-ran.mkiv" name="randomnumber"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -31627,10 +31935,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="mprandomnumber"/> + <cd:command file="supp-ran.mkiv" level="system" name="mprandomnumber"/> </cd:interface> <cd:interface file="i-references.xml"> - <cd:command file="strc-ref.mkvi" name="setupreferencing"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferencing"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -31680,7 +31988,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="textreference"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="textreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31690,14 +31998,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="pagereference"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="pagereference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="reference"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="reference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31707,7 +32015,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setreference"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="setreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31719,12 +32027,12 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="usereferenceparameter"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="usereferenceparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="boxreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="boxreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31733,7 +32041,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="hboxreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="hboxreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31741,7 +32049,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="vboxreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="vboxreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31749,7 +32057,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="contentreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="contentreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31760,7 +32068,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="definereference"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="definereference"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -31770,14 +32078,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="resetreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="resetreference"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setpagereference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="setpagereference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -31787,7 +32095,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifelsereferencefound"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelsereferencefound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -31800,7 +32108,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifreferencefoundelse"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifreferencefoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -31813,7 +32121,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupreferenceprefix"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferenceprefix"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -31822,7 +32130,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupglobalreferenceprefix"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="setupglobalreferenceprefix"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -31831,7 +32139,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="strc-ref.mkvi" name="referenceprefix" type="environment"> + <cd:command begin="push" category="references" end="pop" file="strc-ref.mkvi" level="system" name="referenceprefix" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -31840,7 +32148,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="globalpush" end="globalpop" file="strc-ref.mkvi" name="referenceprefix" type="environment"> + <cd:command begin="globalpush" category="references" end="globalpop" file="strc-ref.mkvi" level="system" name="referenceprefix" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -31849,8 +32157,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="referenceprefix"/> - <cd:command file="strc-ref.mkvi" name="in"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="referenceprefix"/> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="in"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -31863,7 +32171,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="at"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="at"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -31876,28 +32184,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="about"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="about"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="from"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="from"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="over"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="over"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="filterreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="filterreference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="default"/> @@ -31909,7 +32217,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="getreferenceentry"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="getreferenceentry"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="default"/> @@ -31921,7 +32229,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="getreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="getreference"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -31936,7 +32244,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="ref"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="ref"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -31951,7 +32259,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="somewhere"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="somewhere"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -31964,7 +32272,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="docheckedpagestate"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="docheckedpagestate"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -31989,7 +32297,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="someplace"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="someplace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -32011,21 +32319,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="atpage"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="atpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="symbolreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="symbolreference"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="definereferenceformat"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="definereferenceformat"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32038,7 +32346,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupreferenceformat"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferenceformat"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -32082,7 +32390,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" generated="yes" name="referenceformat" variant="example"> + <cd:command category="references" file="strc-ref.mkvi" generated="yes" level="document" name="referenceformat" variant="example"> <cd:sequence> <cd:variable value="referenceformat"/> </cd:sequence> @@ -32098,7 +32406,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="goto"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="goto"> <cd:arguments> <cd:content/> <cd:keywords> @@ -32106,14 +32414,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="goto" type="environment"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="goto" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="gotobox"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="gotobox"> <cd:arguments> <cd:content/> <cd:keywords> @@ -32121,7 +32429,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="useurl"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="useurl"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32137,7 +32445,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="useURL"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="useURL"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32153,7 +32461,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="usefile"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="usefile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32166,7 +32474,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="useexternaldocument"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="useexternaldocument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32179,7 +32487,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifelseurldefined"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelseurldefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32192,7 +32500,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifurldefinedelse"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifurldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32205,7 +32513,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifelsefiledefined"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelsefiledefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32218,7 +32526,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doiffiledefinedelse"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doiffiledefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32231,7 +32539,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupurl"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupurl"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -32244,14 +32552,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="url"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="url"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="defineprogram"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="defineprogram"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32264,7 +32572,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupprograms"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupprograms"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -32277,14 +32585,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="program"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="program"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="definepage"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="definepage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32294,7 +32602,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="gotopage"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="gotopage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -32304,7 +32612,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupreferencestructureprefix"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferencestructureprefix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -32380,9 +32688,9 @@ </cd:command> </cd:interface> <cd:interface file="i-regime.xml"> - <cd:command file="regi-ini.mkiv" name="currentregime"/> - <cd:command file="regi-ini.mkiv" name="disableregime"/> - <cd:command file="regi-ini.mkiv" name="enableregime"> + <cd:command category="language" file="regi-ini.mkiv" level="system" name="currentregime"/> + <cd:command category="language" file="regi-ini.mkiv" level="system" name="disableregime"/> + <cd:command category="language" file="regi-ini.mkiv" level="style" name="enableregime"> <cd:arguments> <cd:keywords> <cd:constant type="cp1250"/> @@ -32450,7 +32758,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="regi-ini.mkiv" name="regime" type="environment"> + <cd:command category="language" file="regi-ini.mkiv" level="system" name="regime" type="environment"> <cd:arguments> <cd:keywords> <cd:inherit name="enableregime"/> @@ -32459,7 +32767,7 @@ </cd:command> </cd:interface> <cd:interface file="i-register.xml"> - <cd:command file="strc-reg.mkiv" name="defineregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="defineregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32472,7 +32780,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setupregister" variant="argument"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="setupregister" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -32521,6 +32829,7 @@ <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> <cd:constant type="all"/> + <cd:constant type="packed"/> </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> @@ -32677,7 +32986,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setupregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="setupregister"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -32880,7 +33189,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setupregisters" variant="argument"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="setupregisters" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -32893,7 +33202,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setupregisters"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="setupregisters"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -32904,7 +33213,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="register" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="register" variant="instance"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -32915,9 +33224,11 @@ </cd:keywords> <cd:index list="yes"/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="register" variant="instance:ownnumber"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="register" variant="instance:ownnumber"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -32931,9 +33242,11 @@ </cd:keywords> <cd:index list="yes"/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="seeregister" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="seeregister" variant="instance"> <cd:sequence> <cd:string value="see"/> <cd:instance value="register"/> @@ -32949,9 +33262,11 @@ <cd:constant method="apply" prefix="cd:processor" type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="placeregister" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="placeregister" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="register"/> @@ -32961,9 +33276,11 @@ <cd:inherit name="setupregister"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="completeregister" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="completeregister" variant="instance"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="register"/> @@ -32973,9 +33290,11 @@ <cd:inherit name="setupregister"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="setupregister" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="style" name="setupregister" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="register"/> @@ -32988,9 +33307,11 @@ <cd:inherit name="setupregister"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" name="startregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="startregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33008,7 +33329,7 @@ <cd:index list="yes"/> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="stopregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="stopregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33018,7 +33339,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setregisterentry"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="setregisterentry"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33064,7 +33385,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="finishregisterentry"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="finishregisterentry"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33092,7 +33413,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setstructurepageregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="setstructurepageregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33138,7 +33459,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="startstructurepageregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="startstructurepageregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33187,7 +33508,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="stopstructurepageregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="stopstructurepageregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33197,7 +33518,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="determineregistercharacteristics"> + <cd:command category="structure" file="strc-reg.mkiv" level="system" name="determineregistercharacteristics"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33249,8 +33570,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="utilityregisterlength"/> - <cd:command file="strc-reg.mkiv" name="placeregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="system" name="utilityregisterlength"/> + <cd:command file="strc-reg.mkiv" level="document" name="placeregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33260,7 +33581,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="completeregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="completeregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33270,7 +33591,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="currentregisterpageuserdata"> + <cd:command category="structure" file="strc-reg.mkiv" level="system" name="currentregisterpageuserdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -33279,7 +33600,7 @@ </cd:command> </cd:interface> <cd:interface file="i-renderingwindow.xml"> - <cd:command file="scrn-wid.mkvi" name="useexternalrendering"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="system" name="useexternalrendering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33296,7 +33617,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="setinternalrendering"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="system" name="setinternalrendering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33308,7 +33629,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="definerenderingwindow"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="definerenderingwindow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33321,7 +33642,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="setuprenderingwindow"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setuprenderingwindow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33337,7 +33658,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="placerenderingwindow"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="placerenderingwindow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33349,7 +33670,7 @@ </cd:command> </cd:interface> <cd:interface file="i-replacement.xml"> - <cd:command file="lang-rep.mkiv" name="replaceword"> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="replaceword"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33362,7 +33683,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-rep.mkiv" name="setreplacement"> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="setreplacement"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -33370,15 +33691,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-rep.mkiv" name="resetreplacement"/> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="resetreplacement"/> </cd:interface> <cd:interface file="i-rotatation.xml"> - <cd:command file="grph-trf.mkiv" name="mirror"> + <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="mirror"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="setuprotate"> + <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="setuprotate"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -33401,7 +33722,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="rotate"> + <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="rotate"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuprotate"/> @@ -33409,7 +33730,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="dorotatebox"> + <cd:command category="graphics" file="grph-trf.mkiv" level="system" name="dorotatebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -33420,7 +33741,7 @@ </cd:command> </cd:interface> <cd:interface file="i-scale.xml"> - <cd:command file="grph-trf.mkiv" name="definescale"> + <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="definescale"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33433,7 +33754,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="setupscale"> + <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="setupscale"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33513,7 +33834,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="scale"> + <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="scale"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -33524,7 +33845,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="fastscale"> + <cd:command category="graphics" file="grph-trf.mkiv" level="system" name="fastscale"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -33532,7 +33853,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="fastsxsy"> + <cd:command category="graphics" file="grph-trf.mkiv" level="system" name="fastsxsy"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -33545,7 +33866,7 @@ </cd:command> </cd:interface> <cd:interface file="i-script.xml"> - <cd:command file="scrp-ini.mkvi" name="definescript"> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="definescript"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33558,7 +33879,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" name="setupscript"> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setupscript"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33581,7 +33902,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" name="setupscripts"> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setupscripts"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33591,7 +33912,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" name="setscript"> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setscript"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -33604,8 +33925,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" name="resetscript"/> - <cd:command file="scrp-ini.mkvi" name="script" type="environment"> + <cd:command category="language" file="scrp-ini.mkvi" level="system" name="resetscript"/> + <cd:command category="language" file="scrp-ini.mkvi" name="script" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -33618,15 +33939,23 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" generated="yes" name="script" varianet="instance"> + <cd:command category="language" file="scrp-ini.mkvi" generated="yes" level="document" name="script" variant="instance"> <cd:sequence> <cd:instance value="script"/> </cd:sequence> - <cd:instances/> + <cd:instances> + <cd:constant value="hangul"/> + <cd:constant value="hanzi"/> + <cd:constant value="nihongo"/> + <cd:constant value="ethiopic"/> + <cd:constant value="thai"/> + <cd:constant value="latin"/> + <cd:constant value="test"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-section.xml"> - <cd:command file="strc-sec.mkiv" name="definehead"> + <cd:command category="structure" file="strc-sec.mkiv" level="style" name="definehead"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33639,7 +33968,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="setuphead"> + <cd:command category="structure" file="strc-sec.mkiv" level="style" name="setuphead"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -33751,6 +34080,7 @@ <cd:constant type="no"/> <cd:constant type="hidden"/> <cd:constant type="empty"/> + <cd:constant type="section"/> </cd:parameter> <cd:parameter name="number"> <cd:constant default="yes" type="yes"/> @@ -33844,6 +34174,11 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant method="range" prefix="math" type="line"/> + <cd:constant method="range" prefix="math" type="halfline"/> + <cd:constant method="range" prefix="math" type="-line"/> + <cd:constant method="range" prefix="math" type="-halfline"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="align"> @@ -33884,9 +34219,6 @@ <cd:constant type="margintext"/> <cd:constant type="cd:name"/> </cd:parameter> - <cd:parameter name="location"> - <cd:constant type="cd:name"/> - </cd:parameter> <cd:parameter name="width"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -33923,10 +34255,18 @@ <cd:parameter name="deepnumbercommand"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="strict"/> + <cd:constant type="positive"/> + <cd:constant type="all"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="setupheads"> + <cd:command category="structure" file="strc-sec.mkiv" level="style" name="setupheads"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -33936,7 +34276,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" name="section" variant="instance"> + <cd:command category="structure" file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -33949,6 +34289,7 @@ </cd:keywords> </cd:arguments> <cd:instances> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -33963,7 +34304,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" name="section" variant="instance:ownnumber"> + <cd:command category="structure" file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance:ownnumber"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -33979,6 +34320,7 @@ </cd:keywords> </cd:arguments> <cd:instances> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -33993,7 +34335,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" name="section" variant="instance:assignment"> + <cd:command category="structure" file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance:assignment"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -34020,6 +34362,7 @@ </cd:assignments> </cd:arguments> <cd:instances> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -34034,7 +34377,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" name="section" type="environment" variant="instance"> + <cd:command category="structure" file="strc-sec.mkiv" generated="yes" level="document" name="section" type="environment" variant="instance"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -34066,6 +34409,7 @@ </cd:assignments> </cd:arguments> <cd:instances> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -34080,7 +34424,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" name="namedsection" type="environment"> + <cd:command category="structure" file="strc-sec.mkiv" level="document" name="namedsection" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -34112,28 +34456,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="definesection"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="definesection"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="placeheadtext"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placeheadtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="placeheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placeheadnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="setupheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="style" name="setupheadnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -34143,22 +34487,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="determineheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="determineheadnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="currentheadnumber"/> - <cd:command file="strc-sec.mkiv" name="namedheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="currentheadnumber"/> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="namedheadnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="somenamedheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="somenamedheadnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34172,7 +34516,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="headnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="headnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -34186,7 +34530,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="someheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="someheadnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -34200,30 +34544,30 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="namedstructureheadlocation"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="namedstructureheadlocation"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="structurenumber"/> - <cd:command file="strc-sec.mkiv" name="structuretitle"/> - <cd:command file="strc-sec.mkiv" name="structurevariable"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="structurenumber"/> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="structuretitle"/> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="structurevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="structureuservariable"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="structureuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="namedstructurevariable"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="namedstructurevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34233,7 +34577,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="namedstructureuservariable"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="namedstructureuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34243,7 +34587,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lev.mkvi" name="definesectionlevels"> + <cd:command category="structure" file="strc-lev.mkvi" level="style" name="definesectionlevels"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34253,7 +34597,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lev.mkvi" name="sectionlevel" type="environment"> + <cd:command category="structure" file="strc-lev.mkvi" level="document" name="sectionlevel" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34285,7 +34629,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lev.mkvi" name="subjectlevel" type="environment"> + <cd:command category="structure" file="strc-lev.mkvi" level="document" name="subjectlevel" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34317,7 +34661,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="defineheadalternative"> + <cd:command category="structure" file="strc-ren.mkiv" level="style" name="defineheadalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34330,7 +34674,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="setupheadalternative"> + <cd:command category="structure" file="strc-ren.mkiv" level="style" name="setupheadalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34347,8 +34691,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="localheadsetup" type="environment"/> - <cd:command file="strc-ren.mkiv" name="headhbox"> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="localheadsetup" type="environment"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -34356,7 +34700,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="headvbox"> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -34364,18 +34708,18 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="headreferenceattributes"/> - <cd:command file="strc-ren.mkiv" name="headnumbercontent"/> - <cd:command file="strc-ren.mkiv" name="headtextcontent"/> - <cd:command file="strc-ren.mkiv" name="headwidth"/> - <cd:command file="strc-ren.mkiv" name="headtextwidth"/> - <cd:command file="strc-ren.mkiv" name="headnumberwidth"/> - <cd:command file="strc-ren.mkiv" name="headnumberdistance"/> - <cd:command file="strc-ren.mkiv" name="headtextdistance"/> - <cd:command file="strc-ren.mkiv" name="headsetupspacing"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headreferenceattributes"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headnumbercontent"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headtextcontent"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headwidth"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headtextwidth"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headnumberwidth"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headnumberdistance"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headtextdistance"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headsetupspacing"/> </cd:interface> <cd:interface file="i-sectionblock.xml"> - <cd:command file="strc-sbe.mkiv" name="definesectionblock"> + <cd:command category="structure" file="strc-sbe.mkiv" level="style" name="definesectionblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34388,7 +34732,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" name="setupsectionblock"> + <cd:command category="structure" file="strc-sbe.mkiv" level="style" name="setupsectionblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34410,7 +34754,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" name="setsectionblock"> + <cd:command category="structure" file="strc-sbe.mkiv" level="system" name="setsectionblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34422,7 +34766,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" name="sectionblock" type="environment"> + <cd:command category="structure" file="strc-sbe.mkiv" level="document" name="sectionblock" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34435,7 +34779,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" generated="yes" name="sectionblock" type="environment" variant="instance"> + <cd:command category="structure" file="strc-sbe.mkiv" generated="yes" level="document" name="sectionblock" type="environment" variant="instance"> <cd:sequence> <cd:instance value="sectionblock"/> </cd:sequence> @@ -34447,9 +34791,14 @@ <cd:inherit name="setupsectionblock"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="frontmatter"/> + <cd:constant value="bodymatter"/> + <cd:constant value="appendices"/> + <cd:constant value="backmatter"/> + </cd:instances> </cd:command> - <cd:command file="strc-sbe.mkiv" name="sectionblockenvironment" type="environment"> + <cd:command category="structure" file="strc-sbe.mkiv" level="style" name="sectionblockenvironment" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34458,7 +34807,7 @@ </cd:command> </cd:interface> <cd:interface file="i-selector.xml"> - <cd:command file="core-env.mkiv" name="defineselector"> + <cd:command file="core-env.mkiv" level="style" name="defineselector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34468,7 +34817,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setupselector"> + <cd:command file="core-env.mkiv" level="style" name="setupselector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34483,7 +34832,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="select"> + <cd:command file="core-env.mkiv" level="document" name="select"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34495,7 +34844,7 @@ <cd:content optional="yes"/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="directselect"> + <cd:command file="core-env.mkiv" level="system" name="directselect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34509,84 +34858,84 @@ </cd:command> </cd:interface> <cd:interface file="i-setups.xml"> - <cd:command file="core-env.mkiv" name="setups"> + <cd:command 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" name="setups" variant="direct"> + <cd:command 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" name="setup"> + <cd:command 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" name="setup" variant="direct"> + <cd:command 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" name="directsetup"> + <cd:command 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" name="fastsetup"> + <cd:command 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" name="texsetup"> + <cd:command 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 file="core-env.mkiv" name="luasetup"> + <cd:command category="lua" file="core-env.mkiv" 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" name="systemsetups"> + <cd:command 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" name="resetsetups"> + <cd:command 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" name="showsetupsdefinition"> + <cd:command 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" name="setupwithargument"> + <cd:command file="core-env.mkiv" level="system" name="setupwithargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34594,7 +34943,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="fastsetupwithargument"> + <cd:command file="core-env.mkiv" level="system" name="fastsetupwithargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34602,7 +34951,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setupwithargumentswapped"> + <cd:command file="core-env.mkiv" level="system" name="setupwithargumentswapped"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -34610,7 +34959,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="fastsetupwithargumentswapped"> + <cd:command file="core-env.mkiv" level="system" name="fastsetupwithargumentswapped"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -34618,26 +34967,26 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="usesetupsparameter"> + <cd:command file="core-env.mkiv" level="system" name="usesetupsparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="autosetups"> + <cd:command 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" name="doprocesslocalsetups"> + <cd:command 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 file="core-env.mkiv" name="doifelsesetups"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelsesetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34650,7 +34999,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifsetupselse"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifsetupselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34663,7 +35012,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifsetups"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34673,7 +35022,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotsetups"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34683,7 +35032,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="luasetups" type="environment"> + <cd:command category="lua" file="core-env.mkiv" level="system" name="luasetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34693,14 +35042,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="luasetups" type="environment" variant="string"> + <cd:command category="lua" file="core-env.mkiv" 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 file="core-env.mkiv" name="xmlsetups" type="environment"> + <cd:command category="xml" file="core-env.mkiv" level="style" name="xmlsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34710,14 +35059,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="xmlsetups" type="environment" variant="string"> + <cd:command category="xml" file="core-env.mkiv" 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" name="rawsetups" type="environment"> + <cd:command file="core-env.mkiv" level="system" name="rawsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34727,14 +35076,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="rawsetups" type="environment" variant="string"> + <cd:command 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" name="localsetups" type="environment"> + <cd:command file="core-env.mkiv" level="style" name="localsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34744,14 +35093,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="localsetups" type="environment" variant="string"> + <cd:command 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" name="setups" type="environment"> + <cd:command file="core-env.mkiv" level="style" name="setups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34761,7 +35110,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setups" type="environment" variant="string"> + <cd:command file="core-env.mkiv" level="style" name="setups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -34770,7 +35119,7 @@ </cd:command> </cd:interface> <cd:interface file="i-shift.xml"> - <cd:command file="node.rul.mkiv" name="defineshift"> + <cd:command category="layout" file="node.rul.mkiv" level="style" name="defineshift"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34783,7 +35132,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setupshift"> + <cd:command category="layout" file="node-rul.mkiv" level="style" name="setupshift"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34826,16 +35175,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" generated="yes" name="shift" variant="instance"> + <cd:command category="layout" file="node-rul.mkiv" generated="yes" level="document" name="shift" variant="instance"> <cd:sequence> <cd:instance value="shift"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="shiftup"/> + <cd:constant value="shiftdown"/> + </cd:instances> </cd:command> - <cd:command file="node-rul.mkiv" name="shift" type="environment"> + <cd:command category="layout" file="node-rul.mkiv" level="document" name="shift" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34844,7 +35196,7 @@ </cd:command> </cd:interface> <cd:interface file="i-sidebar.xml"> - <cd:command file="anch-bar.mkiv" name="definesidebar"> + <cd:command category="rules" file="anch-bar.mkiv" level="style" name="definesidebar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34857,7 +35209,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="setupsidebar"> + <cd:command category="rules" file="anch-bar.mkiv" level="style" name="setupsidebar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34890,7 +35242,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="sidebar" type="environment"> + <cd:command category="rules" file="anch-bar.mkiv" level="document" name="sidebar" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34900,7 +35252,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="setupmarginrule"> + <cd:command category="rules" file="anch-bar.mkiv" level="style" name="setupmarginrule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -34910,7 +35262,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="setupmarginrules"> + <cd:command category="rules" file="anch-bar.mkiv" level="style" name="setupmarginrules"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -34920,14 +35272,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="marginrule" type="environment"> + <cd:command category="rules" file="anch-bar.mkiv" level="document" name="marginrule" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="marginrule" type="environment" variant="assignment"> + <cd:command category="rules" file="anch-bar.mkiv" level="document" name="marginrule" type="environment" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmarginrule"/> @@ -34936,7 +35288,7 @@ </cd:command> </cd:interface> <cd:interface file="i-smash.xml"> - <cd:command file="supp-box.mkiv" name="smashbox"> + <cd:command file="supp-box.mkiv" level="system" name="smashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -34944,7 +35296,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="smashboxed"> + <cd:command file="supp-box.mkiv" level="system" name="smashboxed"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -34952,7 +35304,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hsmashbox"> + <cd:command file="supp-box.mkiv" level="system" name="hsmashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -34960,7 +35312,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vsmashbox"> + <cd:command file="supp-box.mkiv" level="system" name="vsmashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -34968,27 +35320,27 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hsmash"> + <cd:command file="supp-box.mkiv" level="system" name="hsmash"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vsmash"> + <cd:command file="supp-box.mkiv" level="system" name="vsmash"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hsmashed"> + <cd:command file="supp-box.mkiv" level="system" name="hsmashed"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vsmashed"> + <cd:command file="supp-box.mkiv" level="system" name="vsmashed"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="smashedhbox"> + <cd:command file="supp-box.mkiv" level="system" name="smashedhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -34996,7 +35348,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="smashedvbox"> + <cd:command file="supp-box.mkiv" level="system" name="smashedvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -35004,7 +35356,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="smash"> + <cd:command file="supp-box.mkiv" level="document" name="smash"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="w"/> @@ -35018,7 +35370,7 @@ </cd:command> </cd:interface> <cd:interface file="i-sort.xml"> - <cd:command file="strc-syn.mkiv" name="definesorting"> + <cd:command category="language" file="strc-syn.mkiv" level="style" name="definesorting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35032,7 +35384,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="setupsorting"> + <cd:command category="language" file="strc-syn.mkiv" level="style" name="setupsorting"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:singular"/> @@ -35120,7 +35472,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="sorting" variant="instance"> + <cd:command category="language" file="strc-syn.mkiv" generated="yes" level="document" name="sorting" variant="instance"> <cd:sequence> <cd:instance value="sorting"/> </cd:sequence> @@ -35130,9 +35482,11 @@ </cd:keywords> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="logo"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" name="definesort"> + <cd:command category="language" file="strc-syn.mkiv" level="system" name="definesort"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -35147,7 +35501,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="placelistofsorts" variant="instance"> + <cd:command category="language" file="strc-syn.mkiv" generated="yes" level="document" name="placelistofsorts" variant="instance"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="sorts"/> @@ -35157,9 +35511,11 @@ <cd:inherit name="setupsorting"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="logos"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="completelistofsorts" variant="instance"> + <cd:command category="language" file="strc-syn.mkiv" generated="yes" level="document" name="completelistofsorts" variant="instance"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="sorts"/> @@ -35169,9 +35525,11 @@ <cd:inherit name="setupsorting"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="logos"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" name="doifelsecurrentsortingused"> + <cd:command category="language conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsortingused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35181,14 +35539,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="resetusedsortings"> + <cd:command category="language" file="strc-syn.mkiv" level="system" name="resetusedsortings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="registersort"> + <cd:command category="language" file="strc-syn.mkiv" level="system" name="registersort"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35198,7 +35556,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="placelistofsorts"> + <cd:command category="language" file="strc-syn.mkiv" level="document" name="placelistofsorts"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35208,7 +35566,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="completelistofsorts"> + <cd:command category="language" file="strc-syn.mkiv" level="document" name="completelistofsorts"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35220,7 +35578,7 @@ </cd:command> </cd:interface> <cd:interface file="i-soundtrack.xml"> - <cd:command file="scrn-wid.mkvi" name="setupexternalsoundtracks"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setupexternalsoundtracks"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="option"> @@ -35229,7 +35587,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="useexternalsoundtrack"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="useexternalsoundtrack"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35239,7 +35597,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="checksoundtrack"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="checksoundtrack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35248,7 +35606,7 @@ </cd:command> </cd:interface> <cd:interface file="i-spellchecking.xml"> - <cd:command file="lang-wrd.mkiv" name="setupspellchecking"> + <cd:command category="language" file="lang-wrd.mkiv" level="style" name="setupspellchecking"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -35266,7 +35624,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-wrd.mkiv" name="loadspellchecklist"> + <cd:command category="language" file="lang-wrd.mkiv" level="style" name="loadspellchecklist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35278,7 +35636,7 @@ </cd:command> </cd:interface> <cd:interface file="i-startstop.xml"> - <cd:command file="core-sys.mkiv" name="definestartstop"> + <cd:command category="structure" file="core-sys.mkiv" level="style" name="definestartstop"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35291,7 +35649,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="setupstartstop"> + <cd:command category="structure" file="core-sys.mkiv" level="style" name="setupstartstop"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -35325,12 +35683,12 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" generated="yes" name="startstop" type="environment" variant="example"> + <cd:command category="structure" file="core-sys.mkiv" generated="yes" level="document" name="startstop" type="environment" variant="example"> <cd:sequence> <cd:variable value="startstop"/> </cd:sequence> </cd:command> - <cd:command file="core-sys.mkiv" name="startstop" type="environment"> + <cd:command category="structure" file="core-sys.mkiv" level="document" name="startstop" type="environment"> <cd:sequence> <cd:string value=""/> </cd:sequence> @@ -35340,7 +35698,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" generated="yes" name="startstop" variant="example"> + <cd:command category="structure" file="core-sys.mkiv" generated="yes" level="document" name="startstop" variant="example"> <cd:sequence> <cd:variable value="startstop"/> </cd:sequence> @@ -35350,8 +35708,8 @@ </cd:command> </cd:interface> <cd:interface file="i-stream.xml"> - <cd:command file="page-str.mkiv" name="currentoutputstream"/> - <cd:command file="page-str.mkiv" name="ifinoutputstream"> + <cd:command file="page-str.mkiv" level="system" name="currentoutputstream"/> + <cd:command file="page-str.mkiv" level="system" name="ifinoutputstream"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -35363,64 +35721,64 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="enableoutputstream"> + <cd:command 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" name="disableoutputstream"/> - <cd:command file="page-str.mkiv" name="outputstream" type="environment"> + <cd:command file="page-str.mkiv" level="system" name="disableoutputstream"/> + <cd:command 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" name="flushoutputstream"> + <cd:command 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" name="outputstreambox"> + <cd:command file="page-str.mkiv" 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" name="outputstreamcopy"> + <cd:command file="page-str.mkiv" 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" name="outputstreamunvbox"> + <cd:command file="page-str.mkiv" 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" name="outputstreamunvcopy"> + <cd:command file="page-str.mkiv" 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" name="synchronizeoutputstreams"> + <cd:command 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" name="pushoutputstream"> + <cd:command file="page-str.mkiv" level="system" name="pushoutputstream"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -35429,70 +35787,70 @@ </cd:command> </cd:interface> <cd:interface file="i-string.xml"> - <cd:command file="blob-ini.mkiv" name="wdofstring"> + <cd:command 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" name="htofstring"> + <cd:command 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" name="dpofstring"> + <cd:command 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" name="hdofstring"> + <cd:command 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" name="htdpofstring"> + <cd:command 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" name="widthofstring"> + <cd:command 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" name="heightofstring"> + <cd:command 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" name="depthofstring"> + <cd:command 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" name="heightanddepthofstring"> + <cd:command 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" name="setwidthof"> + <cd:command file="blob-ini.mkiv" level="system" name="setwidthof"> <cd:arguments> <cd:text/> <cd:delimiter name="to"/> @@ -35501,11 +35859,12 @@ </cd:command> </cd:interface> <cd:interface file="i-strut.xml"> - <cd:command file="supp-box.mkiv" name="strutdp"/> - <cd:command file="supp-box.mkiv" name="strutht"/> - <cd:command file="supp-box.mkiv" name="strutwd"/> - <cd:command file="supp-box.mkiv" name="struthtdp"/> - <cd:command file="spac-ver.mkiv" name="setupstruts"> + <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:arguments> <cd:keywords optional="yes"> <cd:constant type="yes"/> @@ -35519,7 +35878,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="synchronizestrut"> + <cd:command file="spac-ver.mkiv" level="system" name="synchronizestrut"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -35533,24 +35892,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="strut"/> - <cd:command file="spac-ver.mkiv" name="setstrut"/> - <cd:command file="spac-ver.mkiv" name="setcharstrut"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setfontstrut"/> - <cd:command file="spac-ver.mkiv" name="setcapstrut"/> - <cd:command file="spac-ver.mkiv" name="setnostrut"/> - <cd:command file="spac-ver.mkiv" name="showstruts"/> - <cd:command file="spac-ver.mkiv" name="showcolorstruts"/> - <cd:command begin="beg" end="end" file="spac-ver.mkiv" name="strut" type="environment"/> + <cd:command file="spac-ver.mkiv" level="system" name="setfontstrut"/> + <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:interface> <cd:interface file="i-symbol.xml"> - <cd:command file="symb-ini.mkiv" name="definesymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="definesymbol"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -35563,7 +35927,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifelseinsymbolset"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelseinsymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35579,7 +35943,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifinsymbolsetelse"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifinsymbolsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35595,7 +35959,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifinsymbolset"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifinsymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35611,7 +35975,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifelsesymbolset"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelsesymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35624,7 +35988,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifsymbolsetelse"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifsymbolsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35637,7 +36001,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="symbol"> + <cd:command category="symbols" file="symb-ini.mkiv" level="document" name="symbol"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -35647,14 +36011,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="symbol" variant="direct"> + <cd:command category="symbols" file="symb-ini.mkiv" level="document" name="symbol" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="directsymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="directsymbol"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35664,7 +36028,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="definefiguresymbol"> + <cd:command category="symbols graphics" file="symb-ini.mkiv" level="style" name="definefiguresymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35678,7 +36042,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="figuresymbol"> + <cd:command category="symbols graphics" file="symb-ini.mkiv" level="document" name="figuresymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -35689,7 +36053,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifelsesymboldefined"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelsesymboldefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35702,7 +36066,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifsymboldefinedelse"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifsymboldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35715,29 +36079,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="symbolset" type="environment"> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="symbolset" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="setupsymbolset"> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="setupsymbolset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="resetsymbolset"/> - <cd:command file="symb-ini.mkiv" name="usesymbols"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="resetsymbolset"/> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="usesymbols"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-run.mkiv" name="showsymbolset"> + <cd:command category="symbols" file="symb-run.mkiv" level="document" name="showsymbolset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35745,8 +36109,46 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-synctex.xml"> + <cd:command category="pdf" file="cont-run.mkiv" level="system" name="synctexsetfilename"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="pdf" file="cont-run.mkiv" level="system" name="synctexresetfilename"/> + <cd:command category="pdf" file="cont-run.mkiv" level="system" name="synctexblockfilename"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="pdf" file="cont-run.mkiv" level="style" name="setupsynctex"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="state"> + <cd:constant type="start"/> + <cd:constant default="yes" type="stop"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="min"/> + <cd:constant default="yes" type="max"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="pdf" file="cont-run.mkiv" level="style" name="blocksynctexfile"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-synonym.xml"> - <cd:command file="strc-syn.mkiv" name="definesynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="style" name="definesynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35762,7 +36164,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="setupsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="style" name="setupsynonyms"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:singular"/> @@ -35850,7 +36252,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="synonym" variant="instance"> + <cd:command category="symbols" file="strc-syn.mkiv" generated="yes" level="document" name="synonym" variant="instance"> <cd:sequence> <cd:instance value="synonym"/> </cd:sequence> @@ -35863,9 +36265,11 @@ </cd:keywords> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="abbreviation"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" name="definesynonym"> + <cd:command category="symbols" file="strc-syn.mkiv" level="style" name="definesynonym"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -35883,7 +36287,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="placelistofsynonyms" variant="instance"> + <cd:command category="symbols" file="strc-syn.mkiv" generated="yes" level="document" name="placelistofsynonyms" variant="instance"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="synonyms"/> @@ -35893,9 +36297,11 @@ <cd:inherit name="setupsynonyms"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="abbreviations"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="completelistofsynonyms" variant="instance"> + <cd:command category="symbols" file="strc-syn.mkiv" generated="yes" level="document" name="completelistofsynonyms" variant="instance"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="synonyms"/> @@ -35905,9 +36311,11 @@ <cd:inherit name="setupsynonyms"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="abbreviations"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" name="registersynonym"> + <cd:command category="symbols" file="strc-syn.mkiv" level="system" name="registersynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35917,7 +36325,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="doifelsecurrentsynonymused"> + <cd:command category="symbols conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35927,7 +36335,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="doifelsecurrentsynonymshown"> + <cd:command category="symbols conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymshown"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35937,21 +36345,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="resetusedsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="system" name="resetusedsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="resetshownsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="system" name="resetshownsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="placelistofsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="document" name="placelistofsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35961,7 +36369,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="completelistofsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="document" name="completelistofsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35971,7 +36379,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="infull"> + <cd:command category="symbols" file="strc-syn.mkiv" level="document" name="infull"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35980,31 +36388,31 @@ </cd:command> </cd:interface> <cd:interface file="i-system.xml"> - <cd:command file="syst-aux.mkiv" name="expanded"> + <cd:command file="syst-aux.mkiv" level="system" name="expanded"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="expanded" type="environment"/> - <cd:command file="syst-aux.mkiv" name="gobbleoneargument"> + <cd:command file="syst-aux.mkiv" level="system" name="expanded" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleoneargument"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbletwoarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbletwoarguments"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblethreearguments"> + <cd:command 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" name="gobblefourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblefourarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36012,7 +36420,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblefivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblefivearguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36021,7 +36429,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblesixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblesixarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36031,7 +36439,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblesevenarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblesevenarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36042,7 +36450,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleeightarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleeightarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36054,7 +36462,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleninearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleninearguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36067,7 +36475,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbletenarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbletenarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36081,14 +36489,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleoneoptional"> + <cd:command 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" name="gobbletwooptionals"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbletwooptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -36098,7 +36506,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblethreeoptionals"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblethreeoptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -36111,7 +36519,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblefouroptionals"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblefouroptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -36127,7 +36535,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblefiveoptionals"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblefiveoptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -36146,8 +36554,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="donothing"/> - <cd:command file="syst-aux.mkiv" name="doifelsenextchar"> + <cd:command file="syst-aux.mkiv" level="system" name="donothing"/> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -36160,7 +36568,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextcharelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -36173,7 +36581,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextoptional"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextoptional"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36183,7 +36591,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextoptionalelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextoptionalelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36193,19 +36601,19 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextoptionalcs"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextoptionalcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextoptionalcselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextoptionalcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextbgroup"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextbgroup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36215,7 +36623,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextbgroupelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextbgroupelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36225,19 +36633,19 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextbgroupcs"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextbgroupcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextbgroupcselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextbgroupcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextparenthesis"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextparenthesis"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36247,7 +36655,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextparenthesiselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextparenthesiselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36257,7 +36665,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsefastoptionalcheck"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsefastoptionalcheck"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36267,7 +36675,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doiffastoptionalcheckelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doiffastoptionalcheckelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36277,25 +36685,25 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsefastoptionalcheckcs"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsefastoptionalcheckcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doiffastoptionalcheckcselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doiffastoptionalcheckcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="assumelongusagecs"> + <cd:command file="syst-aux.mkiv" level="system" name="assumelongusagecs"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36303,7 +36711,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setgvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36311,7 +36719,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setevalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36319,7 +36727,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setxvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setxvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36327,14 +36735,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getvalue"> + <cd:command 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" name="letvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="letvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36342,7 +36750,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letgvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="letgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36350,28 +36758,28 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="resetvalue"> + <cd:command 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" name="undefinevalue"> + <cd:command 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" name="ignorevalue"> + <cd:command 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" name="setuvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setuvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36379,7 +36787,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setuevalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setuevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36387,7 +36795,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setugvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setugvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36395,7 +36803,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setuxvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setuxvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36403,14 +36811,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getuvalue"> + <cd:command 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" name="doifelseundefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36423,7 +36831,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifundefinedelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifundefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36436,7 +36844,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsedefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsedefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36449,7 +36857,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifdefinedelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifdefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36462,7 +36870,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifundefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36472,7 +36880,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifdefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36482,28 +36890,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letbeundefined"> + <cd:command 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" name="localundefine"> + <cd:command 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" name="globalundefine"> + <cd:command 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" name="doifelsealldefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsealldefined"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -36516,7 +36924,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifalldefinedelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifalldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -36529,7 +36937,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doif"> + <cd:command file="syst-aux.mkiv" level="system" name="doif"> <cd:arguments> <cd:content/> <cd:content/> @@ -36538,7 +36946,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnot"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnot"> <cd:arguments> <cd:content/> <cd:content/> @@ -36547,7 +36955,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelse"> <cd:arguments> <cd:content/> <cd:content/> @@ -36559,7 +36967,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -36570,7 +36978,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifemptyelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifemptyelse"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -36581,7 +36989,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doifempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -36589,7 +36997,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -36597,11 +37005,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseinset"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36611,11 +37021,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifinsetelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifinsetelse"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36625,35 +37037,39 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifinset"> + <cd:command file="syst-aux.mkiv" level="system" name="doifinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotinset"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsecommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsecommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36663,13 +37079,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifcommonelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifcommonelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36679,33 +37095,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processcommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="processcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -36713,9 +37129,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="quitcommalist"/> - <cd:command file="syst-aux.mkiv" name="quitprevcommalist"/> - <cd:command file="syst-aux.mkiv" name="processcommacommand"> + <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:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -36723,7 +37139,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processcommalistwithparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="processcommalistwithparameters"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -36731,22 +37147,22 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processcommalist" type="environment"> + <cd:command 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" name="processcommacommand" type="environment"> + <cd:command 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" name="currentcommalistitem"/> - <cd:command file="syst-aux.mkiv" name="processaction"> + <cd:command file="syst-aux.mkiv" level="system" name="currentcommalistitem"/> + <cd:command file="syst-aux.mkiv" level="system" name="processaction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -36754,7 +37170,7 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processfirstactioninset"> + <cd:command file="syst-aux.mkiv" level="system" name="processfirstactioninset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -36762,7 +37178,7 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processallactionsinset"> + <cd:command file="syst-aux.mkiv" level="system" name="processallactionsinset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -36770,17 +37186,17 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="commalistelement"/> - <cd:command file="syst-aux.mkiv" name="firstcharacter"/> - <cd:command file="syst-aux.mkiv" name="remainingcharacters"/> - <cd:command file="syst-aux.mkiv" name="getfirstcharacter"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsefirstchar"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsefirstchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36796,7 +37212,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doiffirstcharelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doiffirstcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36812,21 +37228,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thefirstcharacter"> + <cd:command 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" name="theremainingcharacters"> + <cd:command 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" name="doifelseinstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36842,7 +37258,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifinstringelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifinstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36858,7 +37274,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifinstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36871,7 +37287,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotinstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36884,7 +37300,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseincsname"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseincsname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36900,7 +37316,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifincsnameelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifincsnameelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36916,7 +37332,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenumber"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36929,7 +37345,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnumberelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36942,7 +37358,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnumber"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36952,7 +37368,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotnumber"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36962,7 +37378,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="percentdimen"> + <cd:command file="syst-aux.mkiv" level="system" name="percentdimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -36974,7 +37390,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setpercentdimen"> + <cd:command file="syst-aux.mkiv" level="system" name="setpercentdimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -36986,7 +37402,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="makerawcommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="makerawcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -36994,7 +37410,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawprocesscommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="rawprocesscommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -37002,7 +37418,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawprocesscommacommand"> + <cd:command file="syst-aux.mkiv" level="system" name="rawprocesscommacommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -37010,11 +37426,13 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawdoifelseinset"> + <cd:command file="syst-aux.mkiv" level="system" name="rawdoifelseinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -37024,11 +37442,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawdoifinsetelse"> + <cd:command file="syst-aux.mkiv" level="system" name="rawdoifinsetelse"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -37038,18 +37458,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawdoifinset"> + <cd:command file="syst-aux.mkiv" level="system" name="rawdoifinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawprocessaction"> + <cd:command file="syst-aux.mkiv" level="system" name="rawprocessaction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -37057,8 +37479,8 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="currentvalue"/> - <cd:command file="syst-aux.mkiv" name="getparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="currentvalue"/> + <cd:command file="syst-aux.mkiv" level="system" name="getparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37070,7 +37492,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="geteparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="geteparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37082,7 +37504,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getgparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getgparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37094,7 +37516,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getxparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getxparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37106,7 +37528,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="forgetparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="forgetparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37118,7 +37540,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getexpandedparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getexpandedparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37130,7 +37552,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doassign"> + <cd:command file="syst-aux.mkiv" level="system" name="doassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37142,7 +37564,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doeassign"> + <cd:command file="syst-aux.mkiv" level="system" name="doeassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37154,7 +37576,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="undoassign"> + <cd:command file="syst-aux.mkiv" level="system" name="undoassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37166,7 +37588,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doassignempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doassignempty"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37178,7 +37600,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignmentlist"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignmentlist"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -37188,7 +37610,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignmentcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignmentcommand"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -37198,7 +37620,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignmentlist" type="environment"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignmentlist" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -37207,7 +37629,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignmentcommand" type="environment"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignmentcommand" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -37216,9 +37638,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="currentassignmentlistkey"/> - <cd:command file="syst-aux.mkiv" name="currentassignmentlistvalue"/> - <cd:command file="syst-aux.mkiv" name="getemptyparameters"> + <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:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37230,7 +37652,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="copyparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="copyparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37243,14 +37665,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="checkparameters"> + <cd:command 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" name="ifparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="ifparameters"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -37262,22 +37684,22 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="commalistsize"/> - <cd:command file="syst-aux.mkiv" name="getcommalistsize"> + <cd:command file="syst-aux.mkiv" level="system" name="commalistsize"/> + <cd:command 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" name="getcommacommandsize"> + <cd:command 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" name="getfromcommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="getfromcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -37287,7 +37709,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getfromcommacommand"> + <cd:command file="syst-aux.mkiv" level="system" name="getfromcommacommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -37297,7 +37719,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dogetcommacommandelement"> + <cd:command file="syst-aux.mkiv" level="system" name="dogetcommacommandelement"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:number"/> @@ -37310,7 +37732,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dosingleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dosingleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37318,7 +37740,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoubleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoubleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37329,7 +37751,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotripleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dotripleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37343,7 +37765,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquadrupleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doquadrupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37360,7 +37782,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquintupleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doquintupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37380,7 +37802,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dosixtupleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dosixtupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37403,7 +37825,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doseventupleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doseventupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37429,7 +37851,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dosingleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dosingleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37437,7 +37859,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoubleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoubleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37448,7 +37870,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotripleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dotripleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37462,7 +37884,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquadrupleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="doquadrupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37479,7 +37901,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquintupleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="doquintupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37499,7 +37921,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dosixtupleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dosixtupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37522,7 +37944,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doseventupleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="doseventupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37548,24 +37970,24 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="strippedcsname"> + <cd:command file="syst-aux.mkiv" level="system" name="strippedcsname"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="strippedcsname" variant="string"> + <cd:command 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" name="complexorsimple"> + <cd:command file="syst-aux.mkiv" level="system" name="complexorsimple"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="complexorsimple" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="complexorsimple" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37573,12 +37995,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="complexorsimpleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="complexorsimpleempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="complexorsimpleempty" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="complexorsimpleempty" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37586,12 +38008,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definecomplexorsimple"> + <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimple"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definecomplexorsimple" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimple" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37599,12 +38021,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definecomplexorsimpleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definecomplexorsimpleempty" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37612,9 +38034,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="permitspacesbetweengroups"/> - <cd:command file="syst-aux.mkiv" name="dontpermitspacesbetweengroups"/> - <cd:command file="syst-aux.mkiv" name="dosinglegroupempty"> + <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:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37622,7 +38044,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoublegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoublegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37633,7 +38055,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotriplegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dotriplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37647,7 +38069,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquadruplegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doquadruplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37664,7 +38086,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquintuplegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doquintuplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37684,14 +38106,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofoneargument"> + <cd:command 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" name="firstoftwoarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstoftwoarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37701,7 +38123,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondoftwoarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondoftwoarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37711,7 +38133,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofthreearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37724,7 +38146,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondofthreearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37737,7 +38159,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdofthreearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37750,7 +38172,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstoffourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37766,7 +38188,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondoffourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37782,7 +38204,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdoffourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37798,7 +38220,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fourthoffourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fourthoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37814,7 +38236,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37833,7 +38255,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37852,7 +38274,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37871,7 +38293,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fourthoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fourthoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37890,7 +38312,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fifthoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fifthoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37909,7 +38331,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37931,7 +38353,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37953,7 +38375,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37975,7 +38397,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fourthofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fourthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37997,7 +38419,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fifthofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fifthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38019,7 +38441,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="sixthofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="sixthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38041,14 +38463,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofoneunexpanded"> + <cd:command 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" name="firstoftwounexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="firstoftwounexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38058,7 +38480,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondoftwounexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="secondoftwounexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38068,7 +38490,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofthreeunexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="firstofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38081,7 +38503,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondofthreeunexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="secondofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38094,7 +38516,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdofthreeunexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38107,52 +38529,52 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letempty"> + <cd:command file="syst-aux.mkiv" level="system" name="letempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalletempty"> + <cd:command file="syst-aux.mkiv" level="system" name="globalletempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letvalueempty"> + <cd:command 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" name="letgvalueempty"> + <cd:command 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" name="letvaluerelax"> + <cd:command 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" name="letgvalurelax"> + <cd:command 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" name="relaxvalueifundefined"> + <cd:command 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" name="rawgetparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="rawgetparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -38164,7 +38586,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="texdefinition" type="environment"> + <cd:command file="syst-aux.mkiv" level="system" name="texdefinition" type="environment"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="spaces"/> @@ -38179,6 +38601,20 @@ <cd:keywords delimiters="none" optional="yes"> <cd:constant type="expanded"/> </cd:keywords> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="singleempty"/> + <cd:constant type="doubleempty"/> + <cd:constant type="tripleempty"/> + <cd:constant type="quadrupleempty"/> + <cd:constant type="quintupleempty"/> + <cd:constant type="sixtupleempty"/> + <cd:constant type="singleargument"/> + <cd:constant type="doubleargument"/> + <cd:constant type="tripleargument"/> + <cd:constant type="quadrupleargument"/> + <cd:constant type="quintupleargument"/> + <cd:constant type="sixtupleargument"/> + </cd:keywords> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> @@ -38187,35 +38623,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="texdefinition"> + <cd:command 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" name="texcode" type="environment"/> - <cd:command file="syst-aux.mkiv" name="newcounter"> + <cd:command file="syst-aux.mkiv" level="system" name="texcode" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="newcounter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fastincrement"> + <cd:command file="syst-aux.mkiv" level="system" name="fastincrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fastdecrement"> + <cd:command file="syst-aux.mkiv" level="system" name="fastdecrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="increment"> + <cd:command file="syst-aux.mkiv" level="system" name="increment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="increment" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="increment" variant="argument"> <cd:arguments> <cd:keywords delimiters="parentheses" list="yes"> <cd:constant type="cd:csname"/> @@ -38223,12 +38659,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="decrement"> + <cd:command file="syst-aux.mkiv" level="system" name="decrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="decrement" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="decrement" variant="argument"> <cd:arguments> <cd:keywords delimiters="parentheses" list="yes"> <cd:constant type="cd:csname"/> @@ -38236,45 +38672,46 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="incrementvalue"> + <cd:command 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" name="decrementvalue"> + <cd:command 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" name="newsignal"> + <cd:command file="syst-aux.mkiv" level="system" name="newsignal"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="checkedstrippedcsname"> + <cd:command file="syst-aux.mkiv" level="system" name="checkedstrippedcsname"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="checkedstrippedcsname" variant="string"> + <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" name="savenormalmeaning"> + <cd:command file="syst-aux.mkiv" level="system" name="savenormalmeaning"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="recursedepth"/> - <cd:command file="syst-aux.mkiv" name="recurselevel"/> - <cd:command file="syst-aux.mkiv" name="dostepwiserecurse"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -38290,7 +38727,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dorecurse"> + <cd:command file="syst-aux.mkiv" level="system" name="dorecurse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -38300,7 +38737,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doexpandedrecurse"> + <cd:command file="syst-aux.mkiv" level="system" name="doexpandedrecurse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -38310,7 +38747,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dowith"> + <cd:command file="syst-aux.mkiv" level="system" name="dowith"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:command"/> @@ -38320,16 +38757,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doloop"> + <cd:command 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" name="exitloop"/> - <cd:command file="syst-aux.mkiv" name="exitloopnow"/> - <cd:command file="syst-aux.mkiv" name="dorecurse"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -38337,7 +38774,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doloopoverlist"> + <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:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -38347,29 +38786,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="recursestring"/> - <cd:command file="syst-aux.mkiv" name="newevery"> + <cd:command file="syst-aux.mkiv" level="system" name="recursestring"/> + <cd:command file="syst-aux.mkiv" level="system" name="newevery"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="EveryPar"> + <cd:command 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" name="EveryLine"> + <cd:command 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" name="forgeteverypar"/> - <cd:command file="syst-aux.mkiv" name="convertvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="forgeteverypar"/> + <cd:command file="syst-aux.mkiv" level="system" name="convertvalue"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -38378,7 +38817,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="defconvertedvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="defconvertedvalue"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38386,7 +38825,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseassignment"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseassignment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38399,7 +38838,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifassignmentelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifassignmentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38412,14 +38851,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="docheckassignment"> + <cd:command 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" name="ifassignment"> + <cd:command file="syst-aux.mkiv" level="system" name="ifassignment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -38431,7 +38870,7 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="convertargument"> + <cd:command file="syst-aux.mkiv" level="system" name="convertargument"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38440,14 +38879,14 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="convertcommand"> + <cd:command 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" name="defconvertedargument"> + <cd:command file="syst-aux.mkiv" level="system" name="defconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38455,13 +38894,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="defconvertedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="defconvertedcommand"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="edefconvertedargument"> + <cd:command file="syst-aux.mkiv" level="system" name="edefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38469,7 +38908,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gdefconvertedargument"> + <cd:command file="syst-aux.mkiv" level="system" name="gdefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38477,13 +38916,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gdefconvertedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="gdefconvertedcommand"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="xdefconvertedargument"> + <cd:command file="syst-aux.mkiv" level="system" name="xdefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38491,14 +38930,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="showvalue"> + <cd:command 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" name="doifelsemeaning"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsemeaning"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -38510,7 +38949,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifmeaningelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifmeaningelse"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -38522,7 +38961,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsesamestring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsesamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38538,7 +38977,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsamestringelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsamestringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38554,7 +38993,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsamestring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38567,7 +39006,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotsamestring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotsamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38580,7 +39019,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ConvertToConstant"> + <cd:command file="syst-aux.mkiv" level="system" name="ConvertToConstant"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38591,7 +39030,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ConvertConstantAfter"> + <cd:command file="syst-aux.mkiv" level="system" name="ConvertConstantAfter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38602,7 +39041,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="assignifempty"> + <cd:command file="syst-aux.mkiv" level="system" name="assignifempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38610,7 +39049,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="grabuntil"> + <cd:command file="syst-aux.mkiv" level="system" name="grabuntil"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38618,7 +39057,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processbetween"> + <cd:command file="syst-aux.mkiv" level="system" name="processbetween"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38626,12 +39065,12 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleuntil"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleuntil"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleuntilrelax"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleuntilrelax"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:content"/> @@ -38639,12 +39078,12 @@ <cd:delimiter name="relax"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processuntil"> + <cd:command file="syst-aux.mkiv" level="system" name="processuntil"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="groupedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="groupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38654,7 +39093,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="simplegroupedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="simplegroupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38664,7 +39103,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="pickupgroupedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="pickupgroupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38677,33 +39116,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="BeforePar"> + <cd:command 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" name="AfterPar"> + <cd:command 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" name="GetPar"/> - <cd:command file="syst-aux.mkiv" name="GotoPar"/> - <cd:command file="syst-aux.mkiv" name="dowithpargument"> + <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:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dowithwargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dowithwargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dorepeatwithcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="dorepeatwithcommand"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -38712,7 +39151,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsestringinstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsestringinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38728,7 +39167,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifstringinstringelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifstringinstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38744,7 +39183,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendtoks"> + <cd:command file="syst-aux.mkiv" level="system" name="appendtoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38753,7 +39192,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependtoks"> + <cd:command file="syst-aux.mkiv" level="system" name="prependtoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38762,7 +39201,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendtoksonce"> + <cd:command file="syst-aux.mkiv" level="system" name="appendtoksonce"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38771,7 +39210,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependtoksonce"> + <cd:command file="syst-aux.mkiv" level="system" name="prependtoksonce"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38780,7 +39219,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseintoks"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseintoks"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38796,7 +39235,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifintokselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifintokselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38812,20 +39251,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="collecting" type="environment"/> - <cd:command file="syst-aux.mkiv" name="collect" type="environment"/> - <cd:command file="syst-aux.mkiv" name="expandedcollect" type="environment"/> - <cd:command file="syst-aux.mkiv" name="collect"> + <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:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="collectexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="collectexpanded"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="removetoks"> + <cd:command file="syst-aux.mkiv" level="system" name="removetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38834,7 +39273,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendetoks"> + <cd:command file="syst-aux.mkiv" level="system" name="appendetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38843,7 +39282,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependetoks"> + <cd:command file="syst-aux.mkiv" level="system" name="prependetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38852,17 +39291,17 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="flushtoks"> + <cd:command file="syst-aux.mkiv" level="system" name="flushtoks"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotoks"> + <cd:command file="syst-aux.mkiv" level="system" name="dotoks"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="beforesplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="beforesplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38875,7 +39314,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="aftersplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="aftersplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38888,7 +39327,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="splitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38903,7 +39342,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="greedysplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="greedysplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38918,7 +39357,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="beforetestandsplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="beforetestandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38931,7 +39370,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="aftertestandsplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="aftertestandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38944,7 +39383,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="testandsplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="testandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38959,7 +39398,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatcolon"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatperiod"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38968,7 +39407,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatcomma"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatcomma"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38977,7 +39416,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatasterisk"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatasterisk"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38986,7 +39425,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatcolon"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatcolon"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38995,7 +39434,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatcolons"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatcolons"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39004,7 +39443,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="removesubstring"> + <cd:command file="syst-aux.mkiv" level="system" name="removesubstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39017,7 +39456,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendtocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="appendtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39025,7 +39464,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependtocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="prependtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39033,7 +39472,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="addtocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="addtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39041,7 +39480,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="pretocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="pretocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39049,13 +39488,13 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="robustdoifelseinset"> + <cd:command file="syst-aux.mkiv" level="system" name="robustdoifelseinset"> <cd:arguments> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39065,13 +39504,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="robustdoifinsetelse"> + <cd:command file="syst-aux.mkiv" level="system" name="robustdoifinsetelse"> <cd:arguments> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39081,7 +39520,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="robustaddtocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="robustaddtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39089,7 +39528,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="robustpretocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="robustpretocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39097,7 +39536,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="xsplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="xsplitstring"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39105,7 +39544,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="removefromcommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="removefromcommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39113,7 +39552,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="substituteincommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="substituteincommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39124,7 +39563,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="replaceincommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="replaceincommalist"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39132,7 +39571,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalprocesscommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="globalprocesscommalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -39140,21 +39579,21 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="withoutpt"> + <cd:command 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" name="PtToCm"> + <cd:command 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" name="dimensiontocount"> + <cd:command file="syst-aux.mkiv" level="system" name="dimensiontocount"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39162,89 +39601,89 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="numberofpoints"> + <cd:command 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" name="swapdimens"> + <cd:command file="syst-aux.mkiv" level="system" name="swapdimens"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="swapcounts"> + <cd:command file="syst-aux.mkiv" level="system" name="swapcounts"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="swapmacros"> + <cd:command file="syst-aux.mkiv" level="system" name="swapmacros"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalswapdimens"> + <cd:command file="syst-aux.mkiv" level="system" name="globalswapdimens"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalswapcounts"> + <cd:command file="syst-aux.mkiv" level="system" name="globalswapcounts"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalswapmacros"> + <cd:command file="syst-aux.mkiv" level="system" name="globalswapmacros"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalpushmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="globalpushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="localpushmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="localpushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalpopmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="globalpopmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="localpopmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="localpopmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="pushmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="pushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="popmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="popmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="localhsize"/> - <cd:command file="syst-aux.mkiv" name="setlocalhsize"> + <cd:command file="syst-aux.mkiv" level="system" name="localhsize"/> + <cd:command 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" name="availablehsize"/> - <cd:command file="syst-aux.mkiv" name="distributedhsize"> + <cd:command file="syst-aux.mkiv" level="system" name="availablehsize"/> + <cd:command file="syst-aux.mkiv" level="system" name="distributedhsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39257,7 +39696,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="hsizefraction"> + <cd:command file="syst-aux.mkiv" level="system" name="hsizefraction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39267,7 +39706,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39280,7 +39719,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39293,7 +39732,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsevalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39309,7 +39748,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvalueelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvalueelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39325,7 +39764,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnothing"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39335,7 +39774,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsomething"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39345,7 +39784,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenothing"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39358,7 +39797,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnothingelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnothingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39371,7 +39810,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsesomething"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsesomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39384,7 +39823,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsomethingelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsomethingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39397,7 +39836,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvaluenothing"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvaluenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39407,7 +39846,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvaluesomething"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvaluesomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39417,7 +39856,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsevaluenothing"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsevaluenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39430,7 +39869,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvaluenothingelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvaluenothingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39443,7 +39882,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseemptyvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39456,7 +39895,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifemptyvalueelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifemptyvalueelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39469,7 +39908,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifemptyvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39479,7 +39918,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotemptyvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39489,13 +39928,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseallcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39505,13 +39944,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifallcommonelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifallcommonelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39521,33 +39960,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifallcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotallcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoubleemptywithset"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoubleemptywithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes" optional="yes"> @@ -39558,7 +39997,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotripleemptywithset"> + <cd:command file="syst-aux.mkiv" level="system" name="dotripleemptywithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes" optional="yes"> @@ -39572,7 +40011,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoubleargumentwithset"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoubleargumentwithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes"> @@ -39583,7 +40022,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotripleargumentwithset"> + <cd:command file="syst-aux.mkiv" level="system" name="dotripleargumentwithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes"> @@ -39597,7 +40036,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="stripcharacter"> + <cd:command file="syst-aux.mkiv" level="system" name="stripcharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -39610,7 +40049,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="stripspaces"> + <cd:command file="syst-aux.mkiv" level="system" name="stripspaces"> <cd:arguments> <cd:delimiter name="from"/> <cd:keywords delimiters="none"> @@ -39620,7 +40059,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unspacestring"> + <cd:command file="syst-aux.mkiv" level="system" name="unspacestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39629,7 +40068,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="executeifdefined"> + <cd:command file="syst-aux.mkiv" level="system" name="executeifdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39639,7 +40078,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsesomespace"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsesomespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39652,7 +40091,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsomespaceelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsomespaceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39665,7 +40104,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processseparatedlist"> + <cd:command file="syst-aux.mkiv" level="system" name="processseparatedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -39679,7 +40118,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processlist"> + <cd:command file="syst-aux.mkiv" level="system" name="processlist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -39693,7 +40132,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignlist"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignlist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:text"/> @@ -39701,7 +40140,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="untexargument"> + <cd:command file="syst-aux.mkiv" level="system" name="untexargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39710,7 +40149,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="untexcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="untexcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:csname"/> @@ -39719,7 +40158,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="PointsToBigPoints"> + <cd:command file="syst-aux.mkiv" level="system" name="PointsToBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39727,7 +40166,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="PointsToWholeBigPoints"> + <cd:command file="syst-aux.mkiv" level="system" name="PointsToWholeBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39735,7 +40174,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ScaledPointsToBigPoints"> + <cd:command file="syst-aux.mkiv" level="system" name="ScaledPointsToBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39743,7 +40182,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ScaledPointsToWholeBigPoints"> + <cd:command file="syst-aux.mkiv" level="system" name="ScaledPointsToWholeBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39751,7 +40190,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="PointsToReal"> + <cd:command file="syst-aux.mkiv" level="system" name="PointsToReal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39759,22 +40198,22 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dontleavehmode"/> - <cd:command file="syst-aux.mkiv" name="utfupper"> + <cd:command file="syst-aux.mkiv" level="style" name="dontleavehmode"/> + <cd:command 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" name="utflower"> + <cd:command 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" name="uppercasestring"> + <cd:command file="syst-aux.mkiv" level="system" name="uppercasestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39783,7 +40222,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="lowercasestring"> + <cd:command file="syst-aux.mkiv" level="system" name="lowercasestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39792,7 +40231,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="counttoken"> + <cd:command file="syst-aux.mkiv" level="system" name="counttoken"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39805,7 +40244,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="counttokens"> + <cd:command file="syst-aux.mkiv" level="system" name="counttokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39814,7 +40253,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitofftokens"> + <cd:command file="syst-aux.mkiv" level="system" name="splitofftokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39827,7 +40266,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="handletokens"> + <cd:command file="syst-aux.mkiv" level="system" name="handletokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39836,9 +40275,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="settrialtypesetting"/> - <cd:command file="syst-aux.mkiv" name="resettrialtypesetting"/> - <cd:command file="syst-aux.mkiv" name="iftrialtypesetting"> + <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:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -39850,35 +40289,35 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="integerrounding"> + <cd:command 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" name="onedigitrounding"> + <cd:command 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" name="twodigitrounding"> + <cd:command 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" name="threedigitrounding"> + <cd:command 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" name="processcontent"> + <cd:command file="syst-aux.mkiv" level="system" name="processcontent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39886,14 +40325,14 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dogobblesingleempty"> + <cd:command 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" name="dogobbledoubleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dogobbledoubleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -39903,14 +40342,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblesingleempty"> + <cd:command 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" name="gobbledoubleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbledoubleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -39920,7 +40359,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsesometoks"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsesometoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39931,7 +40370,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsometokselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsometokselse"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39942,7 +40381,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsometoks"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsometoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39950,7 +40389,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifemptytoks"> + <cd:command file="syst-aux.mkiv" level="system" name="doifemptytoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39958,8 +40397,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="strictinspectnextcharacter" type="environment"/> - <cd:command file="syst-aux.mkiv" name="strictdoifelsenextoptional"> + <cd:command file="syst-aux.mkiv" level="system" name="strictinspectnextcharacter" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="strictdoifelsenextoptional"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39969,7 +40408,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="strictdoifnextoptionalelse"> + <cd:command file="syst-aux.mkiv" level="system" name="strictdoifnextoptionalelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39979,42 +40418,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblespacetokens"/> - <cd:command file="syst-aux.mkiv" name="verbatimstring"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblespacetokens"/> + <cd:command file="syst-aux.mkiv" level="system" name="verbatimstring"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="lastdigit"> + <cd:command 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" name="lasttwodigits"> + <cd:command 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" name="serializedcommalist"/> - <cd:command file="syst-aux.mkiv" name="serializecommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="serializedcommalist"/> + <cd:command 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" name="purenumber"> + <cd:command 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" name="filterfromvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="filterfromvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40027,7 +40466,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="filterfromnext"> + <cd:command file="syst-aux.mkiv" level="system" name="filterfromnext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -40035,24 +40474,14 @@ <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definemeasure"> + <cd:command file="syst-aux.mkiv" level="style" name="definemeasure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40062,7 +40491,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="freezemeasure"> + <cd:command file="syst-aux.mkiv" level="system" name="freezemeasure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40072,7 +40501,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setmeasure"> + <cd:command file="syst-aux.mkiv" level="system" name="setmeasure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40082,7 +40511,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setgmeasure"> + <cd:command file="syst-aux.mkiv" level="system" name="setgmeasure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40092,7 +40521,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setemeasure"> + <cd:command file="syst-aux.mkiv" level="system" name="setemeasure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40102,7 +40531,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setxmeasure"> + <cd:command file="syst-aux.mkiv" level="system" name="setxmeasure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40112,21 +40541,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="measure"> + <cd:command 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" name="measured"> + <cd:command 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" name="dividedsize"> + <cd:command file="syst-aux.mkiv" level="system" name="dividedsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -40139,7 +40568,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsedimension"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsedimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40152,7 +40581,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifdimensionelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifdimensionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40165,7 +40594,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsedimenstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsedimenstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40178,7 +40607,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifdimenstringelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifdimenstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40191,8 +40620,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="compresult"/> - <cd:command file="syst-aux.mkiv" name="comparedimension"> + <cd:command file="syst-aux.mkiv" level="system" name="compresult"/> + <cd:command file="syst-aux.mkiv" level="system" name="comparedimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -40202,7 +40631,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="comparedimensioneps"> + <cd:command file="syst-aux.mkiv" level="system" name="comparedimensioneps"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -40212,7 +40641,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letcscsname"> + <cd:command file="syst-aux.mkiv" level="system" name="letcscsname"> <cd:arguments> <cd:csname/> <cd:delimiter name="csname"/> @@ -40222,7 +40651,7 @@ <cd:delimiter name="endcsname"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letcsnamecs"> + <cd:command file="syst-aux.mkiv" level="system" name="letcsnamecs"> <cd:arguments> <cd:delimiter name="csname"/> <cd:keywords delimiters="none"> @@ -40232,7 +40661,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letcsnamecsname"> + <cd:command file="syst-aux.mkiv" level="system" name="letcsnamecsname"> <cd:arguments> <cd:delimiter name="csname"/> <cd:keywords delimiters="none"> @@ -40246,7 +40675,7 @@ <cd:delimiter name="endcsname"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="addvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="addvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40256,14 +40685,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unspaced"> + <cd:command 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" name="unspaceargument"> + <cd:command file="syst-aux.mkiv" level="system" name="unspaceargument"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -40272,7 +40701,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unspaceafter"> + <cd:command file="syst-aux.mkiv" level="system" name="unspaceafter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -40280,7 +40709,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsehasspace"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsehasspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40293,7 +40722,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifhasspaceelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifhasspaceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40306,28 +40735,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setflag"> + <cd:command 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" name="resetflag"> + <cd:command 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" name="flag"> + <cd:command 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" name="doifelseflagged"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseflagged"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40340,7 +40769,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifflaggedelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifflaggedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40353,7 +40782,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotflagged"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotflagged"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40363,7 +40792,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="inheritparameter"> + <cd:command file="syst-aux.mkiv" level="system" name="inheritparameter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40376,7 +40805,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenonzeropositive"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenonzeropositive"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -40389,7 +40818,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnonzeropositiveelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnonzeropositiveelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -40402,7 +40831,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getrawparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getrawparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40414,7 +40843,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getraweparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getraweparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40426,7 +40855,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getrawgparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getrawgparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40438,7 +40867,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getrawxparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getrawxparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40450,7 +40879,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unprotected"> + <cd:command file="syst-aux.mkiv" level="system" name="unprotected"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:content"/> @@ -40458,51 +40887,47 @@ <cd:delimiter name="par"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="resettimer"/> - <cd:command file="syst-aux.mkiv" name="elapsedtime"/> - <cd:command file="syst-aux.mkiv" name="elapsedseconds"/> - <cd:command file="syst-aux.mkiv" name="currentfeaturetest"/> - <cd:command file="syst-aux.mkiv" name="testfeature"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> - </cd:keywords> + <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="showtimer"> + <cd:command 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" name="testfeatureonce"> + <cd:command file="syst-aux.mkiv" level="system" name="testfeatureonce"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> - </cd:keywords> + <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="freezedimenmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="freezedimenmacro"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="negated"> + <cd:command 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" name="assigndimen"> + <cd:command file="syst-aux.mkiv" level="system" name="assigndimen"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -40510,7 +40935,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="appendvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40520,7 +40945,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendgvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="appendgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40530,7 +40955,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="prependvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40540,7 +40965,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependgvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="prependgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40550,7 +40975,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processranges"> + <cd:command file="syst-aux.mkiv" level="system" name="processranges"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:number"/> @@ -40559,7 +40984,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dowithrange"> + <cd:command file="syst-aux.mkiv" level="system" name="dowithrange"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:number"/> @@ -40568,9 +40993,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ignoreimplicitspaces"/> - <cd:command file="syst-aux.mkiv" name="nointerference" type="environment"/> - <cd:command file="syst-aux.mkiv" name="expandcheckedcsname"> + <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:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -40581,39 +41006,39 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="docheckedpair"> + <cd:command 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" name="constantnumber"> + <cd:command file="syst-aux.mkiv" level="system" name="constantnumber"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantnumberargument"> + <cd:command file="syst-aux.mkiv" level="system" name="constantnumberargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantdimen"> + <cd:command file="syst-aux.mkiv" level="system" name="constantdimen"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantdimenargument"> + <cd:command file="syst-aux.mkiv" level="system" name="constantdimenargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantemptyargument"> + <cd:command file="syst-aux.mkiv" level="system" name="constantemptyargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getsubstring"> + <cd:command file="syst-aux.mkiv" level="system" name="getsubstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -40626,7 +41051,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="converteddimen"> + <cd:command file="syst-aux.mkiv" level="system" name="converteddimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -40647,7 +41072,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ntimes"> + <cd:command file="syst-aux.mkiv" level="system" name="ntimes"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40657,9 +41082,108 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expdoifelse"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expdoif"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expdoifnot"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expdoifelsecommon"> + <cd:arguments> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </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 file="syst-lua.mkiv" level="system" name="expdoifcommonelse"> + <cd:arguments> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </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 file="syst-lua.mkiv" level="system" name="expdoifelseinset"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </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 file="syst-lua.mkiv" level="system" name="expdoifinsetelse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </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 file="syst-lua.mkiv" level="system" name="luaexpr"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-systemlog.xml"> - <cd:command file="core-sys.mkiv" name="systemlog"> + <cd:command file="core-sys.mkiv" level="system" name="systemlog"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -40672,7 +41196,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="systemlogfirst"> + <cd:command file="core-sys.mkiv" level="system" name="systemlogfirst"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -40685,7 +41209,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="systemloglast"> + <cd:command file="core-sys.mkiv" level="system" name="systemloglast"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -40700,7 +41224,7 @@ </cd:command> </cd:interface> <cd:interface file="i-table.xml"> - <cd:command file="tabl-tab.mkiv" name="table" type="environment"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="table" type="environment"> <cd:arguments> <cd:template/> <cd:assignments list="yes" optional="yes"> @@ -40708,7 +41232,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="table" type="environment" variant="name"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="table" type="environment" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40718,7 +41242,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="definetabletemplate"> + <cd:command category="tables" file="tabl-tab.mkiv" level="style" name="definetabletemplate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40732,33 +41256,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="tables" type="environment"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="tables" type="environment"> <cd:arguments> <cd:template/> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="tables" type="environment" variant="name"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="tables" type="environment" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="tablehead" type="environment"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="tablehead" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="tabletail" type="environment"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="tabletail" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="setuptables"> + <cd:command category="tables" file="tabl-tab.mkiv" level="style" name="setuptables"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="text"> @@ -40828,7 +41352,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tabulation.xml"> - <cd:command file="tabl-tbl.mkiv" name="definetabulation"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="definetabulation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40841,7 +41365,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="setuptabulation"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="setuptabulation"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -40927,7 +41451,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" generated="yes" name="tabulation" type="environment" variant="example"> + <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> @@ -40940,7 +41464,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="definetabulate"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="definetabulate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40951,7 +41475,7 @@ <cd:template optional="yes"/> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="setuptabulate"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="setuptabulate"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -40964,7 +41488,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="tabulate" type="environment"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulate" type="environment"> <cd:arguments> <cd:template optional="yes"/> <cd:assignments list="yes" optional="yes"> @@ -40972,7 +41496,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" generated="yes" name="tabulate" type="environment" variant="instance"> + <cd:command category="tables" file="tabl-tbl.mkiv" generated="yes" level="document" name="tabulate" type="environment" variant="instance"> <cd:sequence> <cd:instance value="tabulate"/> </cd:sequence> @@ -40984,29 +41508,32 @@ <cd:inherit name="setuptabulate"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="legend"/> + <cd:constant value="fact"/> + </cd:instances> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="tabulatehead" type="environment"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulatehead" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="tabulatetail" type="environment"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulatetail" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="tabulaterule"/> - <cd:command file="tabl-tbl.mkiv" name="tabulateline"/> - <cd:command file="tabl-tbl.mkiv" name="tabulateautorule"/> - <cd:command file="tabl-tbl.mkiv" name="tabulateautoline"/> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulaterule"/> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulateline"/> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulateautorule"/> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulateautoline"/> </cd:interface> <cd:interface file="i-tagging.xml"> - <cd:command file="strc-tag.mkiv" name="setuptagging"> + <cd:command category="xml" file="strc-tag.mkiv" level="style" name="setuptagging"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -41019,7 +41546,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="dostart" end="dostop" file="strc-tag.mkiv" name="tagged" type="environment"> + <cd:command begin="dostart" category="xml" end="dostop" file="strc-tag.mkiv" level="system" name="tagged" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41029,7 +41556,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="element" type="environment"> + <cd:command category="xml" file="strc-tag.mkiv" name="element" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41041,7 +41568,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="doifelseinelement"> + <cd:command category="xml conditional" file="strc-tag.mkiv" level="system" name="doifelseinelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41054,7 +41581,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="doifinelementelse"> + <cd:command category="xml conditional" file="strc-tag.mkiv" level="system" name="doifinelementelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41067,7 +41594,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="taggedlabeltexts"> + <cd:command category="xml language" file="strc-tag.mkiv" level="system" name="taggedlabeltexts"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41078,7 +41605,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="namedtaggedlabeltexts"> + <cd:command category="xml language" file="strc-tag.mkiv" level="system" name="namedtaggedlabeltexts"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41095,7 +41622,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="settaggedmetadata"> + <cd:command category="xml" file="strc-tag.mkiv" level="document" name="settaggedmetadata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -41106,7 +41633,7 @@ </cd:command> </cd:interface> <cd:interface file="i-textbackground.xml"> - <cd:command file="anch-bck.mkiv" name="definetextbackground"> + <cd:command category="background" file="anch-bck.mkiv" level="style" name="definetextbackground"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41119,7 +41646,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" name="setuptextbackground"> + <cd:command category="background" file="anch-bck.mkiv" level="style" name="setuptextbackground"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -41132,8 +41659,12 @@ <cd:parameter name="location"> <cd:constant default="yes" type="text"/> <cd:constant type="paragraph"/> + <cd:constant type="always"/> <cd:constant type="none"/> </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="alternative"> <cd:constant type="cd:number"/> </cd:parameter> @@ -41226,7 +41757,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" name="textbackground" type="environment"> + <cd:command category="background" file="anch-bck.mkiv" level="document" name="textbackground" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41236,7 +41767,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" generated="yes" name="textbackground" type="environment" variant="example"> + <cd:command category="background" file="anch-bck.mkiv" generated="yes" level="document" name="textbackground" type="environment" variant="example"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -41246,7 +41777,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" generated="yes" name="textbackground" variant="example"> + <cd:command category="background" file="anch-bck.mkiv" generated="yes" level="document" name="textbackground" variant="example"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -41254,10 +41785,10 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" name="textbackgroundmanual" type="environment"/> + <cd:command category="background" file="anch-bck.mkiv" level="system" name="textbackgroundmanual" type="environment"/> </cd:interface> <cd:interface file="i-textflow.xml"> - <cd:command file="page-flw.mkiv" name="definetextflow"> + <cd:command category="structure" file="page-flw.mkiv" level="style" name="definetextflow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41270,7 +41801,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="setuptextflow"> + <cd:command category="structure" file="page-flw.mkiv" level="style" name="setuptextflow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -41289,14 +41820,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="textflowcollector"> + <cd:command category="structure" file="page-flw.mkiv" level="system" name="textflowcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="doifelsetextflowcollector"> + <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doifelsetextflowcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41309,7 +41840,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="doiftextflowcollectorelse"> + <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doiftextflowcollectorelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41322,7 +41853,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="doifelsetextflow"> + <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doifelsetextflow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41335,7 +41866,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="doiftextflowelse"> + <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doiftextflowelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41348,14 +41879,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="textflow" type="environment"> + <cd:command category="structure" file="page-flw.mkiv" level="document" name="textflow" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="flushtextflow"> + <cd:command category="structure" file="page-flw.mkiv" level="document" name="flushtextflow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41364,7 +41895,7 @@ </cd:command> </cd:interface> <cd:interface file="i-textrule.xml"> - <cd:command file="pack-mrl.mkiv" name="setuptextrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setuptextrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -41412,7 +41943,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="textrule"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="textrule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -41424,7 +41955,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="textrule" type="environment"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="textrule" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41433,7 +41964,7 @@ </cd:command> </cd:interface> <cd:interface file="i-texts.xml"> - <cd:command file="page-txt.mkvi" name="setuplayouttext"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuplayouttext"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -41504,7 +42035,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setuptop"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuptop"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41516,7 +42047,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupheader"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupheader"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41528,7 +42059,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setuptext"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuptext"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41540,7 +42071,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupfooter"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupfooter"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41552,7 +42083,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupbottom"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupbottom"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41564,7 +42095,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="doifelselayouttextline"> + <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doifelselayouttextline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41577,7 +42108,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="doiflayouttextlineelse"> + <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doiflayouttextlineelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41590,7 +42121,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="doifelselayoutsomeline"> + <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doifelselayoutsomeline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41603,7 +42134,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="doiflayoutsomelineelse"> + <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doiflayoutsomelineelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41616,9 +42147,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="noheaderandfooterlines"/> - <cd:command file="page-txt.mkvi" name="notopandbottomlines"/> - <cd:command file="page-txt.mkvi" name="setuptoptexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="noheaderandfooterlines"/> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="notopandbottomlines"/> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuptoptexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41655,7 +42186,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupheadertexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupheadertexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41692,7 +42223,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setuptexttexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuptexttexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41729,7 +42260,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupfootertexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupfootertexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41766,7 +42297,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupbottomtexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupbottomtexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41803,7 +42334,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="settextcontent"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="settextcontent"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -41838,7 +42369,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="definetext"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="definetext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41887,7 +42418,7 @@ </cd:command> </cd:interface> <cd:interface file="i-thinrule.xml"> - <cd:command file="pack-mrl.mkiv" name="setupthinrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setupthinrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="height"> @@ -41941,9 +42472,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="thinrule"/> - <cd:command file="pack-mrl.mkiv" name="hairline"/> - <cd:command file="pack-mrl.mkiv" name="thinrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="thinrule"/> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="hairline"/> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="thinrules"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupthinrules"/> @@ -41952,28 +42483,28 @@ </cd:command> </cd:interface> <cd:interface file="i-token.xml"> - <cd:command file="toks-tra.mkiv" name="tokens" type="environment"> + <cd:command 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" name="flushtokens"> + <cd:command 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" name="showtokens"> + <cd:command 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" name="testtokens"> + <cd:command file="toks-tra.mkiv" level="system" name="testtokens"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41982,7 +42513,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tolerance.xml"> - <cd:command file="spac-hor.mkiv" name="setuptolerance"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="setuptolerance"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="horizontal"/> @@ -41998,7 +42529,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tooltip.xml"> - <cd:command file="scrn-fld.mkvi" name="definetooltip"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definetooltip"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42011,7 +42542,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setuptooltip"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="setuptooltip"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -42026,7 +42557,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" generated="yes" name="tooltip" variant="instance"> + <cd:command category="pdf" file="scrn-fld.mkvi" generated="yes" level="document" name="tooltip" variant="instance"> <cd:sequence> <cd:instance value="tooltip"/> </cd:sequence> @@ -42041,9 +42572,11 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="tooltip"/> + </cd:instances> </cd:command> - <cd:command file="scrn-fld.mkvi" generated="yes" name="tooltip" variant="instance:argument"> + <cd:command category="pdf" file="scrn-fld.mkvi" generated="yes" level="document" name="tooltip" variant="instance:argument"> <cd:sequence> <cd:instance value="tooltip"/> </cd:sequence> @@ -42060,11 +42593,13 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="tooltip"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-tracker.xml"> - <cd:command file="trac-ctx.mkiv" name="installtextracker"> + <cd:command file="trac-ctx.mkiv" level="system" name="installtextracker"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42077,7 +42612,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-ctx.mkiv" name="installtexdirective"> + <cd:command file="trac-ctx.mkiv" level="system" name="installtexdirective"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42090,59 +42625,59 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="enabletrackers"> + <cd:command 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" name="disabletrackers"> + <cd:command 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" name="resettrackers"/> - <cd:command file="trac-deb.mkiv" name="showtrackers"/> - <cd:command file="trac-deb.mkiv" name="enabledirectives"> + <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:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="disabledirectives"> + <cd:command 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" name="showdirectives"/> - <cd:command file="trac-deb.mkiv" name="enableexperiments"> + <cd:command file="trac-deb.mkiv" level="document" name="showdirectives"/> + <cd:command 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" name="disableexperiments"> + <cd:command 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" name="showexperiments"/> - <cd:command file="trac-deb.mkiv" name="showedebuginfo"/> - <cd:command file="trac-deb.mkiv" name="overloaderror"/> - <cd:command file="trac-deb.mkiv" name="showlogcategories"/> - <cd:command file="trac-jus.mkiv" name="showjustification"/> + <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:interface> <cd:interface file="i-translation.xml"> - <cd:command file="lang-lab.mkiv" name="translate"> + <cd:command category="language" file="lang-lab.mkiv" level="document" name="translate"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:language"> @@ -42151,7 +42686,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-lab.mkiv" name="assigntranslation"> + <cd:command category="language" file="lang-lab.mkiv" level="style" name="assigntranslation"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:language"> @@ -42164,7 +42699,7 @@ </cd:command> </cd:interface> <cd:interface file="i-twopassdata.xml"> - <cd:command file="core-two.mkiv" name="immediatesavetwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="immediatesavetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42175,7 +42710,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="savetwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="savetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42186,7 +42721,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="lazysavetwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="lazysavetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42197,7 +42732,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="savetaggedtwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="savetaggedtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42211,7 +42746,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="lazysavetaggedtwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="lazysavetaggedtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42225,28 +42760,28 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="definetwopasslist"> + <cd:command 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" name="gettwopassdata"> + <cd:command 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" name="checktwopassdata"> + <cd:command 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" name="findtwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="findtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42256,21 +42791,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="getfirsttwopassdata"> + <cd:command 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" name="getlasttwopassdata"> + <cd:command 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" name="getnamedtwopassdatalist"> + <cd:command file="core-two.mkiv" level="system" name="getnamedtwopassdatalist"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42278,14 +42813,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="gettwopassdatalist"> + <cd:command 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" name="doifelseintwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="doifelseintwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42301,7 +42836,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="doifintwopassdataelse"> + <cd:command file="core-two.mkiv" level="system" name="doifintwopassdataelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42317,7 +42852,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="getfromtwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="getfromtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42329,7 +42864,7 @@ </cd:command> </cd:interface> <cd:interface file="i-typography.xml"> - <cd:command file="typo-txt.mkvi" name="normalizetextwidth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizetextwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42342,7 +42877,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizetextheight"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizetextheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42355,7 +42890,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizetextdepth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizetextdepth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42368,7 +42903,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizetextline"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizetextline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42381,7 +42916,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizefontwidth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizefontwidth"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42395,7 +42930,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizefontheight"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizefontheight"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42409,7 +42944,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizefontdepth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizefontdepth"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42423,7 +42958,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizefontline"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizefontline"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42437,7 +42972,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="widthspanningtext"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="widthspanningtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42450,7 +42985,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="heightspanningtext"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="heightspanningtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42463,7 +42998,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="depthspanningtext"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="depthspanningtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42476,7 +43011,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="linespanningtext"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="linespanningtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42489,8 +43024,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizedfontsize"/> - <cd:command file="typo-txt.mkvi" name="NormalizeTextWidth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizedfontsize"/> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="NormalizeTextWidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42503,7 +43038,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="NormalizeTextHeight"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="NormalizeTextHeight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42516,7 +43051,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="NormalizeFontWidth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="NormalizeFontWidth"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42530,7 +43065,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="NormalizeFontHeight"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="NormalizeFontHeight"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42544,7 +43079,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="WidthSpanningText"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="WidthSpanningText"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42557,8 +43092,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="TheNormalizedFontSize"/> - <cd:command file="typo-txt.mkvi" name="nicelyfilledbox" type="environment"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="TheNormalizedFontSize"/> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="nicelyfilledbox" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="width"> @@ -42579,21 +43114,21 @@ </cd:command> </cd:interface> <cd:interface file="i-unit.xml"> - <cd:command file="phys-dim.mkiv" name="digits"> + <cd:command category="symbols" file="phys-dim.mkiv" level="document" name="digits"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" name="digits" variant="string"> + <cd:command category="symbols" file="phys-dim.mkiv" level="document" name="digits" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" name="defineunit"> + <cd:command category="symbols" file="phys-dim.mkiv" level="style" name="defineunit"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42606,7 +43141,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" name="setupunit"> + <cd:command category="symbols" file="phys-dim.mkiv" level="style" name="setupunit"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -42657,16 +43192,18 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" generated="yes" name="unit" variant="instance"> + <cd:command category="symbols" file="phys-dim.mkiv" generated="yes" level="document" name="unit" variant="instance"> <cd:sequence> <cd:instance value="unit"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="unit"/> + </cd:instances> </cd:command> - <cd:command file="phys-dim.mkiv" name="installunitsseparator"> + <cd:command category="symbols" file="phys-dim.mkiv" level="system" name="installunitsseparator"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42676,7 +43213,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" name="installunitsspace"> + <cd:command category="symbols" file="phys-dim.mkiv" level="system" name="installunitsspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42686,7 +43223,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" name="registerunit"> + <cd:command category="symbols" file="phys-dim.mkiv" level="style" name="registerunit"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="prefix"/> @@ -42705,7 +43242,7 @@ </cd:command> </cd:interface> <cd:interface file="i-variables.xml"> - <cd:command file="core-env.mkiv" name="setvariables"> + <cd:command file="core-env.mkiv" level="style" name="setvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42723,7 +43260,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setevariables"> + <cd:command file="core-env.mkiv" level="system" name="setevariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42741,7 +43278,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setgvariables"> + <cd:command file="core-env.mkiv" level="system" name="setgvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42759,7 +43296,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setxvariables"> + <cd:command file="core-env.mkiv" level="system" name="setxvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42777,7 +43314,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="checkvariables"> + <cd:command file="core-env.mkiv" level="system" name="checkvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42795,7 +43332,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setvariable"> + <cd:command file="core-env.mkiv" level="style" name="setvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42808,7 +43345,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setevariable"> + <cd:command file="core-env.mkiv" level="system" name="setevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42821,7 +43358,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setgvariable"> + <cd:command file="core-env.mkiv" level="system" name="setgvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42834,7 +43371,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setxvariable"> + <cd:command file="core-env.mkiv" level="system" name="setxvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42847,7 +43384,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="getvariable"> + <cd:command file="core-env.mkiv" level="style" name="getvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42857,7 +43394,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="showvariable"> + <cd:command file="core-env.mkiv" level="system" name="showvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42867,7 +43404,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelsevariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelsevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42883,7 +43420,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifvariableelse"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifvariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42899,7 +43436,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42912,7 +43449,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42925,7 +43462,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelseemptyvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelseemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42941,7 +43478,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifemptyvariableelse"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifemptyvariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42957,7 +43494,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifemptyvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42970,7 +43507,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotemptyvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42983,7 +43520,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="getvariabledefault"> + <cd:command file="core-env.mkiv" level="system" name="getvariabledefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42996,7 +43533,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setupenv"> + <cd:command file="core-env.mkiv" level="system" name="setupenv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="set"> @@ -43011,7 +43548,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelseenv"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelseenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43024,7 +43561,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifenvelse"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifenvelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43037,7 +43574,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifenv"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43047,7 +43584,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotenv"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43057,14 +43594,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="env"> + <cd:command 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" name="envvar"> + <cd:command file="core-env.mkiv" level="system" name="envvar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43074,7 +43611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="setdocumentfilename"> + <cd:command file="luat-ini.mkiv" level="system" name="setdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43084,7 +43621,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="setdocumentargument"> + <cd:command file="luat-ini.mkiv" level="system" name="setdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43094,7 +43631,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="setdocumentargumentdefault"> + <cd:command file="luat-ini.mkiv" level="system" name="setdocumentargumentdefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43104,21 +43641,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="getdocumentfilename"> + <cd:command 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" name="getdocumentargument"> + <cd:command 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" name="getdocumentargumentdefault"> + <cd:command file="luat-ini.mkiv" level="system" name="getdocumentargumentdefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43128,7 +43665,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifelsedocumentargument"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifelsedocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43141,7 +43678,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifdocumentargumentelse"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentargumentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43154,7 +43691,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifdocumentargument"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43164,7 +43701,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifnotdocumentargument"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifnotdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43174,7 +43711,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifelsedocumentfilename"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifelsedocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43187,7 +43724,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifdocumentfilenameelse"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentfilenameelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43200,7 +43737,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifdocumentfilename"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43210,7 +43747,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifnotdocumentfilename"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifnotdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43222,7 +43759,7 @@ </cd:command> </cd:interface> <cd:interface file="i-verbatim.xml"> - <cd:command file="buff-ver.mkiv" name="definetype"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="style" name="definetype"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43235,7 +43772,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="setuptype"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="style" name="setuptype"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -43300,7 +43837,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="type"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="type"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -43308,7 +43845,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="type" variant="angles"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="type" variant="angles"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -43316,7 +43853,7 @@ <cd:angles/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typ"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="typ"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -43324,7 +43861,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typ" variant="angles"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="typ" variant="angles"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -43332,7 +43869,7 @@ <cd:angles/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="type" variant="example"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="type" variant="example"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -43343,7 +43880,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="type" variant="example:angles"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="type" variant="example:angles"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -43354,7 +43891,7 @@ <cd:angles/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="definetyping"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="style" name="definetyping"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43367,7 +43904,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="setuptyping"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="style" name="setuptyping"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -43393,7 +43930,7 @@ <cd:constant type="nested"/> <cd:constant type="tex"/> <cd:constant type="context"/> - <cd:constant default="yes" type="none"/> + <cd:constant type="none"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="style"> @@ -43478,7 +44015,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="typing" type="environment" variant="instance"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typing" type="environment" variant="instance"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -43487,9 +44024,16 @@ <cd:inherit name="setuptyping"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="typing"/> + <cd:constant value="LUA"/> + <cd:constant value="MP"/> + <cd:constant value="PARSEDXML"/> + <cd:constant value="TEX"/> + <cd:constant value="XML"/> + </cd:instances> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="typing" type="environment" variant="instance:argument"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typing" type="environment" variant="instance:argument"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -43498,51 +44042,58 @@ <cd:constant type="continue"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="typing"/> + <cd:constant value="LUA"/> + <cd:constant value="MP"/> + <cd:constant value="PARSEDXML"/> + <cd:constant value="TEX"/> + <cd:constant value="XML"/> + </cd:instances> </cd:command> - <cd:command file="buff-ver.mkiv" name="tex"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="tex"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="arg"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="arg"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="mat"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="mat"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="dis"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="dis"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="astype"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="astype"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="asciistr"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="asciistr"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="verbatim"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="verbatim"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="filename"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="filename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typefile"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="typefile"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -43555,7 +44106,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="doifelsetypingfile"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system conditional" name="doifelsetypingfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43568,7 +44119,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="doiftypingfileelse"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system conditional" name="doiftypingfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43583,7 +44134,7 @@ </cd:command> </cd:interface> <cd:interface file="i-version.xml"> - <cd:command file="page-inf.mkiv" name="setupversion"> + <cd:command file="page-inf.mkiv" level="style" name="setupversion"> <cd:arguments> <cd:keywords> <cd:constant type="concept"/> @@ -43594,7 +44145,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-inf.mkiv" name="version"> + <cd:command file="page-inf.mkiv" level="style" name="version"> <cd:arguments> <cd:keywords> <cd:constant type="concept"/> @@ -43605,7 +44156,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-inf.mkiv" name="installversioninfo"> + <cd:command file="page-inf.mkiv" level="system" name="installversioninfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43615,14 +44166,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-inf.mkiv" name="includeversioninfo"> + <cd:command file="page-inf.mkiv" level="system" name="includeversioninfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="doifelseolderversion"> + <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifelseolderversion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43638,7 +44189,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="doifolderversionelse"> + <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifolderversionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43654,7 +44205,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="doifelseoldercontext"> + <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifelseoldercontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43667,7 +44218,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="doifoldercontextelse"> + <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifoldercontextelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43682,7 +44233,7 @@ </cd:command> </cd:interface> <cd:interface file="i-viewerlayer.xml"> - <cd:command file="attr-lay.mkiv" name="defineviewerlayer"> + <cd:command category="pdf" file="attr-lay.mkiv" level="style" name="defineviewerlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43695,7 +44246,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" name="setupviewerlayer"> + <cd:command category="pdf" file="attr-lay.mkiv" level="style" name="setupviewerlayer"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -43724,19 +44275,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" name="viewerlayer" type="environment"> + <cd:command category="pdf" file="attr-lay.mkiv" level="document" name="viewerlayer" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" generated="yes" name="viewerlayer" type="environment" variant="example"> + <cd:command category="pdf" file="attr-lay.mkiv" generated="yes" level="document" name="viewerlayer" type="environment" variant="example"> <cd:sequence> <cd:variable value="viewerlayer"/> </cd:sequence> </cd:command> - <cd:command file="attr-lay.mkiv" name="viewerlayer"> + <cd:command category="pdf" file="attr-lay.mkiv" level="document" name="viewerlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43744,10 +44295,10 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" name="showlayoutcomponents"/> + <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" name="ruledhbox"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43755,7 +44306,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledvbox"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43763,7 +44314,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledvtop"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43771,7 +44322,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledtopv"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledtopv"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43779,7 +44330,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledhpack"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledhpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43787,7 +44338,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledvpack"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledvpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43795,7 +44346,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledtpack"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledtpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43803,12 +44354,12 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledmbox"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledmbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxr"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxr"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43816,7 +44367,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxg"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxg"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43824,7 +44375,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxb"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxb"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43832,7 +44383,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxc"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxc"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43840,7 +44391,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxm"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxm"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43848,7 +44399,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxy"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxy"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43856,7 +44407,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxk"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxk"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43864,12 +44415,13 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trc-vis.mkiv" name="showmakeup"> + <cd:command file="trc-vis.mkiv" level="document" name="showmakeup"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="makeup"/> <cd:constant type="all"/> <cd:constant type="boxes"/> + <cd:constant type="line"/> <cd:constant type="glyph"/> <cd:constant type="fontkern"/> <cd:constant type="hbox"/> @@ -43892,21 +44444,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trc-vis.mkiv" name="showallmakeup"/> - <cd:command file="trc-vis.mkiv" name="showboxes"/> - <cd:command file="trc-vis.mkiv" name="showglyphs"/> - <cd:command file="trc-vis.mkiv" name="showfontkerns"/> - <cd:command file="trc-vis.mkiv" name="setvisualizerfont"> + <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="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" name="resetvisualizers"/> + <cd:command file="trc-vis.mkiv" level="system" name="resetvisualizers"/> </cd:interface> <cd:interface file="i-vspace.xml"> - <cd:command file="spac-ver.mkiv" name="definevspacingamount"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="definevspacingamount"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43919,7 +44472,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="definevspacing"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="definevspacing"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43929,7 +44482,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="vspacing"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="vspacing"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="preference"/> @@ -43939,6 +44492,7 @@ <cd:constant type="enable"/> <cd:constant type="disable"/> <cd:constant type="nowhite"/> + <cd:constant type="packed"/> <cd:constant type="back"/> <cd:constant type="overlay"/> <cd:constant type="always"/> @@ -43980,42 +44534,86 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="directvspacing"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="directvspacing"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:inherit name="vspacing"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupvspacing"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="setupvspacing"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="vspacing"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupblank"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupblank"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="vspacing"/> + <cd:inherit name="blank"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="blank"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="blank"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="vspacing"/> + <cd:constant type="preference"/> + <cd:constant type="samepage"/> + <cd:constant type="max"/> + <cd:constant type="force"/> + <cd:constant type="enable"/> + <cd:constant type="disable"/> + <cd:constant type="nowhite"/> + <cd:constant type="back"/> + <cd:constant type="overlay"/> + <cd:constant type="always"/> + <cd:constant type="weak"/> + <cd:constant type="strong"/> + <cd:constant type="default"/> + <cd:constant type="before"/> + <cd:constant type="inbetween"/> + <cd:constant type="after"/> + <cd:constant type="fixed"/> + <cd:constant type="flexible"/> + <cd:constant type="none"/> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant type="big"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="quarterline"/> + <cd:constant type="formula"/> + <cd:constant type="white"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant type="standard"/> + <cd:constant method="factor" prefix="cd:number" type="small"/> + <cd:constant method="factor" prefix="cd:number" type="medium"/> + <cd:constant method="factor" prefix="cd:number" type="big"/> + <cd:constant method="factor" prefix="cd:number" type="line"/> + <cd:constant method="factor" prefix="cd:number" type="halfline"/> + <cd:constant method="factor" prefix="cd:number" type="quarterline"/> + <cd:constant method="factor" prefix="cd:number" type="formula"/> + <cd:constant method="factor" prefix="cd:number" type="white"/> + <cd:constant method="factor" prefix="cd:number" type="height"/> + <cd:constant method="factor" prefix="cd:number" type="depth"/> + <cd:constant method="range" prefix="category" type="cd:number"/> + <cd:constant method="range" prefix="order" type="cd:number"/> + <cd:constant method="range" prefix="penalty" type="cd:number"/> + <cd:constant type="cd:dimension"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="useblankparameter"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="useblankparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="inhibitblank"/> - <cd:command file="spac-ver.mkiv" name="synchronizeblank"/> - <cd:command file="spac-ver.mkiv" name="definevspace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="inhibitblank"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="synchronizeblank"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="definevspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -44028,7 +44626,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="vspace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="vspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -44038,26 +44636,26 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="godown"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="godown"> <cd:arguments> <cd:keywords> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="vglue"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="vglue"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="smallskip"/> - <cd:command file="spac-ver.mkiv" name="medskip"/> - <cd:command file="spac-ver.mkiv" name="bigskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="smallskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="medskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="bigskip"/> </cd:interface> <cd:interface file="i-whitespace.xml"> - <cd:command file="spac-ver.mkiv" name="setupwhitespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupwhitespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="fix"/> @@ -44075,21 +44673,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="synchronizewhitespace"/> - <cd:command file="spac-ver.mkiv" name="correctwhitespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="synchronizewhitespace"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="correctwhitespace"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="packed" type="environment"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="packed" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="blank"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="unpacked" type="environment"/> - <cd:command file="spac-ver.mkiv" name="linecorrection" type="environment"> + <cd:command category="whitespace" file="spac-ver.mkiv" name="unpacked" type="environment"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="linecorrection" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -44097,7 +44695,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="locallinecorrection" type="environment"> + <cd:command category="whitespace" file="spac-ver.mkiv" name="locallinecorrection" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -44107,21 +44705,21 @@ </cd:command> </cd:interface> <cd:interface file="i-xml.xml"> - <cd:command name="xmlmain"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmain"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflush"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflush"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44131,7 +44729,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlpure"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlpure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44141,21 +44739,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushtext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushpure"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushpure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlnonspace"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlnonspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44165,21 +44763,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushspacewise"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushspacewise"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushlinewise"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushlinewise"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlall"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlall"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44189,8 +44787,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmllastmatch"/> - <cd:command name="xmlfirst"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmllastmatch"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlfirst"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44200,7 +44798,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmllast"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmllast"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44210,7 +44808,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlcontext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlcontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44220,28 +44818,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushcontext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushcontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlshow"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlshow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinfo"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlfilter"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlfilter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44251,7 +44849,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlstrip"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlstrip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44261,7 +44859,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlstripped"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlstripped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44271,7 +44869,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlstripnolines"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlstripnolines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44281,7 +44879,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlstrippednolines"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlstrippednolines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44291,7 +44889,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlposition"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44304,7 +44902,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlelement"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44314,14 +44912,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlpos"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsnippet"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsnippet"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44331,7 +44929,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlconcat"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlconcat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44344,7 +44942,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlconcatrange"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlconcatrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44363,7 +44961,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlcommand"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44376,52 +44974,114 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinlineverbatim"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim" type="environment"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinlineverbatim" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldisplayverbatim"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim" type="environment"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldisplayverbatim" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlverbatim"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprettyprint"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprettyprinttext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprettyprint"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinlineprettyprint"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloadfile"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinlineprettyprinttext"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloadfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44434,7 +45094,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloadbuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloadbuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -44447,7 +45107,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloaddata"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloaddata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44460,7 +45120,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloadonly"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloadonly"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44473,7 +45133,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprocessfile"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprocessfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44486,7 +45146,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprocessbuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprocessbuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -44499,7 +45159,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprocessdata"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprocessdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44512,7 +45172,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinclude"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinclude"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44525,42 +45185,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlname"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlpath"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlpath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlnamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlnamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltag"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlcount"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlcount"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlatt"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44570,7 +45230,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlattdef"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44583,7 +45243,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlrefatt"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlattdef"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44591,10 +45251,36 @@ <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlrefatt"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </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="xmllastatt"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlattribute"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:lpath"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmllastatt"/> - <cd:command name="xmlattribute"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44605,9 +45291,12 @@ <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlattributedef"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlattributedef"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44623,7 +45312,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlchainatt"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlchainatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44633,7 +45322,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlchainattdef"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlchainattdef"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlpar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44641,33 +45343,73 @@ <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="xmlsetpar"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlparam"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:lpath"/> + </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="xmlsetparam"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:lpath"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldirectives"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmllastpar"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldirectives"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesbefore"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldirectivesbefore"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesafter"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldirectivesafter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinstalldirective"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinstalldirective"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44677,7 +45419,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44687,7 +45429,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsetsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44700,14 +45442,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlremovesetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremovesetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlremovedocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremovedocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44717,7 +45459,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushdocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushdocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44727,35 +45469,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlresetsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlresetsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlresetdocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlresetdocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprependsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprependsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlappendsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlappendsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlbeforesetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlbeforesetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> @@ -44765,7 +45507,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlaftersetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlaftersetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> @@ -44775,7 +45517,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprependdocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprependdocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44785,7 +45527,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlappenddocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlappenddocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44795,7 +45537,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlbeforedocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlbeforedocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44808,7 +45550,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlafterdocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlafterdocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44821,8 +45563,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlregisteredsetups"/> - <cd:command name="xmlregistereddocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregisteredsetups"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregistereddocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44832,7 +45574,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsetfunction"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetfunction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44845,7 +45587,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoif"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoif"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44858,7 +45600,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifnot"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifnot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44871,7 +45613,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelse"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44887,7 +45629,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoiftext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoiftext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44900,7 +45642,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifnottext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifnottext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44913,7 +45655,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelsetext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelsetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44929,7 +45671,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44939,7 +45681,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifnotselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifnotselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44949,7 +45691,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelseselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelseselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44962,7 +45704,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelseempty"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelseempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44978,7 +45720,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlregisterns"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregisterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44988,7 +45730,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlregisterns"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregisterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44998,7 +45740,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlremapname"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremapname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45014,7 +45756,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlremapnamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremapnamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45027,7 +45769,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlchecknamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlchecknamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45037,7 +45779,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlmapvalue"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmapvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45050,7 +45792,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlvalue"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45063,7 +45805,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelsevalue"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelsevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45079,14 +45821,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloaddirectives"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloaddirectives"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsave"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsave"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45096,7 +45838,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltofile"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltofile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45109,7 +45851,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltobuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltobuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45122,7 +45864,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltobufferverbose"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltobufferverbose"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45135,65 +45877,65 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmladdindex"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmladdindex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinclusion"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinclusion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinclusions"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinclusions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlbadinclusions"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlbadinclusions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlraw"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlraw"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlraw" type="environment"/> - <cd:command name="xmlresetinjectors"/> - <cd:command name="xmlsetinjectors"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlraw" type="environment"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlresetinjectors"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetinjectors"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinjector"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinjector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlapplyselectors"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlapplyselectors"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsetentity"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetentity"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45203,7 +45945,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltexentity"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltexentity"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45213,7 +45955,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="setupxml"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="setupxml"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="default"> @@ -45228,7 +45970,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="xmldefaulttotext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldefaulttotext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45237,7 +45979,7 @@ </cd:command> </cd:interface> <cd:interface file="i-xtable.xml"> - <cd:command file="tabl-xtb.mkvi" name="definextable"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="definextable"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -45250,7 +45992,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="setupxtable"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="setupxtable"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -45319,35 +46061,35 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtable" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xtable" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="embeddedxtable" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="embeddedxtable" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" generated="yes" name="xtable" type="environment" variant="example"> + <cd:command category="tables" file="tabl-xtb.mkvi" generated="yes" level="document" name="xtable" type="environment" variant="example"> <cd:sequence> <cd:variable value="xtable"/> </cd:sequence> @@ -45357,14 +46099,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="processxtablebuffer"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="processxtablebuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xrow" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xrow" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45374,7 +46116,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xcell" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcell" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45396,63 +46138,63 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablehead" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xtablehead" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xtablefoot" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xtablefoot" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xtablenext" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xtablenext" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xtablebody" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xtablebody" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" 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 file="tabl-xtb.mkvi" name="xgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45462,7 +46204,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xrowgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xrowgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45472,7 +46214,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xcellgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcellgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45482,7 +46224,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="currentxtablerow"/> - <cd:command file="tabl-xtb.mkvi" name="currentxtablecolumn"/> + <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:interface> </cd:interface> diff --git a/tex/context/interface/mkiv/i-accent.xml b/tex/context/interface/mkiv/i-accent.xml index b947dfc12..190e1faa9 100644 --- a/tex/context/interface/mkiv/i-accent.xml +++ b/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" file="enco-ini.mkiv"> + <cd:command name="defineaccent" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-character"/> @@ -12,138 +12,150 @@ </cd:arguments> </cd:command> - <cd:command name="definecharacter" file="enco-ini.mkiv"> + <cd:command name="definecharacter" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-number"/> </cd:arguments> </cd:command> - <cd:command name="definecommand" file="enco-ini.mkiv"> + <cd:command name="definecommand" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-command"/> </cd:arguments> </cd:command> - <cd:command name="definemathaccent" file="enco-ini.mkiv"> + <cd:command name="definemathaccent" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="buildmathaccent" file="enco-ini.mkiv"> + <cd:command name="buildmathaccent" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextaccent" file="enco-ini.mkiv"> + <cd:command name="buildtextaccent" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextmacron" file="enco-ini.mkiv"> + <cd:command name="buildtextmacron" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextbottomdot" file="enco-ini.mkiv"> + <cd:command name="buildtextbottomdot" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextcedilla" file="enco-ini.mkiv"> + <cd:command name="buildtextcedilla" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextognek" file="enco-ini.mkiv"> + <cd:command name="buildtextognek" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextbottomcomma" file="enco-ini.mkiv"> + <cd:command name="buildtextbottomcomma" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="d" file="enco-ini.mkiv"> + <cd:command name="d" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextgrave" file="enco-ini.mkiv"> + <cd:command name="buildtextgrave" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="acute" file="enco-ini.mkiv"> + <cd:command name="acute" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="grave" file="enco-ini.mkiv"> + <cd:command name="grave" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="ddot" file="enco-ini.mkiv"> + <cd:command name="ddot" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="tilde" file="enco-ini.mkiv"> + <cd:command name="tilde" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="bar" file="enco-ini.mkiv"> + <cd:command name="bar" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="breve" file="enco-ini.mkiv"> + <cd:command name="breve" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="check" file="enco-ini.mkiv"> + <cd:command name="check" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="hat" file="enco-ini.mkiv"> + <cd:command name="hat" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="vec" file="enco-ini.mkiv"> + <cd:command name="vec" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="dot" file="enco-ini.mkiv"> + <cd:command name="dot" category="mathematics" level="document" 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:arguments> + <cd:resolve name="argument-character"/> + </cd:arguments> + </cd:command> + + <cd:command name="dddot" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> @@ -249,4 +261,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-align.xml b/tex/context/interface/mkiv/i-align.xml index d8b75a463..669b845b9 100644 --- a/tex/context/interface/mkiv/i-align.xml +++ b/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" file="spac-ali.mkiv"> + <cd:command name="setupalign" category="alignment" level="style" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="broad"/> @@ -53,9 +53,13 @@ <cd:constant type="stretch"/> <cd:constant type="extremestretch"/> <cd:constant type="final"/> + <cd:constant type="1*final"/> <cd:constant type="2*final"/> <cd:constant type="3*final"/> <cd:constant type="4*final"/> + <cd:constant type="more"/> + <cd:constant type="1*more"/> + <cd:constant type="2*more"/> <!-- <cd:constant type="cd:name"/> --> @@ -63,13 +67,13 @@ </cd:arguments> </cd:command> - <cd:command name="usealignparameter" file="spac-ali.mkiv"> + <cd:command name="usealignparameter" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="alignment" type="environment" file="spac-ali.mkiv"> + <cd:command name="alignment" type="environment" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupalign"/> @@ -77,7 +81,7 @@ </cd:arguments> </cd:command> - <cd:command name="linealignment" type="environment" file="spac-ali.mkiv"> + <cd:command name="linealignment" type="environment" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="left"/> @@ -88,55 +92,55 @@ </cd:arguments> </cd:command> - <cd:command name="leftaligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="leftaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="middlealigned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="middlealigned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="rightaligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="rightaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="maxaligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="maxaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="midaligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="midaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="centeraligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="centeraligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="leftaligned" file="spac-ali.mkiv"> + <cd:command name="leftaligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightaligned" file="spac-ali.mkiv"> + <cd:command name="rightaligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="middlealigned" file="spac-ali.mkiv"> + <cd:command name="middlealigned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="maxaligned" file="spac-ali.mkiv"> + <cd:command name="maxaligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="midaligned" file="spac-ali.mkiv"> + <cd:command name="midaligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centeraligned" file="spac-ali.mkiv"> + <cd:command name="centeraligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="alignedline" file="spac-ali.mkiv"> + <cd:command name="alignedline" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-alignline"/> <cd:resolve name="argument-alignline"/> @@ -144,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="wordright" file="spac-ali.mkiv"> + <cd:command name="wordright" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="right"/> @@ -154,7 +158,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedbox" file="spac-ali.mkiv"> + <cd:command name="simplealignedbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -162,7 +166,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedspreadbox" file="spac-ali.mkiv"> + <cd:command name="simplealignedspreadbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -170,7 +174,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedboxplus" file="spac-ali.mkiv"> + <cd:command name="simplealignedboxplus" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -179,7 +183,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplereversealignedbox" file="spac-ali.mkiv"> + <cd:command name="simplereversealignedbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -187,7 +191,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplereversealignedboxplus" file="spac-ali.mkiv"> + <cd:command name="simplereversealignedboxplus" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -196,7 +200,7 @@ </cd:arguments> </cd:command> - <cd:command name="alignedbox" file="pack-box.mkiv"> + <cd:command name="alignedbox" level="system" category="alignment" file="pack-box.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-aligned"/> @@ -206,7 +210,7 @@ </cd:arguments> </cd:command> - <cd:command name="aligned" file="pack-box.mkiv"> + <cd:command name="aligned" level="system" category="alignment" file="pack-box.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-aligned"/> @@ -215,62 +219,102 @@ </cd:arguments> </cd:command> - <cd:command name="lefttoright" file="spac-ali.mkiv"/> + <cd:command name="lefttoright" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="righttoleft" file="spac-ali.mkiv"/> + <cd:command name="righttoleft" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedbottom" file="spac-ali.mkiv"/> + <cd:command name="raggedbottom" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="alignbottom" file="spac-ali.mkiv"/> + <cd:command name="alignbottom" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="baselinebottom" file="spac-ali.mkiv"/> + <cd:command name="baselinebottom" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="notragged" file="spac-ali.mkiv"/> + <cd:command name="notragged" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedleft" file="spac-ali.mkiv"/> + <cd:command name="raggedleft" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedcenter" file="spac-ali.mkiv"/> + <cd:command name="raggedcenter" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedright" file="spac-ali.mkiv"/> + <cd:command name="raggedright" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="veryraggedleft" file="spac-ali.mkiv"/> + <cd:command name="veryraggedleft" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="veryraggedcenter" file="spac-ali.mkiv"/> + <cd:command name="veryraggedcenter" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="veryraggedright" file="spac-ali.mkiv"/> + <cd:command name="veryraggedright" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedwidecenter" file="spac-ali.mkiv"/> + <cd:command name="raggedwidecenter" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="centeredlastline" file="spac-ali.mkiv"/> + <cd:command name="centeredlastline" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="flushedrightlastline" file="spac-ali.mkiv"/> + <cd:command name="flushedrightlastline" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="ttraggedright" file="spac-ali.mkiv"/> + <cd:command name="ttraggedright" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="forgetragged" file="spac-ali.mkiv"/> + <cd:command name="forgetragged" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="line" file="spac-ali.mkiv"> + <cd:command name="line" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftline" file="spac-ali.mkiv"> + <cd:command name="leftline" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightline" file="spac-ali.mkiv"> + <cd:command name="rightline" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centerline" file="spac-ali.mkiv"> + <cd:command name="centerline" category="alignment" level="document" 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:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="left" default="yes"/> + <cd:constant type="right"/> + </cd:parameter> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="hanging" type="environment" variant="argument" category="alignment" level="document" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="left" default="yes"/> + <cd:constant type="right"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="fixed" type="environment" category="alignment" level="document" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="low"/> + <cd:constant type="middle"/> + <cd:constant type="high"/> + <cd:constant type="lohi"/> + <cd:constant type="default" default="yes"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-anchor.xml b/tex/context/interface/mkiv/i-anchor.xml index 342976a3d..c8dad56d5 100644 --- a/tex/context/interface/mkiv/i-anchor.xml +++ b/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" file="pack-box.mkiv"> + <cd:command name="defineanchor" level="style" 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" file="pack-box.mkiv"> + <cd:command name="anchor" level="document" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-attachment.xml b/tex/context/interface/mkiv/i-attachment.xml index 82056a0ad..85cf8843b 100644 --- a/tex/context/interface/mkiv/i-attachment.xml +++ b/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" file="scrn-wid.mkvi"> + <cd:command name="defineattachment" level="style" 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" file="scrn-wid.mkvi"> + <cd:command name="setupattachment" level="style" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -85,20 +85,16 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupattachments" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupattachment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupattachments" level="style" file="scrn-wid.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupattachment"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="registerattachment" file="scrn-wid.mkvi"> + <cd:command name="registerattachment" level="document" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -107,9 +103,9 @@ </cd:arguments> </cd:command> - <cd:command name="attachment" generated="yes" variant="example" file="scrn-wid.mkvi"> + <cd:command name="attachment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> <cd:sequence> - <cd:variable value="attachment"/> + <cd:instance value="attachment"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-name-optional"/> @@ -118,13 +114,13 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="attachment"/> + <cd:resolve name="instance-attachment"/> </cd:instances> </cd:command> - <cd:command name="attachment" type="environment" generated="yes" variant="example" file="scrn-wid.mkvi"> + <cd:command name="attachment" type="environment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> <cd:sequence> - <cd:variable value="attachment"/> + <cd:instance value="attachment"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-name-optional"/> @@ -133,28 +129,32 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="attachment"/> + <cd:resolve name="instance-attachment"/> </cd:instances> </cd:command> - <cd:command name="placeattachments" file="scrn-wid.mkvi"/> + <cd:command name="placeattachments" level="document" 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: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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-attribute.xml b/tex/context/interface/mkiv/i-attribute.xml index cd1e807d2..96a680e19 100644 --- a/tex/context/interface/mkiv/i-attribute.xml +++ b/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" file="attr-ini.mkiv"> + <cd:command name="pushattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="popattribute" file="attr-ini.mkiv"> + <cd:command name="popattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="installattributestack" file="attr-ini.mkiv"> + <cd:command name="installattributestack" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="defineattribute" file="attr-ini.mkiv"> + <cd:command name="defineattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="definesystemattribute" file="attr-ini.mkiv"> + <cd:command name="definesystemattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -46,51 +46,51 @@ </cd:arguments> </cd:command> - <cd:command name="newattribute" file="attr-ini.mkiv"> + <cd:command name="newattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dosetattribute" file="attr-ini.mkiv"> + <cd:command name="dosetattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="doresetattribute" file="attr-ini.mkiv"> + <cd:command name="doresetattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dogetattribute" file="attr-ini.mkiv"> + <cd:command name="dogetattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dogetattributeid" file="attr-ini.mkiv"> + <cd:command name="dogetattributeid" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetallattributes" file="attr-ini.mkiv"/> + <cd:command name="resetallattributes" category="attribute" level="system" file="attr-ini.mkiv"/> - <cd:command name="savecurrentattributes" file="attr-ini.mkiv"> + <cd:command name="savecurrentattributes" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="restorecurrentattributes" file="attr-ini.mkiv"> + <cd:command name="restorecurrentattributes" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="showattributes" file="attr-ini.mkiv"/> + <cd:command name="showattributes" category="attribute" level="document" file="attr-ini.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-backend.xml b/tex/context/interface/mkiv/i-backend.xml index ff9a628cb..5db77b5bd 100644 --- a/tex/context/interface/mkiv/i-backend.xml +++ b/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" file="back-ini.mkiv"> + <cd:command name="setupbackend" level="style" catehory="pdf" file="back-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="export"> @@ -18,7 +18,31 @@ <cd:constant type="cd:file"/> </cd:parameter> <cd:parameter name="intent"> - <cd:constant type="cd:name"/> + <cd:constant type="Coated FOGRA39 (ISO 12647-2:2004)"/> + <cd:constant type="GRACoL2006_Coated1v2.icc"/> + <cd:constant type="ISO Coated v2 300% (ECI)"/> + <cd:constant type="ISO Coated v2 (ECI)"/> + <cd:constant type="ISOnewspaper26v4"/> + <cd:constant type="ISOnewspaper26v4_gr"/> + <cd:constant type="ISO Uncoated"/> + <cd:constant type="ISO Uncoated Yellowish"/> + <cd:constant type="ISO Web Coated"/> + <cd:constant type="Japan Color 2001 Coated"/> + <cd:constant type="Japan Color 2002 Newspaper"/> + <cd:constant type="Japan Web Coated (Ad)"/> + <cd:constant type="SNAP 2007"/> + <cd:constant type="SWOP2006_Coated3v2.icc"/> + <cd:constant type="SWOP2006_Coated5v2.icc"/> + <cd:constant type="Uncoated FOGRA29 (ISO 12647-2:2004)"/> + <cd:constant type="Web Coated FOGRA28 (ISO 12647-2:2004)"/> + <cd:constant type="PSR_LWC_PLUS_V2_PT"/> + <cd:constant type="PSR_LWC_STD_V2_PT"/> + <cd:constant type="PSR_SC_PLUS_V2_PT"/> + <cd:constant type="PSR_SC_STD_V2_PT"/> + <cd:constant type="PSRgravureMF"/> + <!-- + <cd:constant type="cd:name"/> + --> </cd:parameter> <cd:parameter name="space"> <cd:constant type="yes"/> @@ -30,7 +54,23 @@ <cd:parameter name="format"> <cd:constant type="version"/> <cd:constant type="default"/> - <cd:constant type="cd:name"/> + <cd:constant type="PDF/X-1a:2001"/> + <cd:constant type="PDF/X-1a:2003"/> + <cd:constant type="PDF/X-3:2002"/> + <cd:constant type="PDF/X-3:2003"/> + <cd:constant type="PDF/X-4"/> + <cd:constant type="PDF/X-4p"/> + <cd:constant type="PDF/X-5g"/> + <cd:constant type="PDF/X-5pg"/> + <cd:constant type="PDF/X-5n"/> + <cd:constant type="PDF/A-1a:2005"/> + <cd:constant type="PDF/A-1b:2005"/> + <cd:constant type="PDF/A-2a"/> + <cd:constant type="PDF/A-3a"/> + <cd:constant type="PDF/UA-1"/> + <!-- + <cd:constant type="cd:name"/> + --> </cd:parameter> <cd:parameter name="level"> <cd:constant type="cd:number"/> diff --git a/tex/context/interface/mkiv/i-background.xml b/tex/context/interface/mkiv/i-background.xml index f51a0247c..6bdddbb1b 100644 --- a/tex/context/interface/mkiv/i-background.xml +++ b/tex/context/interface/mkiv/i-background.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definebackground" file="pack-bck.mkvi"> + <cd:command name="definebackground" level="style" category="background" file="pack-bck.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="setupbackground" file="pack-bck.mkvi"> + <cd:command name="setupbackground" level="style" category="background" file="pack-bck.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="background" type="environment" generated="yes" variant="example" file="pack-bck.mkvi"> + <cd:command name="background" type="environment" generated="yes" variant="example" level="document" category="background" file="pack-bck.mkvi"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -59,7 +59,7 @@ </cd:instances> </cd:command> - <cd:command name="background" type="environment" file="pack-bck.mkvi"> + <cd:command name="background" type="environment" level="document" category="background" file="pack-bck.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbackground"/> @@ -67,7 +67,7 @@ </cd:arguments> </cd:command> - <cd:command name="background" generated="yes" variant="example" file="pack-bck.mkvi"> + <cd:command name="background" generated="yes" variant="example" level="document" category="background" file="pack-bck.mkvi"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -79,20 +79,20 @@ </cd:instances> </cd:command> - <cd:command name="background" file="pack-bck.mkvi"> + <cd:command name="background" level="document" category="background" file="pack-bck.mkvi"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="backgroundline" file="pack-bck.mkvi"> + <cd:command name="backgroundline" level="document" category="background colors" file="pack-bck.mkvi"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setupbackgrounds" file="page-bck.mkiv"> + <cd:command name="setupbackgrounds" level="style" category="background" file="page-bck.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="top"/> @@ -114,7 +114,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbackgrounds" variant="page" file="page-bck.mkiv"> + <cd:command name="setupbackgrounds" variant="page" level="style" category="background" file="page-bck.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="paper"/> @@ -134,13 +134,13 @@ </cd:arguments> </cd:command> - <cd:command name="background" type="environment" begin="push" end="pop" file="page-bck.mkiv"> + <cd:command name="background" type="environment" begin="push" end="pop" level="system" category="background" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesomebackground" file="page-bck.mkiv"> + <cd:command name="doifelsesomebackground" level="system" category="background 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" file="page-bck.mkiv"> + <cd:command name="doifsomebackgroundelse" level="system" category="background 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" file="page-bck.mkiv"> + <cd:command name="doifsomebackground" level="system" category="background conditional" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-bar.xml b/tex/context/interface/mkiv/i-bar.xml index 951448249..fb120d05b 100644 --- a/tex/context/interface/mkiv/i-bar.xml +++ b/tex/context/interface/mkiv/i-bar.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definebar" file="node-rul.mkiv"> + <cd:command name="definebar" level="style" category="rules" 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="setupbar" file="node-rul.mkiv"> + <cd:command name="setupbar" level="style" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -82,166 +82,151 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupbars" file="node-rul.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupbar"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupbars" level="style" category="rules" file="node-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupbar"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="bar" generated="yes" variant="example" file="node-rul.mkiv"> + <cd:command name="bar" generated="yes" variant="instance" level="document" category="rules" file="node-rul.mkiv"> <cd:sequence> - <cd:variable value="bar"/> + <cd:instance value="bar"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="overbar"/> - <cd:constant value="underbar"/> - <cd:constant value="overstrike"/> - <cd:constant value="understrike"/> - <cd:constant value="overbars"/> - <cd:constant value="underbars"/> - <cd:constant value="overstrikes"/> - <cd:constant value="understrikes"/> - <cd:constant value="underrandom"/> - <cd:constant value="underrandoms"/> - <cd:constant value="underdash"/> - <cd:constant value="underdashes"/> - <cd:constant value="underdot"/> - <cd:constant value="underdots"/> - <cd:constant value="nobar"/> - <cd:constant value="hiddenbar"/> + <cd:resolve name="instance-bar"/> </cd:instances> </cd:command> - <cd:command name="bar" type="environment" file="node-rul.mkiv"> + <cd:command name="bar" type="environment" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setbar" file="node-rul.mkiv"> + <cd:command name="setbar" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="directsetbar" file="node-rul.mkiv"> + <cd:command name="directsetbar" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="bar" type="environment" begin="push" end="pop" file="node-rul.mkiv"> + <cd:command name="bar" type="environment" begin="push" end="pop" level="system" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="overbar" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="underbar" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </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="hiddenbar" 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="overstrike" 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="understrike" 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="overbars" 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="underbars" 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="overstrikes" 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="understrikes" 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="underrandom" 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="underrandoms" 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="underdash" 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="underdashes" 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="underdot" 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="underdots" 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="nobar" 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" file="node-rul.mkiv"/> + <cd:command name="resetbar" level="style" category="rules" file="node-rul.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-blackrule.xml b/tex/context/interface/mkiv/i-blackrule.xml index edb6873f0..0463f21ed 100644 --- a/tex/context/interface/mkiv/i-blackrule.xml +++ b/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" file="pack-mrl.mkiv"> + <cd:command name="setupblackrules" level="style" category="rules 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" file="pack-mrl.mkiv"> + <cd:command name="blackrule" level="document" category="rules 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" file="pack-mrl.mkiv"> + <cd:command name="blackrules" level="document" category="rules colors" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> @@ -63,19 +63,19 @@ </cd:arguments> </cd:command> - <cd:command name="vl" file="pack-mrl.mkiv"> + <cd:command name="vl" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="hl" file="pack-mrl.mkiv"> + <cd:command name="hl" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="somekindoftab" file="tabl-mis.mkiv"> + <cd:command name="somekindoftab" level="style" category="rules" file="tabl-mis.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="alternative"> @@ -98,4 +98,21 @@ </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="frule" level="style" category="rules" file="grph-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="radius␣" method="none"/> + <cd:constant type="cd:dimension" prefix="line␣" method="none"/> + <!-- the type option accepts 'mp' or 'fill' as arguments --> + <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:keywords> + <cd:delimiter name="relax"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-bleed.xml b/tex/context/interface/mkiv/i-bleed.xml index 301f7d066..ee860b85f 100644 --- a/tex/context/interface/mkiv/i-bleed.xml +++ b/tex/context/interface/mkiv/i-bleed.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupbleeding" file="pack-box.mkiv"> + <cd:command name="setupbleeding" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="bleed" file="pack-box.mkiv"> + <cd:command name="bleed" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbleeding"/> @@ -57,8 +57,8 @@ </cd:arguments> </cd:command> - <cd:command name="bleedwidth" file="pack-box.mkiv"/> + <cd:command name="bleedwidth" level="style" category="graphics" file="pack-box.mkiv"/> - <cd:command name="bleedheight" file="pack-box.mkiv"/> + <cd:command name="bleedheight" level="style" category="graphics" file="pack-box.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-block.xml b/tex/context/interface/mkiv/i-block.xml index 837b2133d..fa5262506 100644 --- a/tex/context/interface/mkiv/i-block.xml +++ b/tex/context/interface/mkiv/i-block.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineblock" file="strc-blk.mkiv"> + <cd:command name="defineblock" level="style" category="structure" file="strc-blk.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="setupblock" file="strc-blk.mkiv"> + <cd:command name="setupblock" level="style" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="block" type="environment" generated="yes" variant="example" begin="begin" end="end" file="strc-blk.mkiv"> + <cd:command name="block" type="environment" generated="yes" variant="example" begin="begin" end="end" level="document" category="structure" file="strc-blk.mkiv"> <cd:sequence> <cd:variable value="block"/> </cd:sequence> @@ -45,37 +45,29 @@ <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="hideblocks" file="strc-blk.mkiv"> + <cd:command name="hideblocks" level="style" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="keepblocks" file="strc-blk.mkiv"> + <cd:command name="keepblocks" level="style" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="useblocks" file="strc-blk.mkiv"> + <cd:command name="useblocks" level="document" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> <cd:constant type="text" default="yes"/> @@ -85,13 +77,10 @@ </cd:arguments> </cd:command> - <cd:command name="processblocks" file="strc-blk.mkiv"> + <cd:command name="processblocks" level="document" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> <cd:constant type="text" default="yes"/> @@ -101,13 +90,10 @@ </cd:arguments> </cd:command> - <cd:command name="selectblocks" file="strc-blk.mkiv"> + <cd:command name="selectblocks" level="document" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> <cd:constant type="text" default="yes"/> @@ -117,4 +103,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-bookmark.xml b/tex/context/interface/mkiv/i-bookmark.xml index 68d893609..3dbfa3406 100644 --- a/tex/context/interface/mkiv/i-bookmark.xml +++ b/tex/context/interface/mkiv/i-bookmark.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupbookmark" file="strc-bkm.mkiv"> + <cd:command name="setupbookmark" level="style" category="pdf" file="strc-bkm.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="force"> @@ -40,7 +40,7 @@ <!-- - <cd:command name="setupbookmarks" file="strc-bkm.mkiv"> + <cd:command name="setupbookmarks" level="style" category="pdf" file="strc-bkm.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbookmark"/> @@ -50,7 +50,7 @@ --> - <cd:command name="bookmark" file="strc-bkm.mkiv"> + <cd:command name="bookmark" level="document" category="pdf" file="strc-bkm.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:section"/> @@ -60,7 +60,7 @@ </cd:arguments> </cd:command> - <cd:command name="placebookmarks" file="src-bkm.mkiv"> + <cd:command name="placebookmarks" level="style" category="pdf" file="src-bkm.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -76,4 +76,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml index 648106b89..dd5c30529 100644 --- a/tex/context/interface/mkiv/i-boxes.xml +++ b/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" file="supp-box.mkiv"> + <cd:command name="doiftext" level="system" category="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" file="supp-box.mkiv"> + <cd:command name="doifelsetext" level="system" category="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" file="supp-box.mkiv"> + <cd:command name="doiftextelse" level="system" category="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" file="supp-box.mkiv"> + <cd:command name="dowithnextbox" level="system" 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" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcs" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -44,21 +44,21 @@ </cd:arguments> </cd:command> - <cd:command name="nextboxwd" file="supp-box.mkiv"/> + <cd:command name="nextboxwd" level="system" file="supp-box.mkiv"/> - <cd:command name="nextboxht" file="supp-box.mkiv"/> + <cd:command name="nextboxht" level="system" file="supp-box.mkiv"/> - <cd:command name="nextboxdp" file="supp-box.mkiv"/> + <cd:command name="nextboxdp" level="system" file="supp-box.mkiv"/> - <cd:command name="nextboxhtdp" file="supp-box.mkiv"/> + <cd:command name="nextboxhtdp" level="system" file="supp-box.mkiv"/> - <cd:command name="flushnextbox" file="supp-box.mkiv"/> + <cd:command name="flushnextbox" level="system" file="supp-box.mkiv"/> - <cd:command name="nextbox" file="supp-box.mkiv"/> + <cd:command name="nextbox" level="system" file="supp-box.mkiv"/> - <cd:command name="nextdepth" file="supp-box.mkiv"/> + <cd:command name="nextdepth" level="system" file="supp-box.mkiv"/> - <cd:command name="dowithnextboxcontent" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcontent" level="system" 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" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcontentcs" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -76,55 +76,55 @@ </cd:arguments> </cd:command> - <cd:command name="rlap" file="supp-box.mkiv"> + <cd:command name="rlap" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="llap" file="supp-box.mkiv"> + <cd:command name="llap" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="clap" file="supp-box.mkiv"> + <cd:command name="clap" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="tlap" file="supp-box.mkiv"> + <cd:command name="tlap" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="blap" file="supp-box.mkiv"> + <cd:command name="blap" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="reshapebox" file="supp-box.mkiv"> + <cd:command name="reshapebox" level="system" 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" file="supp-box.mkiv"/> + <cd:command name="shapebox" type="environment" begin="beginof" end="endof" level="system" file="supp-box.mkiv"/> - <cd:command name="flushshapebox" file="supp-box.mkiv"/> + <cd:command name="flushshapebox" level="system" file="supp-box.mkiv"/> - <cd:command name="innerflushshapebox" file="supp-box.mkiv"/> + <cd:command name="innerflushshapebox" level="system" file="supp-box.mkiv"/> - <cd:command name="shapedhbox" file="supp-box.mkiv"> + <cd:command name="shapedhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="processtokens" file="supp-box.mkiv"> + <cd:command name="processtokens" level="system" 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" file="supp-box.mkiv"> + <cd:command name="doboundtext" level="system" 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" file="supp-box.mkiv"> + <cd:command name="limitatetext" level="system" 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" file="supp-box.mkiv"> + <cd:command name="limitatetext" variant="list" level="system" 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="limtatefirstline" file="supp-box.mkiv"> + <cd:command name="limitatefirstline" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -170,122 +170,122 @@ </cd:arguments> </cd:command> - <cd:command name="processisolatedchars" file="supp-box.mkiv"> + <cd:command name="processisolatedchars" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processisolatedwords" file="supp-box.mkiv"> + <cd:command name="processisolatedwords" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="applytocharacters" file="supp-box.mkiv"> + <cd:command name="applytocharacters" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytowords" file="supp-box.mkiv"> + <cd:command name="applytowords" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringchar" file="supp-box.mkiv"> + <cd:command name="applytosplitstringchar" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringword" file="supp-box.mkiv"> + <cd:command name="applytosplitstringword" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringline" file="supp-box.mkiv"> + <cd:command name="applytosplitstringline" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringcharspaced" file="supp-box.mkiv"> + <cd:command name="applytosplitstringcharspaced" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringwordspaced" file="supp-box.mkiv"> + <cd:command name="applytosplitstringwordspaced" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringlinespaced" file="supp-box.mkiv"> + <cd:command name="applytosplitstringlinespaced" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="sbox" file="supp-box.mkiv"> + <cd:command name="sbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="inlinedbox" file="supp-box.mkiv"> + <cd:command name="inlinedbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="struttedbox" file="supp-box.mkiv"> + <cd:command name="struttedbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="topskippedbox" file="supp-box.mkiv"> + <cd:command name="topskippedbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centeredbox" file="supp-box.mkiv"> + <cd:command name="centeredbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centerednextbox" file="supp-box.mkiv"> + <cd:command name="centerednextbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centerbox" file="supp-box.mkiv"> + <cd:command name="centerbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setrigidcolumnhsize" file="supp-box.mkiv"> + <cd:command name="setrigidcolumnhsize" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -293,21 +293,21 @@ </cd:arguments> </cd:command> - <cd:command name="setrigidcolumnbalance" file="supp-box.mkiv"> + <cd:command name="setrigidcolumnbalance" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vboxtohbox" type="environment" file="supp-box.mkiv"/> + <cd:command name="vboxtohbox" type="environment" level="system" file="supp-box.mkiv"/> - <cd:command name="vboxtohboxseparator" type="environment" file="supp-box.mkiv"/> + <cd:command name="vboxtohboxseparator" type="environment" level="system" file="supp-box.mkiv"/> - <cd:command name="convertvboxtohbox" file="supp-box.mkiv"/> + <cd:command name="convertvboxtohbox" level="system" file="supp-box.mkiv"/> - <cd:command name="hboxestohbox" type="environment" file="supp-box.mkiv"/> + <cd:command name="hboxestohbox" type="environment" level="system" file="supp-box.mkiv"/> - <cd:command name="unhhbox" file="supp-box.mkiv"> + <cd:command name="unhhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:delimiter name="with"/> @@ -317,17 +317,17 @@ <!-- - <cd:command name="hhbox" file="supp-box.mkiv"/> + <cd:command name="hhbox" level="system" file="supp-box.mkiv"/> --> - <cd:command name="hboxofvbox" file="supp-box.mkiv"> + <cd:command name="hboxofvbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="doifcontent" file="supp-box.mkiv"> + <cd:command name="doifcontent" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -337,105 +337,105 @@ </cd:arguments> </cd:command> - <cd:command name="overlay" type="environment" file="supp-box.mkiv"/> + <cd:command name="overlay" type="environment" level="system" file="supp-box.mkiv"/> - <cd:command name="fakebox" file="supp-box.mkiv"> + <cd:command name="fakebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="lbox" file="supp-box.mkiv"> + <cd:command name="lbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="cbox" file="supp-box.mkiv"> + <cd:command name="cbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rbox" file="supp-box.mkiv"> + <cd:command name="rbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ltop" file="supp-box.mkiv"> + <cd:command name="ltop" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ctop" file="supp-box.mkiv"> + <cd:command name="ctop" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rtop" file="supp-box.mkiv"> + <cd:command name="rtop" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="tbox" file="supp-box.mkiv"> + <cd:command name="tbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bbox" file="supp-box.mkiv"> + <cd:command name="bbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lhbox" file="supp-box.mkiv"> + <cd:command name="lhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mhbox" file="supp-box.mkiv"> + <cd:command name="mhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rhbox" file="supp-box.mkiv"> + <cd:command name="rhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefthbox" file="supp-box.mkiv"> + <cd:command name="lefthbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="midhbox" file="supp-box.mkiv"> + <cd:command name="midhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righthbox" file="supp-box.mkiv"> + <cd:command name="righthbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="boxofsize" file="supp-box.mkiv"> + <cd:command name="boxofsize" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none" list="yes" optional="yes"> @@ -445,7 +445,7 @@ </cd:arguments> </cd:command> - <cd:command name="limitatelines" file="supp-box.mkiv"> + <cd:command name="limitatelines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-command"/> @@ -453,117 +453,117 @@ </cd:arguments> </cd:command> - <cd:command name="fittopbaselinegrid" file="supp-box.mkiv"> + <cd:command name="fittopbaselinegrid" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="boxcursor" file="supp-box.mkiv"/> + <cd:command name="boxcursor" level="system" file="supp-box.mkiv"/> - <cd:command name="placedbox" file="supp-box.mkiv"> + <cd:command name="placedbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightbox" file="supp-box.mkiv"> + <cd:command name="rightbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftbox" file="supp-box.mkiv"> + <cd:command name="leftbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="topbox" file="supp-box.mkiv"> + <cd:command name="topbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bottombox" file="supp-box.mkiv"> + <cd:command name="bottombox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttopbox" file="supp-box.mkiv"> + <cd:command name="lefttopbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righttopbox" file="supp-box.mkiv"> + <cd:command name="righttopbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftbottombox" file="supp-box.mkiv"> + <cd:command name="leftbottombox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightbottombox" file="supp-box.mkiv"> + <cd:command name="rightbottombox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="topleftbox" file="supp-box.mkiv"> + <cd:command name="topleftbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="toprightbox" file="supp-box.mkiv"> + <cd:command name="toprightbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bottomleftbox" file="supp-box.mkiv"> + <cd:command name="bottomleftbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bottomrightbox" file="supp-box.mkiv"> + <cd:command name="bottomrightbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="middlebox" file="supp-box.mkiv"> + <cd:command name="middlebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="baselinemiddlebox" file="supp-box.mkiv"> + <cd:command name="baselinemiddlebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="baselineleftbox" file="supp-box.mkiv"> + <cd:command name="baselineleftbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="baselinerightbox" file="supp-box.mkiv"> + <cd:command name="baselinerightbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lrtbbox" file="supp-box.mkiv"> + <cd:command name="lrtbbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -573,13 +573,13 @@ </cd:arguments> </cd:command> - <cd:command name="toplinebox" file="supp-box.mkiv"> + <cd:command name="toplinebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setstackbox" file="supp-box.mkiv"> + <cd:command name="setstackbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -587,13 +587,13 @@ </cd:arguments> </cd:command> - <cd:command name="initializeboxstack" file="supp-box.mkiv"> + <cd:command name="initializeboxstack" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="savebox" file="supp-box.mkiv"> + <cd:command name="savebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -601,21 +601,28 @@ </cd:arguments> </cd:command> - <cd:command name="restorebox" file="supp-box.mkiv"> + <cd:command name="flushbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="foundbox" file="supp-box.mkiv"> + <cd:command name="restorebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsebox" file="supp-box.mkiv"> + <cd:command name="foundbox" level="system" 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:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -624,7 +631,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifboxelse" file="supp-box.mkiv"> + <cd:command name="doifboxelse" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -633,51 +640,51 @@ </cd:arguments> </cd:command> - <cd:command name="localpushbox" file="supp-box.mkiv"> + <cd:command name="localpushbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="localpopbox" file="supp-box.mkiv"> + <cd:command name="localpopbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="globalpushbox" file="supp-box.mkiv"> + <cd:command name="globalpushbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="globalpopbox" file="supp-box.mkiv"> + <cd:command name="globalpopbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="removedepth" file="supp-box.mkiv"/> + <cd:command name="removedepth" level="system" file="supp-box.mkiv"/> - <cd:command name="obeydepth" file="supp-box.mkiv"/> + <cd:command name="obeydepth" level="system" file="supp-box.mkiv"/> - <cd:command name="undepthed" file="supp-box.mkiv"> + <cd:command name="undepthed" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="removebottomthings" file="supp-box.mkiv"/> + <cd:command name="removebottomthings" level="system" file="supp-box.mkiv"/> - <cd:command name="removelastskip" file="supp-box.mkiv"/> + <cd:command name="removelastskip" level="system" file="supp-box.mkiv"/> - <cd:command name="makestrutofbox" file="supp-box.mkiv"> + <cd:command name="makestrutofbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="raisebox" file="supp-box.mkiv"> + <cd:command name="raisebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> @@ -685,7 +692,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowerbox" file="supp-box.mkiv"> + <cd:command name="lowerbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> @@ -693,164 +700,164 @@ </cd:arguments> </cd:command> - <cd:command name="halfwaybox" file="supp-box.mkiv"> + <cd:command name="halfwaybox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="depthonlybox" file="supp-box.mkiv"> + <cd:command name="depthonlybox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalhbox" file="supp-box.mkiv"> + <cd:command name="naturalhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvbox" file="supp-box.mkiv"> + <cd:command name="naturalvbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvtop" file="supp-box.mkiv"> + <cd:command name="naturalvtop" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvcenter" file="supp-box.mkiv"> + <cd:command name="naturalvcenter" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalhpack" file="supp-box.mkiv"> + <cd:command name="naturalhpack" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvpack" file="supp-box.mkiv"> + <cd:command name="naturalvpack" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="frozenhbox" file="supp-box.mkiv"> + <cd:command name="frozenhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setboxllx" file="supp-box.mkiv"> + <cd:command name="setboxllx" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setboxlly" file="supp-box.mkiv"> + <cd:command name="setboxlly" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="gsetboxllx" file="supp-box.mkiv"> + <cd:command name="gsetboxllx" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="gsetboxlly" file="supp-box.mkiv"> + <cd:command name="gsetboxlly" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getboxllx" file="supp-box.mkiv"> + <cd:command name="getboxllx" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="getboxlly" file="supp-box.mkiv"> + <cd:command name="getboxlly" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="directgetboxllx" file="supp-box.mkiv"> + <cd:command name="directgetboxllx" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="directgetboxlly" file="supp-box.mkiv"> + <cd:command name="directgetboxlly" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="shownextbox" file="supp-box.mkiv"> + <cd:command name="shownextbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="spreadhbox" file="supp-box.mkiv"> + <cd:command name="spreadhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="minimalhbox" file="supp-box.mkiv"> + <cd:command name="minimalhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="nodetostring" file="supp-box.mkiv"> + <cd:command name="nodetostring" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getnaturaldimensions" file="supp-box.mkiv"> + <cd:command name="getnaturaldimensions" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="lastnaturalboxwd" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxwd" level="system" file="supp-box.mkiv"/> - <cd:command name="lastnaturalboxht" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxht" level="system" file="supp-box.mkiv"/> - <cd:command name="lastnaturalboxdp" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxdp" level="system" file="supp-box.mkiv"/> - <cd:command name="naturalwd" file="supp-box.mkiv"> + <cd:command name="naturalwd" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="doifelserighttoleftinbox" file="supp-box.mkiv"> + <cd:command name="doifelserighttoleftinbox" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-true"/> @@ -858,7 +865,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifrighttoleftinboxelse" file="supp-box.mkiv"> + <cd:command name="doifrighttoleftinboxelse" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-true"/> @@ -866,167 +873,167 @@ </cd:arguments> </cd:command> - <cd:command name="runninghbox" file="supp-box.mkiv"> + <cd:command name="runninghbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vbox" type="environment" begin="begin" end="end" file="supp-box.mkiv"/> + <cd:command name="vbox" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> - <cd:command name="hbox" type="environment" begin="begin" end="end" file="supp-box.mkiv"/> + <cd:command name="hbox" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> - <cd:command name="vtop" type="environment" begin="begin" end="end" file="supp-box.mkiv"/> + <cd:command name="vtop" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> - <cd:command name="setvboxregister" file="supp-box.mkiv"> + <cd:command name="setvboxregister" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="sethboxregister" file="supp-box.mkiv"> + <cd:command name="sethboxregister" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setvtopregister" file="supp-box.mkiv"> + <cd:command name="setvtopregister" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="flushboxregister" file="supp-box.mkiv"> + <cd:command name="flushboxregister" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vboxregister" type="environment" file="supp-box.mkiv"> + <cd:command name="vboxregister" type="environment" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hboxregister" type="environment" file="supp-box.mkiv"> + <cd:command name="hboxregister" type="environment" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vtopregister" type="environment" file="supp-box.mkiv"> + <cd:command name="vtopregister" type="environment" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="righttolefthbox" file="spac-ali.mkiv"> + <cd:command name="righttolefthbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorighthbox" file="spac-ali.mkiv"> + <cd:command name="lefttorighthbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righttoleftvbox" file="spac-ali.mkiv"> + <cd:command name="righttoleftvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorightvbox" file="spac-ali.mkiv"> + <cd:command name="lefttorightvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righttoleftvtop" file="spac-ali.mkiv"> + <cd:command name="righttoleftvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorightvtop" file="spac-ali.mkiv"> + <cd:command name="lefttorightvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirhbox" file="spac-ali.mkiv"> + <cd:command name="autodirhbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirvbox" file="spac-ali.mkiv"> + <cd:command name="autodirvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirvtop" file="spac-ali.mkiv"> + <cd:command name="autodirvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrighthbox" file="spac-ali.mkiv"> + <cd:command name="leftorrighthbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrightvbox" file="spac-ali.mkiv"> + <cd:command name="leftorrightvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrightvtop" file="spac-ali.mkiv"> + <cd:command name="leftorrightvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ibox" file="spac-ali.mkiv"> + <cd:command name="ibox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="obox" file="spac-ali.mkiv"> + <cd:command name="obox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definehbox" file="spac-ali.mkiv"> + <cd:command name="definehbox" level="system" 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" file="spac-ali.mkiv"> + <cd:command name="hbox" generated="yes" variant="example" level="system" file="spac-ali.mkiv"> <cd:sequence> <cd:string value="hbox"/> <cd:variable value="box"/> @@ -1036,7 +1043,89 @@ </cd:arguments> </cd:command> - <cd:command name="lastlinewidth" file="supp-box.mkiv"> + <cd:command name="lastlinewidth" level="system" file="supp-box.mkiv"/> + + <cd:command name="putboxincache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:resolve name="string-box"/> + </cd:arguments> + </cd:command> + + <cd:command name="getboxfromcache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:resolve name="string-box"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifelseboxincache" level="system" category="conditional" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="copyboxfromcache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:resolve name="string-box"/> + </cd:arguments> + </cd:command> + + <cd:command name="directboxfromcache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="directcopyboxfromcache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="resetboxesincache" level="system" 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:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:csname/> + <cd:content/> + </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-buffer.xml b/tex/context/interface/mkiv/i-buffer.xml index 38571fcd4..2ec89f571 100644 --- a/tex/context/interface/mkiv/i-buffer.xml +++ b/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" file="buff-ini.mkiv"> + <cd:command name="doifelsebuffer" level="system" category="buffer 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" file="buff-ini.mkiv"> + <cd:command name="doifbufferelse" level="system" category="buffer conditional" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-true"/> @@ -20,19 +20,19 @@ </cd:arguments> </cd:command> - <cd:command name="resetbuffer" file="buff-ini.mkiv"> + <cd:command name="resetbuffer" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer"/> </cd:arguments> </cd:command> - <cd:command name="buffer" type="environment" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" level="document" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="grabbufferdata" file="buff-ini.mkiv"> + <cd:command name="grabbufferdata" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-category-optional"/> <cd:resolve name="keyword-name"/> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="grabbufferdatadirect" file="buff-ini.mkiv"> + <cd:command name="grabbufferdatadirect" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -49,13 +49,13 @@ </cd:arguments> </cd:command> - <cd:command name="buffer" type="environment" begin="set" end="end" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" begin="set" end="end" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupbuffer" file="buff-ini.mkiv"> + <cd:command name="setupbuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> <cd:assignments list="yes"> @@ -69,7 +69,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebuffer" file="buff-ini.mkiv"> + <cd:command name="definebuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-buffer-optional"/> @@ -79,43 +79,47 @@ </cd:arguments> </cd:command> - <cd:command name="getbuffer" file="buff-ini.mkiv"> + <cd:command name="getbuffer" level="document" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="getdefinedbuffer" file="buff-ini.mkiv"> + <cd:command name="getdefinedbuffer" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer"/> </cd:arguments> </cd:command> - <cd:command name="inlinebuffer" file="buff-ini.mkiv"> + <cd:command name="inlinebuffer" level="document" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="buffer" type="environment" generated="yes" variant="example" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" generated="yes" variant="instance" lcategory="buffer" evel="document" file="buff-ini.mkiv"> <cd:sequence> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> <cd:instances> - <cd:constant value="hiding"/> + <cd:resolve name="instance-buffer"/> </cd:instances> </cd:command> - <cd:command name="getbuffer" generated="yes" variant="example" file="buff-ini.mkiv"> + <cd:command name="getbuffer" generated="yes" variant="instance" level="document" category="buffer" file="buff-ini.mkiv"> <cd:sequence> <cd:string value="get"/> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> </cd:command> - <cd:command name="hiding" type="environment" file="buff-ini.mkiv"/> + <!-- - <cd:command name="processtexbuffer" file="buff-ini.mkiv"> + <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"/> </cd:sequence> @@ -124,14 +128,14 @@ </cd:arguments> </cd:command> - <cd:command name="savebuffer" variant="list" file="buff-ini.mkiv"> + <cd:command name="savebuffer" variant="list" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="savebuffer" file="buff-ini.mkiv"> + <cd:command name="savebuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="list"> @@ -148,25 +152,25 @@ </cd:arguments> </cd:command> - <cd:command name="ctxluabuffer" file="buff-ini.mkiv"> + <cd:command name="ctxluabuffer" level="style" category="buffer lua" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="mkvibuffer" file="buff-ini.mkiv"> + <cd:command name="mkvibuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="getbufferdata" file="buff-ini.mkiv"> + <cd:command name="getbufferdata" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="typebuffer" file="buff-ver.mkiv"> + <cd:command name="typebuffer" level="document" category="buffer verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> <cd:assignments list="yes" optional="yes"> @@ -175,10 +179,10 @@ </cd:arguments> </cd:command> - <cd:command name="typebuffer" generated="yes" variant="example" file="buff-ver.mkiv"> + <cd:command name="typebuffer" generated="yes" variant="instance" level="document" category="buffer verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:string value="type"/> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -187,7 +191,7 @@ </cd:arguments> </cd:command> - <cd:command name="typedefinedbuffer" file="buff-ver.mkiv"> + <cd:command name="typedefinedbuffer" level="system" category="buffer verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer"/> <cd:assignments list="yes" optional="yes"> @@ -196,4 +200,31 @@ </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="prettyprintbuffer" level="style" category="buffer verbatim" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-buffer"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="inlineprettyprintbuffer" level="style" category="buffer verbatim" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-buffer"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="typeinlinebuffer" level="style" category="buffer verbatim" file="buff-ver.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-buffer-list-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptype"/> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-button.xml b/tex/context/interface/mkiv/i-button.xml index 0ccb2d28d..d7228c949 100644 --- a/tex/context/interface/mkiv/i-button.xml +++ b/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" file="scrn-but.mkvi"> + <cd:command name="definebutton" level="style" catehory="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" file="scrn-but.mkvi"> + <cd:command name="setupbutton" level="style" catehory="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" file="scrn-but.mkvi"> + <cd:command name="setupbuttons" level="style" catehory="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" file="scrn-but.mkvi"> + <cd:command name="button" generated="yes" variant="example" level="document" catehory="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" file="scrn-but.mkvi"> + <cd:command name="button" level="document" catehory="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" file="scrn-but.mkvi"> + <cd:command name="overlaybutton" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="overlaybutton" variant="direct" file="scrn-but.mkvi"> + <cd:command name="overlaybutton" variant="direct" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="MPmenubuttons" file="scrn-but.mkvi"> + <cd:command name="MPmenubuttons" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="overlayrollbutton" file="scrn-fld.mkvi"> + <cd:command name="overlayrollbutton" level="style" catehory="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" file="scrn-fld.mkvi"> + <cd:command name="definepushbutton" level="style" catehory="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" file="scrn-fld.mkvi"> + <cd:command name="pushbutton" level="style" catehory="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" file="scrn-fld.mkvi"> + <cd:command name="definepushsymbol" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -140,7 +140,7 @@ <!-- - <cd:command name="psh" scope="interactionmenu" file="scrn-fld.mkvi"> + <cd:command name="psh" scope="interactionmenu" level="style" catehory="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" file="scrn-fld.mkvi"> + <cd:command name="psh" type="environment" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> @@ -156,7 +156,7 @@ --> - <cd:command name="rollbutton" variant="interactionmenu" file="scrn-fld.mkvi"> + <cd:command name="rollbutton" variant="interactionmenu" level="style" catehory="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" file="scrn-fld.mkvi"> + <cd:command name="rollbutton" variant="button" level="style" catehory="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" file="scrn-fld.mkvi"> + <cd:command name="rob" scope="interactionmenu" level="style" catehory="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" file="scrn-fld.mkvi"> + <cd:command name="rob" type="environment" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-capitals.xml b/tex/context/interface/mkiv/i-capitals.xml index 154a1a040..4cfb4a080 100644 --- a/tex/context/interface/mkiv/i-capitals.xml +++ b/tex/context/interface/mkiv/i-capitals.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecapitals" file="typo-cap.mkiv"> + <cd:command name="definecapitals" level="style" category="fonts" file="typo-cap.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="setupcapitals" file="typo-cap.mkiv"> + <cd:command name="setupcapitals" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -33,7 +33,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcharactercasing" file="typo-cap.mkiv"> + <cd:command name="setcharactercasing" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -53,156 +53,156 @@ </cd:arguments> </cd:command> - <cd:command name="WORD" file="typo-cap.mkiv"> + <cd:command name="WORD" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="word" file="typo-cap.mkiv"> + <cd:command name="word" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Word" file="typo-cap.mkiv"> + <cd:command name="Word" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Words" file="typo-cap.mkiv"> + <cd:command name="Words" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="camel" file="typo-cap.mkiv"> + <cd:command name="camel" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="WORDS" file="typo-cap.mkiv"> + <cd:command name="WORDS" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="words" file="typo-cap.mkiv"> + <cd:command name="words" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pseudosmallcapped" file="typo-cap.mkiv"> + <cd:command name="pseudosmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pseudoSmallcapped" file="typo-cap.mkiv"> + <cd:command name="pseudoSmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pseudoSmallCapped" file="typo-cap.mkiv"> + <cd:command name="pseudoSmallCapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pseudoMixedCapped" file="typo-cap.mkiv"> + <cd:command name="pseudoMixedCapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="realsmallcapped" file="typo-cap.mkiv"> + <cd:command name="realsmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="realSmallcapped" file="typo-cap.mkiv"> + <cd:command name="realSmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="realSmallCapped" file="typo-cap.mkiv"> + <cd:command name="realSmallCapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="notsmallcapped" file="typo-cap.mkiv"> + <cd:command name="notsmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="smallcapped" file="typo-cap.mkiv"> + <cd:command name="smallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Smallcapped" file="typo-cap.mkiv"> + <cd:command name="Smallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="SmallCapped" file="typo-cap.mkiv"> + <cd:command name="SmallCapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="autocap" file="typo-cap.mkiv"> + <cd:command name="autocap" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mixedcaps" file="typo-cap.mkiv"> + <cd:command name="mixedcaps" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="kap" file="typo-cap.mkiv"> + <cd:command name="kap" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Caps" file="typo-cap.mkiv"> + <cd:command name="Caps" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="uppercased" file="typo-cap.mkiv"> + <cd:command name="uppercased" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="lowercased" file="typo-cap.mkiv"> + <cd:command name="lowercased" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="randomizetext" file="typo-cap.mkiv"> + <cd:command name="randomizetext" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="randomized" type="environment" file="typo-cap.mkiv"/> + <cd:command name="randomized" type="environment" level="document" category="fonts" file="typo-cap.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-catcodes.xml b/tex/context/interface/mkiv/i-catcodes.xml index b8636ceee..351e8f6e4 100644 --- a/tex/context/interface/mkiv/i-catcodes.xml +++ b/tex/context/interface/mkiv/i-catcodes.xml @@ -4,63 +4,63 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="texcode" type="environment" file="catc-ctx.mkiv"/> + <cd:command name="texcode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/> - <cd:command name="contextcode" type="environment" file="catc-ctx.mkiv"/> + <cd:command name="contextcode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/> - <cd:command name="contextdefinitioncode" type="environment" file="catc-ctx.mkiv"/> + <cd:command name="contextdefinitioncode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/> - <cd:command name="protect" type="environment" begin="un" end="" file="catc-def.mkiv"/><!-- end="zero width space" --> + <cd:command name="protect" type="environment" begin="un" end="" level="system" category="catcode" file="catc-def.mkiv"/><!-- end="zero width space" --> - <cd:command name="newcatcodetable" file="catc-ini.mkiv"> + <cd:command name="newcatcodetable" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="catcodetable" type="environment" file="catc-ini.mkiv"> + <cd:command name="catcodetable" type="environment" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="extendedcatcodetable" type="environment" file="catc-ini.mkiv"> + <cd:command name="extendedcatcodetable" type="environment" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="installactivecharacter" file="catc-act.mkiv"> + <cd:command name="installactivecharacter" level="system" category="catcode" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="defineactivecharacter" file="catc-act.mkiv"> + <cd:command name="defineactivecharacter" level="system" category="catcode" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installanddefineactivecharacter" file="catc-act.mkiv"> + <cd:command name="installanddefineactivecharacter" level="system" category="catcode" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="makecharacteractive" file="catc-act.mkiv"> + <cd:command name="makecharacteractive" level="system" category="catcode" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="permitcircumflexescape" file="catc-ini.mkiv"/> + <cd:command name="permitcircumflexescape" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="permitcaretescape" file="catc-ini.mkiv"/> + <cd:command name="permitcaretescape" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="letcatcodecommand" file="catc-ini.mkiv"> + <cd:command name="letcatcodecommand" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -71,7 +71,7 @@ </cd:arguments> </cd:command> - <cd:command name="defcatcodecommand" file="catc-ini.mkiv"> + <cd:command name="defcatcodecommand" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="uedcatcodecommand" file="catc-ini.mkiv"> + <cd:command name="uedcatcodecommand" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -93,31 +93,31 @@ </cd:arguments> </cd:command> - <cd:command name="catcodetable" type="environment" begin="push" end="pop" file="catc-ini.mkiv"/> + <cd:command name="catcodetable" type="environment" begin="push" end="pop" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="restorecatcodes" file="catc-ini.mkiv"/> + <cd:command name="restorecatcodes" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="setcatcodetable" file="catc-ini.mkiv"> + <cd:command name="setcatcodetable" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="tracecatcodetables" file="catc-ini.mkiv"/> + <cd:command name="tracecatcodetables" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="catcodetablename" file="catc-ini.mkiv"/> + <cd:command name="catcodetablename" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="rescan" file="catc-sym.mkiv"> + <cd:command name="rescan" level="system" category="catcode" file="catc-sym.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rescanwithsetup" file="catc-sym.mkiv"> + <cd:command name="rescanwithsetup" level="system" category="catcode" file="catc-sym.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-character.xml b/tex/context/interface/mkiv/i-character.xml index f7f0e08db..c391836d5 100644 --- a/tex/context/interface/mkiv/i-character.xml +++ b/tex/context/interface/mkiv/i-character.xml @@ -4,133 +4,141 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="letteropenbrace" file="catc-sym.mkiv"/> + <cd:command name="letteropenbrace" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterclosebrace" file="catc-sym.mkiv"/> + <cd:command name="letterclosebrace" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterampersand" file="catc-sym.mkiv"/> + <cd:command name="letterampersand" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterless" file="catc-sym.mkiv"/> + <cd:command name="letterless" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="lettermore" file="catc-sym.mkiv"/> + <cd:command name="lettermore" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterhash" file="catc-sym.mkiv"/> + <cd:command name="letterhash" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterdoublequote" file="catc-sym.mkiv"/> + <cd:command name="letterdoublequote" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="lettersinglequote" file="catc-sym.mkiv"/> + <cd:command name="lettersinglequote" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterdollar" file="catc-sym.mkiv"/> + <cd:command name="letterdollar" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterpercent" file="catc-sym.mkiv"/> + <cd:command name="letterpercent" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterhat" file="catc-sym.mkiv"/> + <cd:command name="letterhat" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterunderscore" file="catc-sym.mkiv"/> + <cd:command name="letterunderscore" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterbar" file="catc-sym.mkiv"/> + <cd:command name="letterbar" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="lettertilde" file="catc-sym.mkiv"/> + <cd:command name="lettertilde" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterbackslash" file="catc-sym.mkiv"/> + <cd:command name="letterbackslash" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterslash" file="catc-sym.mkiv"/> + <cd:command name="letterslash" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterquestionmark" file="catc-sym.mkiv"/> + <cd:command name="letterquestionmark" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterat" file="catc-sym.mkiv"/> + <cd:command name="letterat" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="lettercolon" file="catc-sym.mkiv"/> + <cd:command name="lettercolon" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterescape" file="catc-sym.mkiv"/> + <cd:command name="letterleftparenthesis" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterbgroup" file="catc-sym.mkiv"/> + <cd:command name="letterrightparenthesis" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letteregroup" file="catc-sym.mkiv"/> + <cd:command name="letterleftbracket" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterleftbrace" file="catc-sym.mkiv"/> + <cd:command name="letterrightbracket" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterrightbrace" file="catc-sym.mkiv"/> + <cd:command name="letterescape" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterexclamationmark" file="catc-sym.mkiv"/> + <cd:command name="letterbgroup" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="utfchar" file="char-ini.mkiv"> + <cd:command name="letteregroup" level="document" category="characters" file="catc-sym.mkiv"/> + + <cd:command name="letterleftbrace" level="document" category="characters" file="catc-sym.mkiv"/> + + <cd:command name="letterrightbrace" level="document" category="characters" file="catc-sym.mkiv"/> + + <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:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="safechar" file="char-ini.mkiv"> + <cd:command name="safechar" level="style" category="characters fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="checkedchar" file="char-ini.mkiv"> + <cd:command name="checkedchar" level="style" category="characters 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" file="char-ini.mkiv"> + <cd:command name="textormathchar" level="style" category="characters fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chardescription" file="char-ini.mkiv"> + <cd:command name="chardescription" level="style" category="characters" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="percent" file="enco-ini.mkiv"/> + <cd:command name="percent" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="procent" file="enco-ini.mkiv"/> + <cd:command name="procent" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="ampersand" file="enco-ini.mkiv"/> + <cd:command name="ampersand" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="dollar" file="enco-ini.mkiv"/> + <cd:command name="dollar" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="hash" file="enco-ini.mkiv"/> + <cd:command name="hash" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="hyphen" file="enco-ini.mkiv"/> + <cd:command name="hyphen" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="lowerleftsingleninequote" file="enco-ini.mkiv"/> + <cd:command name="lowerleftsingleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="lowerleftdoubleninequote" file="enco-ini.mkiv"/> + <cd:command name="lowerleftdoubleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="lowerrightsingleninequote" file="enco-ini.mkiv"/> + <cd:command name="lowerrightsingleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="lowerrightdoubleninequote" file="enco-ini.mkiv"/> + <cd:command name="lowerrightdoubleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperleftsingleninequote" file="enco-ini.mkiv"/> + <cd:command name="upperleftsingleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperleftdoubleninequote" file="enco-ini.mkiv"/> + <cd:command name="upperleftdoubleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperrightsingleninequote" file="enco-ini.mkiv"/> + <cd:command name="upperrightsingleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperrightdoubleninequote" file="enco-ini.mkiv"/> + <cd:command name="upperrightdoubleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperleftsinglesixquote" file="enco-ini.mkiv"/> + <cd:command name="upperleftsinglesixquote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperleftdoublesixquote" file="enco-ini.mkiv"/> + <cd:command name="upperleftdoublesixquote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperrightsinglesixquote" file="enco-ini.mkiv"/> + <cd:command name="upperrightsinglesixquote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperrightdoublesixquote" file="enco-ini.mkiv"/> + <cd:command name="upperrightdoublesixquote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="leftsubguillemot" file="enco-ini.mkiv"/> + <cd:command name="leftsubguillemot" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="rightsubguillemot" file="enco-ini.mkiv"/> + <cd:command name="rightsubguillemot" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="textcontrolspace" file="enco-ini.mkiv"/> + <cd:command name="textcontrolspace" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="textvisiblespace" file="enco-ini.mkiv"/> + <cd:command name="textvisiblespace" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="textminus" file="enco-ini.mkiv"/> + <cd:command name="textminus" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="textplus" file="enco-ini.mkiv"/> + <cd:command name="textplus" level="document" category="characters" file="enco-ini.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characteralign.xml b/tex/context/interface/mkiv/i-characteralign.xml index a515ba1e9..3e9f81722 100644 --- a/tex/context/interface/mkiv/i-characteralign.xml +++ b/tex/context/interface/mkiv/i-characteralign.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="singalcharacteralign" file="typo-tal.mkiv"> + <cd:command name="singalcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="setcharacteralign" file="typo-tal.mkiv"> + <cd:command name="setcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:keywords delimiters="braces"> @@ -22,11 +22,11 @@ </cd:arguments> </cd:command> - <cd:command name="resetcharacteralign" file="typo-tal.mkiv"/> + <cd:command name="resetcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> - <cd:command name="alignmentcharacter" file="typo-tal.mkiv"/> + <cd:command name="alignmentcharacter" level="system" category="alignment" file="typo-tal.mkiv"/> - <cd:command name="characteralign" type="environment" file="typo-tal.mkiv"> + <cd:command name="characteralign" type="environment" category="alignment" level="system" file="typo-tal.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -36,10 +36,10 @@ </cd:arguments> </cd:command> - <cd:command name="checkcharacteralign" file="typo-tal.mkiv"> + <cd:command name="checkcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characterspacing.xml b/tex/context/interface/mkiv/i-characterspacing.xml index cb54030c7..0247115a3 100644 --- a/tex/context/interface/mkiv/i-characterspacing.xml +++ b/tex/context/interface/mkiv/i-characterspacing.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecharacterspacing" file="typo-spa.mkiv"> + <cd:command name="definecharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupcharacterspacing" file="typo-spa.mkiv"> + <cd:command name="setupcharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcharacterspacing" file="typo-spa.mkiv"> + <cd:command name="setcharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -38,6 +38,6 @@ </cd:arguments> </cd:command> - <cd:command name="resetcharacterspacing" file="typo-spa.mkiv"/> + <cd:command name="resetcharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characterstripping.xml b/tex/context/interface/mkiv/i-characterstripping.xml index cd89ac065..5c776e3ab 100644 --- a/tex/context/interface/mkiv/i-characterstripping.xml +++ b/tex/context/interface/mkiv/i-characterstripping.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setcharacterstripping" file="typo-rep.mkiv"> + <cd:command name="setcharacterstripping" level="style" category="language" file="typo-rep.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -13,8 +13,8 @@ </cd:arguments> </cd:command> - <cd:command name="resetcharacterstripping" file="typo-rep.mkiv"/> + <cd:command name="resetcharacterstripping" level="style" category="language" file="typo-rep.mkiv"/> - <cd:command name="forcecharacterstripping" file="typo-rep.mkiv"/> + <cd:command name="forcecharacterstripping" level="style" category="language" file="typo-rep.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-chart.xml b/tex/context/interface/mkiv/i-chart.xml index 06c356041..2b73f1322 100644 --- a/tex/context/interface/mkiv/i-chart.xml +++ b/tex/context/interface/mkiv/i-chart.xml @@ -4,13 +4,111 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <?context-directive job ctxfile x-setups.ctx ?> + <!-- + + <cd:command name="setupFLOWchart" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="width"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="height"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="offset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="dx"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="dy"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="nx"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="ny"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="x"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="y"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="labeloffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="commentoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="exitoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="split"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="bodyfont"> + <cd:inherit name="setupbodyfont"/> + </cd:parameter> + <cd:parameter name="option"> + <cd:constant type="test"/> + </cd:parameter> + <cd:parameter name="dot"> + <cd:constant type="yes"/> + <cd:constant type="con"/> + <cd:constant type="mid"/> + <cd:constant type="all"/> + </cd:parameter> + <cd:parameter name="hcompact"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="vcompact"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="focus"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="autofocus"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="background"> + <cd:resolve name="value-background"/> + </cd:parameter> + <cd:parameter name="framecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="frame"> + <cd:constant type="on"/> + <cd:constant type="off" default="yes"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> - <!-- still incomplete --> + <cd:command name="setupFLOWcharts" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupFLOWchart"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="setupFLOWcharts" file="m-chart.mkiv"> + --> + + <cd:command name="setupFLOWcharts" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="width"> <cd:constant type="cd:dimension"/> @@ -58,18 +156,28 @@ <cd:parameter name="option"> <cd:constant type="test"/> </cd:parameter> - <!-- dot: private option --> - <cd:parameter name="focus"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="autofocus"> + <!-- dot: private option + <cd:parameter name="dot"> + <cd:constant type="yes"/> + <cd:constant type="con"/> + <cd:constant type="mid"/> + <cd:constant type="all"/> + </cd:parameter> + --> + <cd:parameter name="hcompact"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> </cd:parameter> - <cd:parameter name="autofocus"> + <cd:parameter name="vcompact"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> </cd:parameter> + <cd:parameter name="focus"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="autofocus"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="background"> <cd:resolve name="value-background"/> </cd:parameter> @@ -83,135 +191,351 @@ <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="frame"> - <cd:constant type="on" default="yes"/> - <cd:constant type="off"/> + <cd:constant type="on"/> + <cd:constant type="off" default="yes"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupFLOWlines" file="m-chart.mkiv"> + <!-- + <cd:command name="setupFLOWline" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="corner"> + <cd:constant type="round" default="yes"/> + </cd:parameter> + <cd:parameter name="arrow"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="dash"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="radius"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="offset"> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupFLOWlines" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupFLOWline"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupFLOWlines" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> - <cd:parameter name="color"> - <cd:constant name="round"/> - <cd:constant name="normal" default="yes"/> + <cd:parameter name="corner"> + <cd:constant type="round" default="yes"/> </cd:parameter> <cd:parameter name="arrow"> - <cd:constant name="yes" default="yes"/> - <cd:constant name="no"/> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> </cd:parameter> <cd:parameter name="dash"> - <cd:constant name="yes"/> - <cd:constant name="no" default="yes"/> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> </cd:parameter> <cd:parameter name="radius"> <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="color"> - <cd:constant name="cd:color"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant name="cd:dimension"/> + <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="offset"> + <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupFLOWshapes" file="m-chart.mkiv"> + <!-- + + <cd:command name="setupFLOWshape" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="default"> + <cd:resolve name="value-flowshape"/> + </cd:parameter> + <cd:parameter name="framecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupFLOWshapes" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupFLOWshape"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupFLOWshapes" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="default"> - <cd:resolve name="cd:name"/> + <cd:resolve name="value-flowshape"/> </cd:parameter> <cd:parameter name="framecolor"> - <cd:constant name="cd:color"/> - </cd:parameter> - <cd:parameter name="background"> - <cd:resolve name="value-background"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="backgroundcolor"> - <cd:constant name="cd:color"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant name="cd:dimension"/> - </cd:parameter> - <cd:parameter name="offset"> - <cd:constant type="none"/> - <cd:constant type="overlay"/> - <cd:constant type="standard"/> <cd:constant type="cd:dimension"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupFLOWfocus" file="m-chart.mkiv"> + <cd:command name="setupFLOWfocus" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> - <cd:parameter name="color"> + <cd:parameter name="framecolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="background"> - <cd:inherit name="setupFLOWshape"/> - </cd:parameter> <cd:parameter name="backgroundcolor"> - <cd:inherit name="setupFLOWshape"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:inherit name="setupFLOWshape"/> - </cd:parameter> - <cd:parameter name="offset"> - <cd:inherit name="setupFLOWshape"/> + <cd:constant type="cd:dimension"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupFLOWsplit" file="m-chart.mkiv"> + <cd:command name="setupFLOWsplit" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="dx"> - <cd:constant name="cd:number"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="dy"> - <cd:constant name="cd:number"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="nx"> - <cd:constant name="cd:number"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="ny"> - <cd:constant name="cd:number"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="command"> - <cd:constant name="cd:command"/> + <cd:constant type="cd:oneargument"/> </cd:parameter> <cd:parameter name="before"> - <cd:constant name="cd:command"/> + <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="after"> - <cd:constant name="cd:command"/> + <cd:constant type="cd:command"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <!-- + <cd:command name="FLOWchart" type="environment" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> - startFLOWchart [name] - FLOWchart [name] - startFLOWcell [key=value] - includeFLOWchart + <cd:command name="defineFLOWchart" level="style" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:content/> + </cd:arguments> + </cd:command> - name shape destination focus overlay location text label comment exit - connection include figure connect locate - --> + <cd:command name="FLOWcell" type="environment" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupFLOWshape"/> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupFLOWline"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="FLOWchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupFLOWchart"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="FLOWcharts" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupFLOWsplit"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="name" scope="flowchart" level="document" category="graphics 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:arguments> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-flowshape"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="destination" scope="flowchart" level="document" category="graphics 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: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: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:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="-"/> + <cd:constant type="+"/> + <cd:constant type="cd:number" prefix="cd:sign" method="none"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="figure" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="text" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:resolve name="value-chartlabel"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="label" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:resolve name="value-chartlabel"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="comment" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:resolve name="value-chartlabel"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="exit" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:resolve name="value-chartlabel"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="connection" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords> + <cd:constant type="+"/> + <cd:constant type="-"/> + <cd:constant type="p"/> + <cd:constant type="m"/> + <cd:constant type="l"/> + <cd:constant type="r"/> + <cd:constant type="t"/> + <cd:constant type="b"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="␣"/> + </cd:keywords> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:number"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="include" level="document" category="graphics metapost" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="x"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="y"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-charwidth.xml b/tex/context/interface/mkiv/i-charwidth.xml index 63240327a..dc19713f3 100644 --- a/tex/context/interface/mkiv/i-charwidth.xml +++ b/tex/context/interface/mkiv/i-charwidth.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="charwidthlanguage" file="typo-lan.mkiv"/> + <cd:command name="charwidthlanguage" level="style" category="language" file="typo-lan.mkiv"/> - <cd:command name="averagecharwidth" file="typo-lan.mkiv"/> + <cd:command name="averagecharwidth" level="style" category="language" file="typo-lan.mkiv"/> - <cd:command name="languagecharwidth" file="typo-lan.mkiv"> + <cd:command name="languagecharwidth" level="style" category="language" file="typo-lan.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-chemical.xml b/tex/context/interface/mkiv/i-chemical.xml index 1a81b82fc..a2df03ede 100644 --- a/tex/context/interface/mkiv/i-chemical.xml +++ b/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" file="chem-ini.mkiv"> + <cd:command name="molecule" level="document" file="chem-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="chem" file="chem-ini.mkiv"> + <cd:command name="chem" level="document" file="chem-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -18,12 +18,12 @@ </cd:arguments> </cd:command> - <cd:command name="setupchemical" file="chem-str.mkiv"> + <cd:command name="setupchemical" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="strut"> - <cd:inherit name="value-strut"/> + <cd:resolve name="value-strut"/> </cd:parameter> <cd:parameter name="width"> <cd:constant type="fit" default="yes"/> @@ -114,7 +114,7 @@ <!-- - <cd:command name="setupchemicals" file="chem-str.mkiv"> + <cd:command name="setupchemicals" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -125,7 +125,7 @@ --> - <cd:command name="setupchemicalframed" file="chem-str.mkiv"> + <cd:command name="setupchemicalframed" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -134,33 +134,33 @@ </cd:arguments> </cd:command> - <cd:command name="definechemical" file="chem-str.mkiv"> + <cd:command name="definechemical" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definechemicalsymbol" file="chem-str.mkiv"> + <cd:command name="definechemicalsymbol" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="chemicalsymbol" file="chem-str.mkiv"> + <cd:command name="chemicalsymbol" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="chemicaltext" file="chem-str.mkiv"> + <cd:command name="chemicaltext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="chemical" type="environment" file="chem-str.mkiv"> + <cd:command name="chemical" type="environment" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -171,7 +171,7 @@ <!-- - <cd:command name="structurechemical" type="environment" file="chem-str.mkiv"> + <cd:command name="structurechemical" type="environment" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -182,7 +182,7 @@ --> - <cd:command name="chemical" file="chem-str.mkiv"> + <cd:command name="chemical" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-text-list"/> @@ -192,7 +192,7 @@ <!-- - <cd:command name="structurechemical" file="chem-str.mkiv"> + <cd:command name="structurechemical" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-text-list"/> @@ -202,19 +202,19 @@ --> - <cd:command name="chemicaltoptext" file="chem-str.mkiv"> + <cd:command name="chemicaltoptext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="chemicalbottext" file="chem-str.mkiv"> + <cd:command name="chemicalbottext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="chemicalmidtext" file="chem-str.mkiv"> + <cd:command name="chemicalmidtext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> @@ -222,19 +222,19 @@ <!-- - <cd:command name="toptext" file="chem-str.mkiv"> + <cd:command name="toptext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="bottext" file="chem-str.mkiv"> + <cd:command name="bottext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="midtext" file="chem-str.mkiv"> + <cd:command name="midtext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> @@ -242,7 +242,7 @@ --> - <cd:command name="definechemicals" file="chem-str.mkiv"> + <cd:command name="definechemicals" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -252,4 +252,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-cleaning.xml b/tex/context/interface/mkiv/i-cleaning.xml index e37eb7999..dd54fdacc 100644 --- a/tex/context/interface/mkiv/i-cleaning.xml +++ b/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" file="typo-chr.mkiv"/> + <cd:command name="punctuation" type="environment" begin="push" end="pop" level="system" file="typo-chr.mkiv"/> - <cd:command name="removepunctuation" file="typo-chr.mkiv"/> + <cd:command name="removepunctuation" level="system" file="typo-chr.mkiv"/> - <cd:command name="markcontent" file="typo-chr.mkiv"> + <cd:command name="markcontent" level="system" 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" file="typo-chr.mkiv"> + <cd:command name="markedcontent" type="environment" level="system" file="typo-chr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -29,13 +29,13 @@ </cd:arguments> </cd:command> - <cd:command name="removemarkedcontent" file="typo-chr.mkiv"> + <cd:command name="removemarkedcontent" level="system" file="typo-chr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setcharactercleaning" file="typo-cln.mkiv"> + <cd:command name="setcharactercleaning" level="system" file="typo-cln.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> diff --git a/tex/context/interface/mkiv/i-clipping.xml b/tex/context/interface/mkiv/i-clipping.xml index aa152a85b..c823b102d 100644 --- a/tex/context/interface/mkiv/i-clipping.xml +++ b/tex/context/interface/mkiv/i-clipping.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupclipping" file="grph-trf.mkiv"> + <cd:command name="setupclipping" level="style" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="clip" file="grph-trf.mkiv"> + <cd:command name="clip" level="document" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupclipping"/> @@ -75,4 +75,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-collector.xml b/tex/context/interface/mkiv/i-collector.xml index a75f3534e..6642e6980 100644 --- a/tex/context/interface/mkiv/i-collector.xml +++ b/tex/context/interface/mkiv/i-collector.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecollector" file="pack-box.mkiv"> + <cd:command name="definecollector" level="style" category="graphics" file="pack-box.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="setupcollector" file="pack-box.mkiv"> + <cd:command name="setupcollector" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcollector" file="pack-box.mkiv"> + <cd:command name="setcollector" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -65,25 +65,25 @@ </cd:arguments> </cd:command> - <cd:command name="resetcollector" file="pack-box.mkiv"> + <cd:command name="resetcollector" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushcollector" file="pack-box.mkiv"> + <cd:command name="flushcollector" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="composedcollector" file="pack-box.mkiv"> + <cd:command name="composedcollector" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="adaptcollector" file="pack-box.mkiv"> + <cd:command name="adaptcollector" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -92,7 +92,7 @@ </cd:arguments> </cd:command> - <cd:command name="collectedtext" file="pack-box.mkiv"> + <cd:command name="collectedtext" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcollector"/> @@ -111,4 +111,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml index 4168216a9..80da11f3b 100644 --- a/tex/context/interface/mkiv/i-color.xml +++ b/tex/context/interface/mkiv/i-color.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="negatecolorbox" file="colo-ext.mkiv"> + <cd:command name="negatecolorbox" level="system" category="colors" file="colo-ext.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="colorintent" type="environment" file="colo-ext.mkiv"> + <cd:command name="colorintent" type="environment" level="document" category="colors" file="colo-ext.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="knockout"/> @@ -20,13 +20,13 @@ </cd:arguments> </cd:command> - <cd:command name="overprint" type="environment" file="colo-ext.mkiv"/> + <cd:command name="overprint" type="environment" level="document" category="colors" file="colo-ext.mkiv"/> - <cd:command name="knockout" type="environment" file="colo-ext.mkiv"/> + <cd:command name="knockout" type="environment" level="document" category="colors" file="colo-ext.mkiv"/> - <cd:command name="textcolorintent" type="environment" file="colo-ext.mkiv"/> + <cd:command name="textcolorintent" type="environment" level="document" category="colors" file="colo-ext.mkiv"/> - <cd:command name="definecolorgroup" file="colo-grp.mkiv"> + <cd:command name="definecolorgroup" level="style" category="colors" file="colo-grp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="definecolor" file="colo-ini.mkiv"> + <cd:command name="definecolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -86,14 +86,14 @@ </cd:arguments> </cd:command> - <cd:command name="definecolor" variant="name" file="colo-ini.mkiv"> + <cd:command name="definecolor" variant="name" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="defineglobalcolor" file="colo-ini.mkiv"> + <cd:command name="defineglobalcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -102,14 +102,14 @@ </cd:arguments> </cd:command> - <cd:command name="defineglobalcolor" variant="name" file="colo-ini.mkiv"> + <cd:command name="defineglobalcolor" variant="name" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="definenamedcolor" file="colo-ini.mkiv"> + <cd:command name="definenamedcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -118,14 +118,14 @@ </cd:arguments> </cd:command> - <cd:command name="definenamedcolor" variant="name" file="colo-ini.mkiv"> + <cd:command name="definenamedcolor" variant="name" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="defineprocesscolor" file="colo-ini.mkiv"> + <cd:command name="defineprocesscolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color-optional"/> @@ -135,7 +135,7 @@ </cd:arguments> </cd:command> - <cd:command name="definespotcolor" file="colo-ini.mkiv"> + <cd:command name="definespotcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> @@ -156,7 +156,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemultitonecolor" file="colo-ini.mkiv"> + <cd:command name="definemultitonecolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -173,14 +173,14 @@ </cd:arguments> </cd:command> - <cd:command name="definetransparency" variant="1" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="1" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="definetransparency" variant="2" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="2" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -194,55 +194,55 @@ </cd:arguments> </cd:command> - <cd:command name="definetransparency" variant="3" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="3" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="switchtocolor" file="colo-ini.mkiv"> + <cd:command name="switchtocolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="color" file="colo-ini.mkiv"> + <cd:command name="color" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloronly" file="colo-ini.mkiv"> + <cd:command name="coloronly" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="transparent" file="colo-ini.mkiv"> + <cd:command name="transparent" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="graycolor" file="colo-ini.mkiv"> + <cd:command name="graycolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="colored" variant="name" file="colo-ini.mkiv"> + <cd:command name="colored" variant="name" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="colored" file="colo-ini.mkiv"> + <cd:command name="colored" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -251,37 +251,37 @@ </cd:arguments> </cd:command> - <cd:command name="color" type="environment" file="colo-ini.mkiv"> + <cd:command name="color" type="environment" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="coloronly" type="environment" file="colo-ini.mkiv"> + <cd:command name="coloronly" type="environment" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="transparent" type="environment" file="colo-ini.mkiv"> + <cd:command name="transparent" type="environment" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolor" file="colo-ini.mkiv"> + <cd:command name="directcolor" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolored" variant="name" file="colo-ini.mkiv"> + <cd:command name="directcolored" variant="name" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolored" file="colo-ini.mkiv"> + <cd:command name="directcolored" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -289,27 +289,27 @@ </cd:arguments> </cd:command> - <cd:command name="currentcolor" type="environment" file="colo-ini.mkiv"/> + <cd:command name="currentcolor" type="environment" level="system" category="colors" file="colo-ini.mkiv"/> - <cd:command name="colorset" type="environment" file="colo-ini.mkiv"> + <cd:command name="colorset" type="environment" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usecolors" file="colo-ini.mkiv"> + <cd:command name="usecolors" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setupcolor" file="colo-ini.mkiv"> + <cd:command name="setupcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setupcolors" file="colo-ini.mkiv"> + <cd:command name="setupcolors" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -358,15 +358,15 @@ </cd:arguments> </cd:command> - <cd:command name="color" type="environment" begin="push" end="pop" file="colo-ini.mkiv"> + <cd:command name="color" type="environment" begin="push" end="pop" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="color" type="environment" begin="save" end="restore" file="colo-ini.mkiv"/> + <cd:command name="color" type="environment" begin="save" end="restore" level="system" category="colors" file="colo-ini.mkiv"/> - <cd:command name="definepalet" file="colo-ini.mkiv"> + <cd:command name="definepalet" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -377,28 +377,28 @@ </cd:arguments> </cd:command> - <cd:command name="definepalet" variant="name" file="colo-ini.mkiv"> + <cd:command name="definepalet" variant="name" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="getpaletsize" file="colo-ini.mkiv"> + <cd:command name="getpaletsize" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="paletsize" file="colo-ini.mkiv"/> + <cd:command name="paletsize" level="system" category="colors" file="colo-ini.mkiv"/> - <cd:command name="setuppalet" file="colo-ini.mkiv"> + <cd:command name="setuppalet" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setcolormodell" file="colo-ini.mkiv"> + <cd:command name="setcolormodell" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="black"/> @@ -412,9 +412,9 @@ </cd:arguments> </cd:command> - <cd:command name="protectedcolors" type="environment" file="colo-ini.mkiv"/> + <cd:command name="protectedcolors" type="environment" level="system" category="colors" file="colo-ini.mkiv"/> - <cd:command name="defineintermediatecolor" file="colo-ini.mkiv"> + <cd:command name="defineintermediatecolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -432,7 +432,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecolor" file="color-ini.mkiv"> + <cd:command name="doifelsecolor" level="system" category="colors conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -440,7 +440,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcolorelse" file="color-ini.mkiv"> + <cd:command name="doifcolorelse" level="system" category="colors conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -448,74 +448,74 @@ </cd:arguments> </cd:command> - <cd:command name="doifcolor" file="color-ini.mkiv"> + <cd:command name="doifcolor" level="system" category="colors conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="textcolor" type="environment" file="colo-ini.mkiv"> + <cd:command name="textcolor" type="environment" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="MPcolor" file="colo-ini.mkiv"> + <cd:command name="MPcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="MPcoloronly" file="colo-ini.mkiv"> + <cd:command name="MPcoloronly" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="MPtransparency" file="colo-ini.mkiv"> + <cd:command name="MPtransparency" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="MPoptions" file="colo-ini.mkiv"> + <cd:command name="MPoptions" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="colorvalue" file="colo-ini.mkiv"> + <cd:command name="colorvalue" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="grayvalue" file="colo-ini.mkiv"> + <cd:command name="grayvalue" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="colorcomponents" file="colo-ini.mkiv"> + <cd:command name="colorcomponents" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="transparencycomponents" file="colo-ini.mkiv"> + <cd:command name="transparencycomponents" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="processcolorcomponents" file="colo-ini.mkiv"> + <cd:command name="processcolorcomponents" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="doifelseblack" file="colo-ini.mkiv"> + <cd:command name="doifelseblack" level="system" category="colors conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -523,7 +523,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifblackelse" file="colo-ini.mkiv"> + <cd:command name="doifblackelse" level="system" category="colors conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -531,45 +531,45 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedrawingblack" file="colo-ini.mkiv"> + <cd:command name="doifelsedrawingblack" level="system" category="colors 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" file="colo-ini.mkiv"> + <cd:command name="doifdrawingblackelse" level="system" category="colors conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="showcolorbar" file="colo-run.mkiv"> + <cd:command name="showcolorbar" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolor" file="colo-run.mkiv"> + <cd:command name="showcolor" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolorset" file="colo-run.mkiv"> + <cd:command name="showcolorset" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolorcomponents" file="colo-run.mkiv"> + <cd:command name="showcolorcomponents" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showpalet" file="colo-run.mkiv"> + <cd:command name="showpalet" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -582,13 +582,13 @@ </cd:arguments> </cd:command> - <cd:command name="comparepalet" file="colo-run.mkiv"> + <cd:command name="comparepalet" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showcolorgroup" file="colo-run.mkiv"> + <cd:command name="showcolorgroup" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -601,10 +601,10 @@ </cd:arguments> </cd:command> - <cd:command name="comparecolorgroup" file="colo-run.mkiv"> + <cd:command name="comparecolorgroup" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml index 154d38072..9fdd209c0 100644 --- a/tex/context/interface/mkiv/i-columns.xml +++ b/tex/context/interface/mkiv/i-columns.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupcolumns" file="page-mul.mkiv"> + <cd:command name="setupcolumns" level="style" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="columns" type="environment" file="page-mul.mkiv"> + <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"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcolumnspan" file="page-mul.mkiv"> + <cd:command name="setupcolumnspan" level="style" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -73,7 +73,7 @@ </cd:arguments> </cd:command> - <cd:command name="columnspan" type="environment" file="page-mul.mkiv"> + <cd:command name="columnspan" type="environment" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumnspan"/> @@ -81,7 +81,7 @@ </cd:arguments> </cd:command> - <cd:command name="setsimplecolumnhsize" file="page-mul.mkiv"> + <cd:command name="setsimplecolumnhsize" level="system" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -100,7 +100,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplecolumns" type="environment" file="page-mul.mkiv"> + <cd:command name="simplecolumns" type="environment" level="system" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setsimplecolumnhsize"/> @@ -108,4 +108,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-combination.xml b/tex/context/interface/mkiv/i-combination.xml index 492edadd0..bd732c264 100644 --- a/tex/context/interface/mkiv/i-combination.xml +++ b/tex/context/interface/mkiv/i-combination.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecombination" file="pack-com.mkiv"> + <cd:command name="definecombination" 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="setupcombination" file="pack-com.mkiv"> + <cd:command name="setupcombination" level="style" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -74,7 +74,7 @@ <!-- - <cd:command name="setupcombinations" file="pack-com.mkiv"> + <cd:command name="setupcombinations" level="style" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -85,7 +85,7 @@ --> - <cd:command name="combination" type="environment" variant="matrix" file="pack-com.mkiv"> + <cd:command name="combination" type="environment" variant="matrix" level="document" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords optional="yes"> @@ -94,7 +94,7 @@ </cd:arguments> </cd:command> - <cd:command name="combination" type="environment" file="pack-com.mkiv"> + <cd:command name="combination" type="environment" level="document" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -105,13 +105,13 @@ <!-- - <cd:command name="content" type="environment" scope="combination" file="pack-com.mkiv"/> + <cd:command name="content" type="environment" scope="combination" level="document" category="tables" file="pack-com.mkiv"/> - <cd:command name="caption" type="environment" scope="combination" file="pack-com.mkiv"/> + <cd:command name="caption" type="environment" scope="combination" level="document" category="tables" file="pack-com.mkiv"/> --> - <cd:command name="floatcombination" type="environment" variant="matrix" file="pack-com.mkiv"> + <cd:command name="floatcombination" type="environment" variant="matrix" level="document" category="float tables" 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" file="pack-com.mkiv"> + <cd:command name="floatcombination" type="environment" level="document" category="float tables" 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-commandhandler.xml b/tex/context/interface/mkiv/i-commandhandler.xml index 6550898b6..40da525f3 100644 --- a/tex/context/interface/mkiv/i-commandhandler.xml +++ b/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" file="mult-aux.mkiv"> + <cd:command name="installparameterhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installrootparameterhandler" file="mult-aux.mkiv"> + <cd:command name="installrootparameterhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installparameterhashhandler" file="mult-aux.mkiv"> + <cd:command name="installparameterhashhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installparametersethandler" file="mult-aux.mkiv"> + <cd:command name="installparametersethandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installstyleandcolorhandler" file="mult-aux.mkiv"> + <cd:command name="installstyleandcolorhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdefinehandler" file="mult-aux.mkiv"> + <cd:command name="installdefinehandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installsetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installswitchsetuphandler" file="mult-aux.mkiv"> + <cd:command name="installswitchsetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installautosetuphandler" file="mult-aux.mkiv"> + <cd:command name="installautosetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installbasicparameterhandler" file="mult-aux.mkiv"> + <cd:command name="installbasicparameterhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installbasicautosetuphandler" file="mult-aux.mkiv"> + <cd:command name="installbasicautosetuphandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installcommandhandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installswitchcommandhandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installautocommandhandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installsimplecommandhandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installdirectparameterhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectsetuphandler" file="mult-aux.mkiv"> + <cd:command name="installdirectsetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectparametersethandler" file="mult-aux.mkiv"> + <cd:command name="installdirectparametersethandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectstyleandcolorhandler" file="mult-aux.mkiv"> + <cd:command name="installdirectstyleandcolorhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectcommandhandler" file="mult-aux.mkiv"> + <cd:command name="installdirectcommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installsetuponlycommandhandler" file="mult-aux.mkiv"> + <cd:command name="installsetuponlycommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="relateparameterhandlers" file="mult-aux.mkiv"> + <cd:command name="relateparameterhandlers" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installactionhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installnamespace" file="mult-aux.mkiv"> + <cd:command name="installnamespace" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installcorenamespace" file="mult-aux.mkiv"> + <cd:command name="installcorenamespace" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definenamespace" file="mult-aux.mkiv"> + <cd:command name="definenamespace" level="system" 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" file="mult-aux.mkiv"/> + <cd:command name="listnamespaces" level="system" file="mult-aux.mkiv"/> - <cd:command name="showparentchain" file="mult-aux.mkiv"> + <cd:command name="showparentchain" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecommandhandler" file="mult-aux.mkiv"> + <cd:command name="doifelsecommandhandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="doifcommandhandlerelse" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="doifcommandhandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="doifnotcommandhandler" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installdefinitionset" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdefinitionsetmember" file="mult-aux.mkiv"> + <cd:command name="installdefinitionsetmember" level="system" 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" file="mult-aux.mkiv"> + <cd:command name="installparentinjector" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installframedcommandhandler" file="pack-rul.mkiv"> + <cd:command name="installframedcommandhandler" level="system" 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" file="pack-rul.mkiv"> + <cd:command name="installframedautocommandhandler" level="system" 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" file="pack-rul.mkiv"> + <cd:command name="installsimpleframedcommandhandler" level="system" file="pack-rul.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> diff --git a/tex/context/interface/mkiv/i-comment.xml b/tex/context/interface/mkiv/i-comment.xml index e7f18fb0e..a1eb14d23 100644 --- a/tex/context/interface/mkiv/i-comment.xml +++ b/tex/context/interface/mkiv/i-comment.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecomment" file="scrn-wid.mkvi"> + <cd:command name="definecomment" 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="setupcomment" file="scrn-wid.mkvi"> + <cd:command name="setupcomment" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -87,13 +87,19 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="space"> + <cd:constant type="yes"/> + </cd:parameter> + <cd:parameter name="buffer"> + <cd:constant type="cd:buffer"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="comment" generated="yes" variant="example" file="scrn-wid.mkvi"> + <cd:command name="comment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:sequence> - <cd:variable value="comment"/> + <cd:instance value="comment"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-text-optional"/> @@ -103,13 +109,13 @@ <cd:resolve name="argument-text"/> </cd:arguments> <cd:instances> - <cd:constant value="comment"/> + <cd:resolve name="instance-comment"/> </cd:instances> </cd:command> - <cd:command name="comment" type="environment" generated="yes" variant="example" file="scrn-wid.mkvi"> + <cd:command name="comment" type="environment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:sequence> - <cd:variable value="comment"/> + <cd:instance value="comment"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-text-optional"/> @@ -118,29 +124,33 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="comment"/> + <cd:resolve name="instance-comment"/> </cd:instances> </cd:command> - <cd:command name="placecomments" file="scrn-wid.mkvi"/> + <cd:command name="placecomments" level="document" category="pdf" file="scrn-wid.mkvi"/> - <cd:command name="comment" 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" 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: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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml index b3b2cd5bc..de000148b 100644 --- a/tex/context/interface/mkiv/i-common-argument.xml +++ b/tex/context/interface/mkiv/i-common-argument.xml @@ -89,32 +89,6 @@ </cd:keywords> </cd:define> - <!-- @WS: These were unresolved. Shouldn't they become text? --> - - <cd:define name="argument-content"> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> - </cd:keywords> - </cd:define> - - <cd:define name="argument-content-optional"> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - </cd:define> - - <cd:define name="argument-content-list"> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> - </cd:keywords> - </cd:define> - - <cd:define name="argument-content-list-optional"> - <cd:keywords delimiters="braces" list="yes" optional="yes"> - <cd:content/> - </cd:keywords> - </cd:define> - <!-- * --> <!-- \... {...} --> <!-- --> @@ -547,4 +521,15 @@ </cd:keywords> </cd:define> -</cd:interface> + <!-- * --> + <!-- \... {...} --> + <!-- --> + <!-- * TOCHAR --> + + <cd:define name="argument-tochar"> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-tochar"/> + </cd:keywords> + </cd:define> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-definitions.xml b/tex/context/interface/mkiv/i-common-definitions.xml index 9f6d461f9..54e729aa4 100644 --- a/tex/context/interface/mkiv/i-common-definitions.xml +++ b/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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-instance.xml b/tex/context/interface/mkiv/i-common-instance.xml index 8cde55b2e..dc8cead79 100644 --- a/tex/context/interface/mkiv/i-common-instance.xml +++ b/tex/context/interface/mkiv/i-common-instance.xml @@ -2,6 +2,50 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + <cd:define name="instance-attachment"> + <cd:constant value="attachment"/> + </cd:define> + + <cd:define name="instance-bar"> + <cd:constant value="overbar"/> + <cd:constant value="underbar"/> + <cd:constant value="overstrike"/> + <cd:constant value="understrike"/> + <cd:constant value="overbars"/> + <cd:constant value="underbars"/> + <cd:constant value="overstrikes"/> + <cd:constant value="understrikes"/> + <cd:constant value="underrandom"/> + <cd:constant value="underrandoms"/> + <cd:constant value="underdash"/> + <cd:constant value="underdashes"/> + <cd:constant value="underdot"/> + <cd:constant value="underdots"/> + <cd:constant value="nobar"/> + <cd:constant value="hiddenbar"/> + </cd:define> + + <cd:define name="instance-buffer"> + <cd:constant value="hiding"/> + </cd:define> + + <cd:define name="instance-comment"> + <cd:constant value="comment"/> + </cd:define> + + <cd:define name="instance-delimitedtext"> + <cd:constant value="quotation"/> + <cd:constant value="quote"/> + <cd:constant value="blockquote"/> + <cd:constant value="speech"/> + <cd:constant value="aside"/> + </cd:define> + + <cd:define name="instance-fittingpage"> + <cd:constant value="TEXpage"/> + <cd:constant value="MPpage"/> + </cd:define> + <cd:define name="instance-float"> <cd:constant value="chemical"/> <cd:constant value="figure"/> @@ -10,79 +54,170 @@ <cd:constant value="graphic"/> </cd:define> + <cd:define name="instance-floatlist"> + <cd:constant value="chemicals"/> + <cd:constant value="figures"/> + <cd:constant value="tables"/> + <cd:constant value="intermezzi"/> + <cd:constant value="graphics"/> + </cd:define> + + <cd:define name="instance-formula"> + <cd:constant value="sp"/> + <cd:constant value="sd"/> + <cd:constant value="mp"/> + <cd:constant value="md"/> + </cd:define> + + <cd:define name="instance-fraction"> + <cd:constant value="xfrac"/> + <cd:constant value="xxfrac"/> + <cd:constant value="frac"/> + <cd:constant value="sfrac"/> + <cd:constant value="dfrac"/> + <cd:constant value="binom"/> + <cd:constant value="dbinom"/> + <cd:constant value="tbinom"/> + </cd:define> + + <cd:define name="instance-mathframed"> + <cd:constant value="mframed"/> + <cd:constant value="inmframed"/> + <cd:constant value="mcframed"/> + </cd:define> + + <cd:define name="instance-framedtext"> + <cd:constant value="framedtext"/> + </cd:define> + + <cd:define name="instance-framed"> + <cd:constant value="unframed"/> + <cd:constant value="fitfieldframed"/> + </cd:define> + + <cd:define name="instance-help"> + <cd:constant value="helptext"/> + </cd:define> + <cd:define name="instance-itemgroup"> <cd:constant value="itemize"/> </cd:define> - <cd:define name="instance-labeltext"> - <!-- tode --> + <cd:define name="instance-labelclass"> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> </cd:define> - <cd:define name="instance-labelclass"> - <!-- tode --> + <cd:define name="instance-labeltext"> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> </cd:define> <cd:define name="instance-lines"> - <!-- tode --> + <cd:constant value="lines"/> </cd:define> <cd:define name="instance-combinedlist"> - <!-- tode --> + <cd:constant value="content"/> </cd:define> <cd:define name="instance-low"> - <!-- tode --> + <cd:constant value="unitslow"/> </cd:define> <cd:define name="instance-high"> - <!-- tode --> + <cd:constant value="unitshigh"/> </cd:define> <cd:define name="instance-makeup"> - <!-- tode --> + <cd:constant value="standard"/> + <cd:constant value="page"/> + <cd:constant value="text"/> + <cd:constant value="middle"/> </cd:define> <cd:define name="instance-margindata"> - <!-- tode --> + <cd:constant value="inleftmargin"/> + <cd:constant value="inrightmargin"/> + <cd:constant value="inoutermargin"/> + <cd:constant value="ininnermargin"/> + <cd:constant value="inleftedge"/> + <cd:constant value="inrightedge"/> + <cd:constant value="inouteredge"/> + <cd:constant value="ininneredge"/> + <cd:constant value="atleftmargin"/> + <cd:constant value="atrightmargin"/> + <cd:constant value="inleft"/> + <cd:constant value="inright"/> + <cd:constant value="inouter"/> + <cd:constant value="ininner"/> + <cd:constant value="inmargin"/> + <cd:constant value="inother"/> + <cd:constant value="margintext"/> + <!-- + <cd:constant value="marginword"/> + <cd:constant value="margintitle"/> + <cd:constant value="inothermargin"/> + --> </cd:define> <cd:define name="instance-mathalignment"> - <!-- tode --> + <cd:constant value="align"/> + <cd:constant value="mathalignment"/> </cd:define> <cd:define name="instance-mathcases"> - <!-- tode --> + <cd:constant value="cases"/> + <cd:constant value="mathcases"/> </cd:define> <cd:define name="instance-mathmatrix"> - <!-- tode --> + <cd:constant value="matrix"/> + <cd:constant value="mathmatrix"/> </cd:define> <cd:define name="instance-mixedcolumns"> - <!-- tode --> + <cd:constant value="itemgroupcolumns"/> + <cd:constant value="boxedcolumns"/> </cd:define> <cd:define name="instance-note"> - <!-- tode --> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> </cd:define> <cd:define name="instance-linenote"> - <!-- tode --> + <cd:constant value="linenote"/> </cd:define> <cd:define name="instance-pairedbox"> - <!-- tode --> + <cd:constant value="legend"/> </cd:define> <cd:define name="instance-register"> - <!-- tode --> + <cd:constant value="index"/> </cd:define> <cd:define name="instance-script"> - <!-- tode --> + <cd:constant value="hangul"/> + <cd:constant value="hanzi"/> + <cd:constant value="nihongo"/> + <cd:constant value="ethiopic"/> + <cd:constant value="thai"/> + <cd:constant value="latin"/> + <cd:constant value="test"/> </cd:define> <cd:define name="instance-section"> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -98,43 +233,201 @@ </cd:define> <cd:define name="instance-sectionblock"> - <!-- tode --> + <cd:constant value="frontmatter"/> + <cd:constant value="bodymatter"/> + <cd:constant value="appendices"/> + <cd:constant value="backmatter"/> </cd:define> <cd:define name="instance-shift"> - <!-- tode --> + <cd:constant value="shiftup"/> + <cd:constant value="shiftdown"/> </cd:define> <cd:define name="instance-sort"> - <!-- tode --> + <cd:constant value="logo"/> </cd:define> <cd:define name="instance-sortlist"> - <!-- tode --> + <cd:constant value="logos"/> </cd:define> <cd:define name="instance-synonym"> - <!-- tode --> + <cd:constant value="abbreviation"/> </cd:define> <cd:define name="instance-synonymlist"> - <!-- tode --> + <cd:constant value="abbreviations"/> </cd:define> <cd:define name="instance-tabulate"> - <!-- tode --> + <cd:constant value="legend"/> + <cd:constant value="fact"/> </cd:define> <cd:define name="instance-tooltip"> - <!-- tode --> + <cd:constant value="tooltip"/> </cd:define> <cd:define name="instance-unit"> - <!-- tode --> + <cd:constant value="unit"/> </cd:define> <cd:define name="instance-typing"> - <!-- tode --> + <cd:constant value="typing"/> + <cd:constant value="LUA"/> + <cd:constant value="MP"/> + <cd:constant value="PARSEDXML"/> + <cd:constant value="TEX"/> + <cd:constant value="XML"/> + </cd:define> + + <cd:define name="instance-mathextensible"> + <!-- reverse --> + <cd:constant value="xrel"/> + <cd:constant value="xequal"/> + <cd:constant value="xleftarrow"/> + <cd:constant value="xrightarrow"/> + <cd:constant value="xleftrightarrow"/> + <cd:constant value="xLeftarrow"/> + <cd:constant value="xRightarrow"/> + <cd:constant value="xLeftrightarrow"/> + <cd:constant value="xtwoheadleftarrow"/> + <cd:constant value="xtwoheadrightarrow"/> + <cd:constant value="xmapsto"/> + <cd:constant value="xhookleftarrow"/> + <cd:constant value="xhookrightarrow"/> + <cd:constant value="xleftharpoondown"/> + <cd:constant value="xleftharpoonup"/> + <cd:constant value="xrightharpoondown"/> + <cd:constant value="xrightharpoonup"/> + <cd:constant value="xrightoverleftarrow"/> + <cd:constant value="xleftrightharpoons"/> + <cd:constant value="xrightleftharpoons"/> + <cd:constant value="xtriplerel"/> + <!-- mathematics --> + <cd:constant value="mrel"/> + <cd:constant value="mequal"/> + <cd:constant value="mleftarrow"/> + <cd:constant value="mrightarrow"/> + <cd:constant value="mleftrightarrow"/> + <cd:constant value="mLeftarrow"/> + <cd:constant value="mRightarrow"/> + <cd:constant value="mLeftrightarrow"/> + <cd:constant value="mtwoheadleftarrow"/> + <cd:constant value="mtwoheadrightarrow"/> + <cd:constant value="mmapsto"/> + <cd:constant value="mhookleftarrow"/> + <cd:constant value="mhookrightarrow"/> + <cd:constant value="mleftharpoondown"/> + <cd:constant value="mleftharpoonup"/> + <cd:constant value="mrightharpoondown"/> + <cd:constant value="mrightharpoonup"/> + <cd:constant value="mrightoverleftarrow"/> + <cd:constant value="mleftrightharpoons"/> + <cd:constant value="mrightleftharpoons"/> + <cd:constant value="mtriplerel"/> + <cd:constant value="eleftarrowfill"/> + <cd:constant value="erightarrowfill"/> + <cd:constant value="eleftrightarrowfill"/> + <cd:constant value="etwoheadrightarrowfill"/> + <cd:constant value="eleftharpoondownfill"/> + <cd:constant value="eleftharpoonupfill"/> + <cd:constant value="erightharpoondownfill"/> + <cd:constant value="erightharpoonupfill"/> + <cd:constant value="eoverbarfill"/> + <cd:constant value="eunderbarfill"/> + <cd:constant value="eoverbracefill"/> + <cd:constant value="eunderbracefill"/> + <cd:constant value="eoverparentfill"/> + <cd:constant value="eunderparentfill"/> + <cd:constant value="eoverbracketfill"/> + <cd:constant value="eunderbracketfill"/> + <!-- text --> + <cd:constant value="trel"/> + <cd:constant value="tequal"/> + <cd:constant value="tmapsto"/> + <cd:constant value="tleftarrow"/> + <cd:constant value="trightarrow"/> + <cd:constant value="tleftrightarrow"/> + <cd:constant value="tLeftarrow"/> + <cd:constant value="tRightarrow"/> + <cd:constant value="tLeftrightarrow"/> + <cd:constant value="ttwoheadleftarrow"/> + <cd:constant value="ttwoheadrightarrow"/> + <cd:constant value="thookleftarrow"/> + <cd:constant value="thookrightarrow"/> + <cd:constant value="tleftharpoondown"/> + <cd:constant value="tleftharpoonup"/> + <cd:constant value="trightharpoondown"/> + <cd:constant value="trightharpoonup"/> + <cd:constant value="trightoverleftarrow"/> + <cd:constant value="tleftrightharpoons"/> + <cd:constant value="trightleftharpoons"/> + <cd:constant value="ttriplerel"/> + <!-- chemistry --> + <cd:constant value="cleftarrow"/> + <cd:constant value="crightarrow"/> + <cd:constant value="crightoverleftarrow"/> + </cd:define> + + <cd:define name="instance-mathdoubleextensible"> + <!-- vfenced --> + <cd:constant value="doublebar"/> + <cd:constant value="doublebrace"/> + <cd:constant value="doubleparent"/> + <cd:constant value="doublebracket"/> + <!-- both --> + <cd:constant value="overbarunderbar"/> + <cd:constant value="overbraceunderbrace"/> + <cd:constant value="overparentunderparent"/> + <cd:constant value="overbracketunderbracket"/> + </cd:define> + + <cd:define name="instance-mathoverextensible"> + <!-- top --> + <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"/> + <!-- vfenced --> + <cd:constant value="overbar"/> + <cd:constant value="overbrace"/> + <cd:constant value="overparent"/> + <cd:constant value="overbracket"/> + <!-- bothtext --> + <cd:constant value="overbartext"/> + <cd:constant value="overbracetext"/> + <cd:constant value="overparenttext"/> + <cd:constant value="overbrackettext"/> + </cd:define> + + <cd:define name="instance-mathunderextensible"> + <!-- bottom --> + <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"/> + <!-- vfenced --> + <cd:constant value="underbar"/> + <cd:constant value="underbrace"/> + <cd:constant value="underparent"/> + <cd:constant value="underbracket"/> + <!-- bothtext --> + <cd:constant value="underbartext"/> + <cd:constant value="underbracetext"/> + <cd:constant value="underparenttext"/> + <cd:constant value="underbrackettext"/> </cd:define> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-keyword.xml b/tex/context/interface/mkiv/i-common-keyword.xml index e087ea5ac..97ac50caa 100644 --- a/tex/context/interface/mkiv/i-common-keyword.xml +++ b/tex/context/interface/mkiv/i-common-keyword.xml @@ -750,4 +750,46 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... [...] --> + <!-- --> + <!-- * SCITE --> + + <cd:define name="keyword-scite-optional"> + <cd:keywords optional="yes"> + <cd:constant type="none"/> + <cd:constant type="tex"/> + <cd:constant type="mkiv"/> + <cd:constant type="mkvi"/> + <cd:constant type="mkxi"/> + <cd:constant type="mkix"/> + <cd:constant type="mkii"/> + <cd:constant type="cld"/> + <cd:constant type="lua"/> + <cd:constant type="lfg"/> + <cd:constant type="lus"/> + <cd:constant type="mp"/> + <cd:constant type="mkiv"/> + <cd:constant type="mkii"/> + <cd:constant type="w"/> + <cd:constant type="ww"/> + <cd:constant type="c"/> + <cd:constant type="h"/> + <cd:constant type="cpp"/> + <cd:constant type="hpp"/> + <cd:constant type="cxx"/> + <cd:constant type="hxx"/> + <cd:constant type="xml"/> + <cd:constant type="lmx"/> + <cd:constant type="ctx"/> + <cd:constant type="xsl"/> + <cd:constant type="xsd"/> + <cd:constant type="rlx"/> + <cd:constant type="css"/> + <cd:constant type="dtd"/> + <cd:constant type="bib"/> + <cd:constant type="rme"/> + </cd:keywords> + </cd:define> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-string.xml b/tex/context/interface/mkiv/i-common-string.xml index 68bde02ed..5ef1fc71a 100644 --- a/tex/context/interface/mkiv/i-common-string.xml +++ b/tex/context/interface/mkiv/i-common-string.xml @@ -152,4 +152,21 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... ... --> + <!-- --> + <!-- * ASSIGNMENT --> + + <cd:define name="string-assignment"> + <cd:keywords delimiters="none"> + <cd:constant type="="/> + </cd:keywords> + </cd:define> + + <cd:define name="string-assignment-optional"> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="="/> + </cd:keywords> + </cd:define> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml index 36f2c1d52..c362779c4 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -296,10 +296,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <cd:constant type="somewhere"/> <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> </cd:define> <!-- sortorder = ... --> @@ -413,6 +413,11 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant type="line" prefix="math" method="range"/> + <cd:constant type="halfline" prefix="math" method="range"/> + <cd:constant type="-line" prefix="math" method="range"/> + <cd:constant type="-halfline" prefix="math" method="range"/> <cd:constant type="cd:name"/> </cd:define> @@ -582,6 +587,11 @@ <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="depth"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="line" prefix="-" method="none"/> + <cd:constant type="halfline" prefix="-" method="none"/> <cd:inherit name="setupbodyfont"/> </cd:define> @@ -593,4 +603,84 @@ <cd:constant type="cd:reference"/> </cd:define> + <!-- shape = ... --> + + <cd:define name="value-flowshape"> + <cd:constant type="none"/> + <cd:constant type="node"/> + <cd:constant type="action"/> + <cd:constant type="procedure"/> + <cd:constant type="product"/> + <cd:constant type="subprocedure"/> + <cd:constant type="singledocument"/> + <cd:constant type="multidocument"/> + <cd:constant type="decision"/> + <cd:constant type="archive"/> + <cd:constant type="loop"/> + <cd:constant type="wait"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="cd:number"/> + </cd:define> + + <!-- location = ... --> + + <cd:define name="value-chartlabel"> + <cd:constant type="l"/> + <cd:constant type="r"/> + <cd:constant type="t"/> + <cd:constant type="b"/> + <cd:constant type="lt"/> + <cd:constant type="rt"/> + <cd:constant type="lb"/> + <cd:constant type="rb"/> + <cd:constant type="tl"/> + <cd:constant type="tr"/> + <cd:constant type="bl"/> + <cd:constant type="br"/> + <!-- text only + <cd:constant type="c"/> + <cd:constant type="m"/> + --> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <!-- text only + <cd:constant type="center"/> + <cd:constant type="middle"/> + --> + </cd:define> + + <!-- tochar = ... --> + + <cd:define name="value-tochar"> + <cd:constant prefix="e" type="cd:name" method="range"/> + <cd:constant prefix="x" type="cd:number" method="range"/> + <cd:constant prefix="d" type="cd:number" method="range"/> + <cd:constant prefix="s" type="cd:number" method="range"/> + <cd:constant prefix="i" type="cd:number" method="range"/> + <cd:constant prefix="n" type="cd:name" method="range"/> + <cd:constant prefix="c" type="cd:name" method="range"/> + <cd:constant prefix="u" type="cd:name" method="range"/> + <cd:constant prefix="a" type="cd:name" method="range"/> + </cd:define> + + <!-- option = ... --> + + <cd:define name="value-verbatim"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:define> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-context-modules.xml b/tex/context/interface/mkiv/i-context-modules.xml new file mode 100644 index 000000000..85194c6ec --- /dev/null +++ b/tex/context/interface/mkiv/i-context-modules.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<!-- + + Right from the start the ConTeXt user interface was sytematic enough to be described using a + common framework. First it was done in the TeX language at the top of the files where features + were implemented. Later we switched to XML where all definitions were moved to one file. That + file could be translated to different user interfaces. + + The current XML files are a follow up on this. Instead of one big file we now have many small + files, and support for shared (XML) definitions has been extended. Many more commands are defined, + including those considered low level. There are no longer translated files needed but you can + still generate them. + + These files can be used to generate overviews (see x-setups-*.mkiv) but also for generating + information for text editors. We also use them for the (local) help service. + + Wolfgang Schuster & Hans Hagen + +--> + + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:interfacefile filename="i-common-definitions.xml"/> + + <cd:interfacefile filename="i-chart.xml"/> + <cd:interfacefile filename="i-database.xml"/> + <cd:interfacefile filename="i-hemistich.xml"/> + <cd:interfacefile filename="i-ipsum.xml"/> + <cd:interfacefile filename="i-scite.xml"/> + <cd:interfacefile filename="i-setup.xml"/> + <cd:interfacefile filename="i-spreadsheet.xml"/> + <cd:interfacefile filename="i-steps.xml"/> + <cd:interfacefile filename="i-translate.xml"/> + <cd:interfacefile filename="i-visual.xml"/> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 9d3fa3314..20a83a632 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml index f1e85658f..ba09abcba 100644 --- a/tex/context/interface/mkiv/i-context.xml +++ b/tex/context/interface/mkiv/i-context.xml @@ -86,6 +86,7 @@ <cd:interfacefile filename="i-formula.xml"/> <cd:interfacefile filename="i-fraction.xml"/> <cd:interfacefile filename="i-framed.xml"/> + <cd:interfacefile filename="i-framedtable.xml"/> <cd:interfacefile filename="i-graphics.xml"/> <cd:interfacefile filename="i-grid.xml"/> <cd:interfacefile filename="i-help.xml"/> @@ -159,6 +160,7 @@ <cd:interfacefile filename="i-pageselection.xml"/> <cd:interfacefile filename="i-pageshift.xml"/> <cd:interfacefile filename="i-pagestate.xml"/> + <cd:interfacefile filename="i-pagemarks.xml"/> <cd:interfacefile filename="i-pairedbox.xml"/> <cd:interfacefile filename="i-papersize.xml"/> <cd:interfacefile filename="i-paragraph.xml"/> @@ -202,6 +204,7 @@ <cd:interfacefile filename="i-string.xml"/> <cd:interfacefile filename="i-strut.xml"/> <cd:interfacefile filename="i-symbol.xml"/> + <cd:interfacefile filename="i-synctex.xml"/> <cd:interfacefile filename="i-synonym.xml"/> <cd:interfacefile filename="i-system.xml"/> <cd:interfacefile filename="i-systemlog.xml"/> @@ -231,4 +234,4 @@ <cd:interfacefile filename="i-xml.xml"/> <cd:interfacefile filename="i-xtable.xml"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-conversion.xml b/tex/context/interface/mkiv/i-conversion.xml index 47440ddac..a2e975368 100644 --- a/tex/context/interface/mkiv/i-conversion.xml +++ b/tex/context/interface/mkiv/i-conversion.xml @@ -4,271 +4,271 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="numbers" file="core-con.mkiv"> + <cd:command name="numbers" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Numbers" file="core-con.mkiv"> + <cd:command name="Numbers" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="romannumerals" file="core-con.mkiv"> + <cd:command name="romannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Romannumerals" file="core-con.mkiv"> + <cd:command name="Romannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnumerals" file="core-con.mkiv"> + <cd:command name="abjadnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnodotnumerals" file="core-con.mkiv"> + <cd:command name="abjadnodotnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnaivenumerals" file="core-con.mkiv"> + <cd:command name="abjadnaivenumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="languagecharacters" file="core-con.mkiv"> + <cd:command name="languagecharacters" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="languageCharacters" file="core-con.mkiv"> + <cd:command name="languageCharacters" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="alphabeticnumerals" file="core-con.mkiv"> + <cd:command name="alphabeticnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Alphabeticnumerals" file="core-con.mkiv"> + <cd:command name="Alphabeticnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="thainumerals" file="core-con.mkiv"> + <cd:command name="thainumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="devanagarinumerals" file="core-con.mkiv"> + <cd:command name="devanagarinumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="gurmurkhinumerals" file="core-con.mkiv"> + <cd:command name="gurmurkhinumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="gujaratinumerals" file="core-con.mkiv"> + <cd:command name="gujaratinumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="tibetannumerals" file="core-con.mkiv"> + <cd:command name="tibetannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="greeknumerals" file="core-con.mkiv"> + <cd:command name="greeknumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Greeknumerals" file="core-con.mkiv"> + <cd:command name="Greeknumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicnumerals" file="core-con.mkiv"> + <cd:command name="arabicnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="persiannumerals" file="core-con.mkiv"> + <cd:command name="persiannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicdecimals" file="core-con.mkiv"> + <cd:command name="arabicdecimals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="persiandecimals" file="core-con.mkiv"> + <cd:command name="persiandecimals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicexnumerals" file="core-con.mkiv"> + <cd:command name="arabicexnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumerals" file="core-con.mkiv"> + <cd:command name="koreannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumeralsp" file="core-con.mkiv"> + <cd:command name="koreannumeralsp" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumeralsc" file="core-con.mkiv"> + <cd:command name="koreannumeralsc" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreanparentnumerals" file="core-con.mkiv"> + <cd:command name="koreanparentnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreancirclenumerals" file="core-con.mkiv"> + <cd:command name="koreancirclenumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chinesenumerals" file="core-con.mkiv"> + <cd:command name="chinesenumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chinesecapnumerals" file="core-con.mkiv"> + <cd:command name="chinesecapnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chineseallnumerals" file="core-con.mkiv"> + <cd:command name="chineseallnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="character" file="core-con.mkiv"> + <cd:command name="character" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Character" file="core-con.mkiv"> + <cd:command name="Character" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="characters" file="core-con.mkiv"> + <cd:command name="characters" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Characters" file="core-con.mkiv"> + <cd:command name="Characters" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="monthlong" 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" file="core-con.mkiv"> + <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" file="core-con.mkiv"> + <cd:command name="convertmonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="month" 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" 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="MONTHLONG" 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" file="core-con.mkiv"> + <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="weekday" file="core-con.mkiv"> + <cd:command name="weekday" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="WEEKDAY" file="core-con.mkiv"> + <cd:command name="WEEKDAY" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="dayoftheweek" file="core-con.mkiv"> + <cd:command name="dayoftheweek" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -276,7 +276,7 @@ </cd:arguments> </cd:command> - <cd:command name="getdayoftheweek" file="core-con.mkiv"> + <cd:command name="getdayoftheweek" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -284,7 +284,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseleapyear" file="core-con.mkiv"> + <cd:command name="doifelseleapyear" level="style" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -292,7 +292,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifleapyearelse" file="core-con.mkiv"> + <cd:command name="doifleapyearelse" level="style" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -300,21 +300,21 @@ </cd:arguments> </cd:command> - <cd:command name="dayspermonth" file="core-con.mkiv"> + <cd:command name="dayspermonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="getdayspermonth" file="core-con.mkiv"> + <cd:command name="getdayspermonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="currentdate" file="core-con.mkiv"> + <cd:command name="currentdate" level="document" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="year"/> @@ -358,7 +358,7 @@ </cd:arguments> </cd:command> - <cd:command name="date" file="core-con.mkiv"> + <cd:command name="date" level="document" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="d"> @@ -377,7 +377,7 @@ </cd:arguments> </cd:command> - <cd:command name="rawdate" file="core-con.mkiv"> + <cd:command name="rawdate" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="currentdate"/> @@ -385,7 +385,7 @@ </cd:arguments> </cd:command> - <cd:command name="currenttime" file="core-con.mkiv"> + <cd:command name="currenttime" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="h"/> @@ -395,7 +395,7 @@ </cd:arguments> </cd:command> - <cd:command name="processmonth" file="core-con.mkiv"> + <cd:command name="processmonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -403,7 +403,7 @@ </cd:arguments> </cd:command> - <cd:command name="processyear" file="core-con.mkiv"> + <cd:command name="processyear" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-command"/> @@ -412,7 +412,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineconversion" file="core-con.mkiv"> + <cd:command name="defineconversion" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-name"/> @@ -420,7 +420,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineconversion" variant="list" file="core-con.mkiv"> + <cd:command name="defineconversion" variant="list" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-name"/> @@ -428,7 +428,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertnumber" file="core-con.mkiv"> + <cd:command name="convertnumber" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="empty"/> @@ -508,7 +508,7 @@ </cd:arguments> </cd:command> - <cd:command name="uconvertnumber" file="core-con.mkiv"> + <cd:command name="uconvertnumber" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:inherit name="convertnumber"/> @@ -517,7 +517,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseconversiondefined" file="core-con.mkiv"> + <cd:command name="doifelseconversiondefined" level="system" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -525,7 +525,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifconversiondefinedelse" file="core-con.mkiv"> + <cd:command name="doifconversiondefinedelse" level="system" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -533,7 +533,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseconversionnumber" file="core-con.mkiv"> + <cd:command name="doifelseconversionnumber" level="system" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -542,7 +542,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifconversionnumberelse" file="core-con.mkiv"> + <cd:command name="doifconversionnumberelse" level="system" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -551,7 +551,7 @@ </cd:arguments> </cd:command> - <cd:command name="wordtonumber" file="core-con.mkiv"> + <cd:command name="wordtonumber" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="one"/> @@ -564,82 +564,82 @@ </cd:arguments> </cd:command> - <cd:command name="highordinalstr" file="core-con.mkiv"> + <cd:command name="highordinalstr" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ordinalstr" file="core-con.mkiv"> + <cd:command name="ordinalstr" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ordinaldaynumber" file="core-con.mkiv"> + <cd:command name="ordinaldaynumber" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="verbosenumber" file="core-con.mkiv"> + <cd:command name="verbosenumber" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="VerboseNumber" file="core-con.mkiv"> + <cd:command name="VerboseNumber" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="smallcappedromannumerals" file="core-con.mkiv"> + <cd:command name="smallcappedromannumerals" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="smallcappedcharacters" file="core-con.mkiv"> + <cd:command name="smallcappedcharacters" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="sloveniannumerals" file="core-con.mkiv"> + <cd:command name="sloveniannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="slovenianNumerals" file="core-con.mkiv"> + <cd:command name="slovenianNumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="spanishnumerals" file="core-con.mkiv"> + <cd:command name="spanishnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="spanishNumerals" file="core-con.mkiv"> + <cd:command name="spanishNumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="unihex" file="core-con.mkiv"> + <cd:command name="unihex" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="continuednumber" file="core-con.mkiv"> + <cd:command name="continuednumber" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-counter.xml b/tex/context/interface/mkiv/i-counter.xml index 55630b511..ec841a597 100644 --- a/tex/context/interface/mkiv/i-counter.xml +++ b/tex/context/interface/mkiv/i-counter.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecounter" file="strc-num.mkiv"> + <cd:command name="definecounter" level="system" category="counter" file="strc-num.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="setupcounter" file="strc-num.mkiv"> + <cd:command name="setupcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecounter" file="strc-num.mkiv"> + <cd:command name="doifelsecounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -119,7 +119,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcounterelse" file="strc-num.mkiv"> + <cd:command name="doifcounterelse" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -127,21 +127,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifcounter" file="strc-num.mkiv"> + <cd:command name="doifcounter" level="system" category="counter 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" file="strc-num.mkiv"> + <cd:command name="doifnotcounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="setcounter" file="strc-num.mkiv"> + <cd:command name="setcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> @@ -149,7 +149,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcounterown" file="strc-num.mkiv"> + <cd:command name="setcounterown" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> @@ -157,7 +157,7 @@ </cd:arguments> </cd:command> - <cd:command name="restartcounter" file="strc-num.mkiv"> + <cd:command name="restartcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> @@ -165,165 +165,165 @@ </cd:arguments> </cd:command> - <cd:command name="resetcounter" file="strc-num.mkiv"> + <cd:command name="resetcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="incrementcounter" file="strc-num.mkiv"> + <cd:command name="incrementcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="decrementcounter" file="strc-num.mkiv"> + <cd:command name="decrementcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="rawcounter" file="strc-num.mkiv"> + <cd:command name="rawcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="lastcounter" file="strc-num.mkiv"> + <cd:command name="lastcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="firstcounter" file="strc-num.mkiv"> + <cd:command name="firstcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="nextcounter" file="strc-num.mkiv"> + <cd:command name="nextcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="prevcounter" file="strc-num.mkiv"> + <cd:command name="prevcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="countersubs" file="strc-num.mkiv"> + <cd:command name="countersubs" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="savecounter" file="strc-num.mkiv"> + <cd:command name="savecounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="restorecounter" file="strc-num.mkiv"> + <cd:command name="restorecounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showcounter" file="strc-num.mkiv"> + <cd:command name="showcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="incrementedcounter" file="strc-num.mkiv"> + <cd:command name="incrementedcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="decrementedcounter" file="strc-num.mkiv"> + <cd:command name="decrementedcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="rawcountervalue" file="strc-num.mkiv"> + <cd:command name="rawcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="lastcountervalue" file="strc-num.mkiv"> + <cd:command name="lastcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="firstcountervalue" file="strc-num.mkiv"> + <cd:command name="firstcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="nextcountervalue" file="strc-num.mkiv"> + <cd:command name="nextcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="prevcountervalue" file="strc-num.mkiv"> + <cd:command name="prevcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="rawsubcountervalue" file="strc-num.mkiv"> + <cd:command name="rawsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="lastsubcountervalue" file="strc-num.mkiv"> + <cd:command name="lastsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="firstsubcountervalue" file="strc-num.mkiv"> + <cd:command name="firstsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="nextsubcountervalue" file="strc-num.mkiv"> + <cd:command name="nextsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="prevsubcountervalue" file="strc-num.mkiv"> + <cd:command name="prevsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="convertedcounter" file="strc-num.mkiv"> + <cd:command name="convertedcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -332,7 +332,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertedsubcounter" file="strc-num.mkiv"> + <cd:command name="convertedsubcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -344,7 +344,7 @@ </cd:arguments> </cd:command> - <cd:command name="directconvertedcounter" file="strc-num.mkiv"> + <cd:command name="directconvertedcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -360,7 +360,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedefinedcounter" file="strc-num.mkiv"> + <cd:command name="doifelsedefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -368,7 +368,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdefinedcounterelse" file="strc-num.mkiv"> + <cd:command name="doifdefinedcounterelse" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -376,21 +376,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifdefinedcounter" file="strc-num.mkiv"> + <cd:command name="doifdefinedcounter" level="system" category="counter 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" file="strc-num.mkiv"> + <cd:command name="doifundefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="defineresetset" file="strc-ini.mkvi"> + <cd:command name="defineresetset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -403,7 +403,7 @@ <!-- - <cd:command name="definestructureresetset" file="strc-ini.mkvi"> + <cd:command name="definestructureresetset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -416,7 +416,7 @@ --> - <cd:command name="defineseparatorset" file="strc-ini.mkvi"> + <cd:command name="defineseparatorset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -433,7 +433,7 @@ <!-- - <cd:command name="definestructureseparatorset" file="strc-ini.mkvi"> + <cd:command name="definestructureseparatorset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -450,7 +450,7 @@ --> - <cd:command name="defineconversionset" file="strc-ini.mkvi"> + <cd:command name="defineconversionset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -469,7 +469,7 @@ <!-- - <cd:command name="definestructureconversionset" file="strc-ini.mkvi"> + <cd:command name="definestructureconversionset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -488,7 +488,7 @@ --> - <cd:command name="defineprefixset" file="strc-ini.mkvi"> + <cd:command name="defineprefixset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -501,7 +501,7 @@ <!-- - <cd:command name="definestructureprefixset" file="strc-ini.mkvi"> + <cd:command name="definestructureprefixset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -514,4 +514,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-database.xml b/tex/context/interface/mkiv/i-database.xml new file mode 100644 index 000000000..a81cd75f8 --- /dev/null +++ b/tex/context/interface/mkiv/i-database.xml @@ -0,0 +1,118 @@ +<?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="definedatabase" level="style" file="m-database.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupdatabase"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupdatabase" level="style" file="m-database.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="strip"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="separator"> + <cd:constant type="tab"/> + <cd:constant type="tabs"/> + <cd:constant type="comma"/> + <cd:constant type="space"/> + <cd:constant type="spaces"/> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="quotechar"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="commentchar"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="setups" list="yes"> + <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:parameter name="first"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="last"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="left"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="right"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:csname"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="processdatabasebuffer" level="document" 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: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:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupdatabase"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="processseparatedlist" level="document" 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:sequence> + <cd:instance value="separatedlist"/> + </cd:sequence> + </cd:command> + + <cd:command name="separatedlist" type="environment" level="document" 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:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupdatabase"/> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dataset.xml b/tex/context/interface/mkiv/i-dataset.xml index 6f4f9fb9f..c006454d3 100644 --- a/tex/context/interface/mkiv/i-dataset.xml +++ b/tex/context/interface/mkiv/i-dataset.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definedataset" file="core-dat.mkiv"> + <cd:command name="definedataset" level="system" file="core-dat.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="setupdataset" file="core-dat.mkiv"> + <cd:command name="setupdataset" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -26,7 +26,7 @@ </cd:arguments> </cd:command> - <cd:command name="setdataset" file="core-dat.mkiv"> + <cd:command name="setdataset" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="datasetvariable" file="core-dat.mkiv"> + <cd:command name="datasetvariable" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -48,4 +48,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-define.xml b/tex/context/interface/mkiv/i-define.xml index 2db8614c0..91975e752 100644 --- a/tex/context/interface/mkiv/i-define.xml +++ b/tex/context/interface/mkiv/i-define.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="define" file="core-sys.mkiv"> + <cd:command name="define" level="system" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:csname/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineexpandable" file="core-sys.mkiv"> + <cd:command name="defineexpandable" level="system" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:csname/> @@ -20,4 +20,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-delimitedtext.xml b/tex/context/interface/mkiv/i-delimitedtext.xml index d75fb957e..c34052644 100644 --- a/tex/context/interface/mkiv/i-delimitedtext.xml +++ b/tex/context/interface/mkiv/i-delimitedtext.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definedelimitedtext" file="typo-del.mkiv"> + <cd:command name="definedelimitedtext" level="style" category="language" file="typo-del.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="setupdelimitedtext" file="typo-del.mkiv"> + <cd:command name="setupdelimitedtext" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -90,26 +90,22 @@ </cd:arguments> </cd:command> - <cd:command name="delimitedtext" generated="yes" variant="example" file="typo-del.mkiv"> + <cd:command name="delimitedtext" generated="yes" variant="instance" level="document" category="language" file="typo-del.mkiv"> <cd:sequence> - <cd:variable value="delimitedtext"/> + <cd:instance value="delimitedtext"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="quotation"/> - <cd:constant value="quote"/> - <cd:constant value="blockquote"/> - <cd:constant value="speech"/> - <cd:constant value="aside"/> + <cd:resolve name="instance-delimitedtext"/> </cd:instances> </cd:command> - <cd:command name="delimitedtext" type="environment" generated="yes" variant="example" file="typo-del.mkiv"> + <cd:command name="delimitedtext" type="environment" generated="yes" variant="instance" level="document" category="language" file="typo-del.mkiv"> <cd:sequence> - <cd:variable value="delimitedtext"/> + <cd:instance value="delimitedtext"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-language-optional"/> @@ -118,15 +114,11 @@ </cd:keywords> </cd:arguments> <cd:instances> - <cd:constant value="quotation"/> - <cd:constant value="quote"/> - <cd:constant value="blockquote"/> - <cd:constant value="speech"/> - <cd:constant value="aside"/> + <cd:resolve name="instance-delimitedtext"/> </cd:instances> </cd:command> - <cd:command name="delimitedtext" file="typo-del.mkiv"> + <cd:command name="delimitedtext" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -134,7 +126,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimitedtext" type="environment" file="typo-del.mkiv"> + <cd:command name="delimitedtext" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -144,7 +136,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimited" file="typo-del.mkiv"> + <cd:command name="delimited" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -152,7 +144,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimited" type="environment" file="typo-del.mkiv"> + <cd:command name="delimited" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -162,83 +154,87 @@ </cd:arguments> </cd:command> - <cd:command name="quotation" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="quotation" type="environment" 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="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="quote" 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" type="environment" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - </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="blockquote" 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" type="environment" 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="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="speech" 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="aside" type="environment" 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" 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="speech" type="environment" 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="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="setupquotation" file="typo-del.mkiv"> + <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"> <cd:inherit name="setupdelimitedtext"/> @@ -246,7 +242,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupquote" file="typo-del.mkiv"> + <cd:command name="setupquote" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> @@ -254,12 +250,14 @@ </cd:arguments> </cd:command> - <cd:command name="subsentence" file="typo-del.mkiv"> + <cd:command name="subsentence" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="subsentence" type="environment" file="typo-del.mkiv"/> + <cd:command name="subsentence" type="environment" level="document" category="language" file="typo-del.mkiv"/> + + <cd:command name="midsubsentence" level="document" category="language" file="typo-del.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-description.xml b/tex/context/interface/mkiv/i-description.xml index 13b056d71..f2cf33e82 100644 --- a/tex/context/interface/mkiv/i-description.xml +++ b/tex/context/interface/mkiv/i-description.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definedescription" file="strc-des.mkvi"> + <cd:command name="definedescription" level="style" category="structure" file="strc-des.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="setupdescription" file="strc-des.mkvi"> + <cd:command name="setupdescription" level="style" category="structure" file="strc-des.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -84,6 +84,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </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:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -102,6 +108,9 @@ <cd:constant type="no" default="yes"/> <cd:constant type="xml"/> </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </cd:parameter> <cd:parameter name="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -127,7 +136,7 @@ <!-- - <cd:command name="setupdescriptions" file="strc-des.mkvi"> + <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"> @@ -138,7 +147,7 @@ --> - <cd:command name="description" type="environment" generated="yes" variant="example" file="strc-des.mkvi"> + <cd:command name="description" type="environment" generated="yes" variant="example" level="document" category="structure" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -147,7 +156,7 @@ </cd:arguments> </cd:command> - <cd:command name="description" type="environment" generated="yes" variant="example:title" file="strc-des.mkvi"> + <cd:command name="description" type="environment" generated="yes" variant="example:title" level="document" category="structure" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -157,7 +166,7 @@ </cd:arguments> </cd:command> - <cd:command name="description" generated="yes" variant="example" file="strc-des.mkvi"> + <cd:command name="description" generated="yes" variant="example" level="document" category="structure" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -169,4 +178,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-digits.xml b/tex/context/interface/mkiv/i-digits.xml index d9a4b9d2d..c917bf0d4 100644 --- a/tex/context/interface/mkiv/i-digits.xml +++ b/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" file="typo-dig.mkiv"> + <cd:command name="setdigitsmanipulation" level="system" file="typo-dig.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -13,14 +13,14 @@ </cd:arguments> </cd:command> - <cd:command name="resetdigitsmanipulation" file="typo-dig.mkiv"/> + <cd:command name="resetdigitsmanipulation" level="system" file="typo-dig.mkiv"/> - <cd:command name="equaldigits" file="typo-dig.mkiv"> + <cd:command name="equaldigits" level="document" file="typo-dig.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="dummydigit" file="typo-dig.mkiv"/> + <cd:command name="dummydigit" level="document" file="typo-dig.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dimension.xml b/tex/context/interface/mkiv/i-dimension.xml index 7bf59467b..1980687ab 100644 --- a/tex/context/interface/mkiv/i-dimension.xml +++ b/tex/context/interface/mkiv/i-dimension.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="assigndimension" file="mult-dim.mkvi"> + <cd:command name="assigndimension" level="system" file="mult-dim.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small" prefix="cd:sign" method="none"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="assignalfadimension" file="mult-dim.mkvi"> + <cd:command name="assignalfadimension" level="system" file="mult-dim.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small"/> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="assignwidth" file="mult-dim.mkvi"> + <cd:command name="assignwidth" level="system" file="mult-dim.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="fit"/> @@ -49,7 +49,7 @@ </cd:arguments> </cd:command> - <cd:command name="assignvalue" file="mult-dim.mkvi"> + <cd:command name="assignvalue" level="system" file="mult-dim.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small"/> @@ -64,4 +64,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-direction.xml b/tex/context/interface/mkiv/i-direction.xml index 630f07cb7..3b2d937a4 100644 --- a/tex/context/interface/mkiv/i-direction.xml +++ b/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" file="typo-dir.mkiv"> + <cd:command name="setupdirections" level="style" category="language alignment" file="typo-dir.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="bidi"> @@ -22,33 +22,37 @@ <cd:constant type="yes" default="yes"/> <cd:constant type="no"/> </cd:parameter> + <cd:parameter name="break"> + <cd:constant type="both" default="yes"/> + <cd:constant type="before"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setdirection" file="typo-dir.mkiv"> + <cd:command name="setdirection" level="style" category="language alignment" file="typo-dir.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="resetdirection" file="typo-dir.mkiv"/> + <cd:command name="resetdirection" level="style" category="language alignment" file="typo-dir.mkiv"/> <!-- - <cd:command name="lefttorightmark" file="typo-dir.mkiv"/> + <cd:command name="lefttorightmark" level="system" category="language alignment" file="typo-dir.mkiv"/> - <cd:command name="righttoleftmark" file="typo-dir.mkiv"/> + <cd:command name="righttoleftmark" level="system" category="language alignment" file="typo-dir.mkiv"/> - <cd:command name="lrm" file="typo-dir.mkiv"/> + <cd:command name="lrm" level="system" category="language alignment" file="typo-dir.mkiv"/> - <cd:command name="rlm" file="typo-dir.mkiv"/> + <cd:command name="rlm" level="system" category="language alignment" file="typo-dir.mkiv"/> --> - <cd:command name="showdirsinmargin" file="supp-dir.mkiv"/> + <cd:command name="showdirsinmargin" level="document" category="alignment" file="supp-dir.mkiv"/> - <cd:command name="istltdir" file="supp-dir.mkiv"> + <cd:command name="istltdir" level="system" category="alignment" file="supp-dir.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -57,7 +61,7 @@ </cd:arguments> </cd:command> - <cd:command name="istrtdir" file="supp-dir.mkiv"> + <cd:command name="istrtdir" level="system" category="alignment" file="supp-dir.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -66,4 +70,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-document.xml b/tex/context/interface/mkiv/i-document.xml index e2417ec63..fcd9e040b 100644 --- a/tex/context/interface/mkiv/i-document.xml +++ b/tex/context/interface/mkiv/i-document.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="text" type="environment" file="file-job.mkvi"/> + <cd:command name="text" type="environment" level="document" category="structure" file="file-job.mkvi"/> - <cd:command name="text" type="environment" begin="autostart" end="autostop" file="file-job.mkvi"/> + <cd:command name="text" type="environment" begin="autostart" end="autostop" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="notext" type="environment" file="file-job.mkvi"/> + <cd:command name="notext" type="environment" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="environment" type="environment" file="file-job.mkvi"> + <cd:command name="environment" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -19,7 +19,7 @@ </cd:arguments> </cd:command> - <cd:command name="environment" type="environment" variant="string" file="file-job.mkvi"> + <cd:command name="environment" type="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -28,27 +28,27 @@ </cd:arguments> </cd:command> - <cd:command name="environment" file="file-job.mkvi"> + <cd:command name="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="environment" variant="string" file="file-job.mkvi"> + <cd:command name="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useenvironment" file="file-job.mkvi"> + <cd:command name="useenvironment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="currentenvironment" file="file-job.mkvi"/> + <cd:command name="currentenvironment" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="project" type="environment" file="file-job.mkvi"> + <cd:command name="project" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -57,7 +57,7 @@ </cd:arguments> </cd:command> - <cd:command name="project" type="environment" variant="string" file="file-job.mkvi"> + <cd:command name="project" type="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -66,27 +66,27 @@ </cd:arguments> </cd:command> - <cd:command name="project" file="file-job.mkvi"> + <cd:command name="project" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="project" variant="string" file="file-job.mkvi"> + <cd:command name="project" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useproject" file="file-job.mkvi"> + <cd:command name="useproject" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="currentproject" file="file-job.mkvi"/> + <cd:command name="currentproject" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="product" type="environment" file="file-job.mkvi"> + <cd:command name="product" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="product" type="environment" variant="string" file="file-job.mkvi"> + <cd:command name="product" type="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -104,27 +104,27 @@ </cd:arguments> </cd:command> - <cd:command name="product" file="file-job.mkvi"> + <cd:command name="product" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="product" variant="string" file="file-job.mkvi"> + <cd:command name="product" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useproduct" file="file-job.mkvi"> + <cd:command name="useproduct" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="currentproduct" file="file-job.mkvi"/> + <cd:command name="currentproduct" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="component" type="environment" file="file-job.mkvi"> + <cd:command name="component" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -133,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="component" type="environment" variant="string" file="file-job.mkvi"> + <cd:command name="component" type="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -142,27 +142,27 @@ </cd:arguments> </cd:command> - <cd:command name="component" file="file-job.mkvi"> + <cd:command name="component" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="component" variant="string" file="file-job.mkvi"> + <cd:command name="component" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="usecomponent" file="file-job.mkvi"> + <cd:command name="usecomponent" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="currentcomponent" file="file-job.mkvi"/> + <cd:command name="currentcomponent" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="document" type="environment" file="file-job.mkvi"> + <cd:command name="document" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupdocument"/> @@ -170,7 +170,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupdocument" file="file-job.mkvi"> + <cd:command name="setupdocument" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -198,7 +198,7 @@ </cd:arguments> </cd:command> - <cd:command name="presetdocument" file="file-job.mkvi"> + <cd:command name="presetdocument" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdocument"/> @@ -206,10 +206,16 @@ </cd:arguments> </cd:command> - <cd:command name="documentvariable" file="file-job.mkvi"> + <cd:command name="documentvariable" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="unexpandeddocumentvariable" level="style" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="argument-key"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dummy.xml b/tex/context/interface/mkiv/i-dummy.xml index 6c7d4288f..47d005e20 100644 --- a/tex/context/interface/mkiv/i-dummy.xml +++ b/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" file="mult-aux.mkiv"> + <cd:command name="getdummyparameters" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="dummyparameter" file="mult-aux.mkiv"> + <cd:command name="dummyparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="directdummyparameter" file="mult-aux.mkiv"> + <cd:command name="directdummyparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setdummyparameter" file="mult-aux.mkiv"> + <cd:command name="setdummyparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="letdummyparameter" file="mult-aux.mkiv"> + <cd:command name="letdummyparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="usedummystyleandcolor" file="mult-aux.mkiv"> + <cd:command name="usedummystyleandcolor" level="system" category="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" file="mult-aux.mkiv"> + <cd:command name="usedummystyleparameter" level="system" category="fonts" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="usedummycolorparameter" file="mult-aux.mkiv"> + <cd:command name="usedummycolorparameter" level="system" category="colors" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-effect.xml b/tex/context/interface/mkiv/i-effect.xml index f6fd3e042..d20a62cd4 100644 --- a/tex/context/interface/mkiv/i-effect.xml +++ b/tex/context/interface/mkiv/i-effect.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineeffect" file="attr-eff.mkiv"> + <cd:command name="defineeffect" level="style" category="pdf" file="attr-eff.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="setupeffect" file="attr-eff.mkiv"> + <cd:command name="setupeffect" level="style" category="pdf" file="attr-eff.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -40,19 +40,19 @@ </cd:arguments> </cd:command> - <cd:command name="effect" type="environment" file="attr-eff.mkiv"> + <cd:command name="effect" type="environment" level="document" category="pdf" file="attr-eff.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="effect" type="environment" generated="yes" variant="example" file="attr-eff.mkiv"> + <cd:command name="effect" type="environment" generated="yes" variant="example" level="document" category="pdf" file="attr-eff.mkiv"> <cd:sequence> <cd:variable value="effect"/> </cd:sequence> </cd:command> - <cd:command name="effect" file="attr-eff.mkiv"> + <cd:command name="effect" level="document" category="pdf" file="attr-eff.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> diff --git a/tex/context/interface/mkiv/i-enumeration.xml b/tex/context/interface/mkiv/i-enumeration.xml index 70823cff3..149f4f613 100644 --- a/tex/context/interface/mkiv/i-enumeration.xml +++ b/tex/context/interface/mkiv/i-enumeration.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineenumeration" file="strc-enu.mkvi"> + <cd:command name="defineenumeration" level="style" category="structure" file="strc-enu.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="setupenumeration" file="strc-enu.mkvi"> + <cd:command name="setupenumeration" level="style" category="structure" file="strc-enu.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -130,6 +130,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </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:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -148,6 +154,9 @@ <cd:constant type="no" default="yes"/> <cd:constant type="xml"/> </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </cd:parameter> <cd:parameter name="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -172,20 +181,16 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupenumerations" file="strc-enu.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupenumeration"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupenumerations" level="style" category="structure" file="strc-enu.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupenumeration"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="enumeration" type="environment" generated="yes" variant="example" file="strc-enu.mkvi"> + <cd:command name="enumeration" type="environment" generated="yes" variant="example" level="document" category="structure" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -194,7 +199,7 @@ </cd:arguments> </cd:command> - <cd:command name="enumeration" type="environment" generated="yes" variant="example:title" file="strc-enu.mkvi"> + <cd:command name="enumeration" type="environment" generated="yes" variant="example:title" level="document" category="structure" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -204,7 +209,7 @@ </cd:arguments> </cd:command> - <cd:command name="enumeration" generated="yes" variant="example" file="strc-enu.mkvi"> + <cd:command name="enumeration" generated="yes" variant="example" level="document" category="structure" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -216,4 +221,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-export.xml b/tex/context/interface/mkiv/i-export.xml index 067649402..3c3afff2b 100644 --- a/tex/context/interface/mkiv/i-export.xml +++ b/tex/context/interface/mkiv/i-export.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setelementexporttag" file="back-exp.mkiv"> + <cd:command name="setelementexporttag" level="system" category="xml" file="back-exp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupexport" file="back-exp.mkiv"> + <cd:command name="setupexport" level="style" category="xml" file="back-exp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="align"> @@ -74,4 +74,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-field.xml b/tex/context/interface/mkiv/i-field.xml index 828ab204f..7a67786f9 100644 --- a/tex/context/interface/mkiv/i-field.xml +++ b/tex/context/interface/mkiv/i-field.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="presetfieldsymbols" file="scrn-fld.mkvi"> + <cd:command name="presetfieldsymbols" level="system" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="definefieldcategory" file="scrn-fld.mkvi"> + <cd:command name="definefieldcategory" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldcategory" file="scrn-fld.mkvi"> + <cd:command name="setupfieldcategory" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -133,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefieldcategory" file="scrn-fld.mkvi"> + <cd:command name="doifelsefieldcategory" level="system" category="pdf 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" file="scrn-fld.mkvi"> + <cd:command name="doiffieldcategoryelse" level="system" category="pdf conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -149,7 +149,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefieldbody" file="scrn-fld.mkvi"> + <cd:command name="definefieldbody" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -159,7 +159,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldbody" file="scrn-fld.mkvi"> + <cd:command name="setupfieldbody" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -171,7 +171,7 @@ </cd:arguments> </cd:command> - <cd:command name="fieldbody" file="scrn-fld.mkvi"> + <cd:command name="fieldbody" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -180,14 +180,14 @@ </cd:arguments> </cd:command> - <cd:command name="definefieldbodyset" file="scrn-fld.mkvi"> + <cd:command name="definefieldbodyset" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefieldbody" file="scrn-fld.mkvi"> + <cd:command name="doifelsefieldbody" level="system" category="pdf 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" file="scrn-fld.mkvi"> + <cd:command name="doiffieldbodyelse" level="system" category="pdf conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -203,7 +203,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefield" file="scrn-fld.mkvi"> + <cd:command name="definefield" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -221,7 +221,7 @@ </cd:arguments> </cd:command> - <cd:command name="definesubfield" file="scrn-fld.mkvi"> + <cd:command name="definesubfield" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -229,7 +229,7 @@ </cd:arguments> </cd:command> - <cd:command name="clonefield" file="scrn-fld.mkvi"> + <cd:command name="clonefield" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -238,14 +238,14 @@ </cd:arguments> </cd:command> - <cd:command name="copyfield" file="scrn-fld.mkvi"> + <cd:command name="copyfield" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="fitfieldframed" file="scrn-fld.mkvi"> + <cd:command name="fitfieldframed" level="document" category="pdf background rules" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -254,7 +254,7 @@ </cd:arguments> </cd:command> - <cd:command name="fitfield" file="scrn-fld.mkvi"> + <cd:command name="fitfield" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -263,7 +263,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldlabelframed" file="scrn-fld.mkvi"> + <cd:command name="setupfieldlabelframed" level="style" category="pdf 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" file="scrn-fld.mkvi"> + <cd:command name="setupfieldcontentframed" level="style" category="pdf 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" file="scrn-fld.mkvi"> + <cd:command name="setupfieldtotalframed" level="style" category="pdf 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" file="scrn-fld.mkvi"> + <cd:command name="setupfield" level="style" category="pdf 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" file="scrn-fld.mkvi"> + <cd:command name="setupfields" level="style" category="pdf background" file="scrn-fld.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -353,14 +353,14 @@ </cd:arguments> </cd:command> - <cd:command name="field" file="scrn-fld.mkvi"> + <cd:command name="field" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text-optional"/> </cd:arguments> </cd:command> - <cd:command name="definefieldstack" file="scrn-fld.mkvi"> + <cd:command name="definefieldstack" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> @@ -370,7 +370,7 @@ </cd:arguments> </cd:command> - <cd:command name="fieldstack" file="scrn-fld.mkvi"> + <cd:command name="fieldstack" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list-optional"/> @@ -380,4 +380,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-figure.xml b/tex/context/interface/mkiv/i-figure.xml index 4b1439f41..6adf84d2e 100644 --- a/tex/context/interface/mkiv/i-figure.xml +++ b/tex/context/interface/mkiv/i-figure.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="figure" type="environment" file="grph-fig.mkiv"> + <cd:command name="figure" type="environment" level="document" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="referring" file="grph-fig.mkiv"> + <cd:command name="referring" level="document" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="marking" file="grph-fig.mkiv"> + <cd:command name="marking" level="document" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="remark" file="grph-fig.mkiv"> + <cd:command name="remark" level="document" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="colorbar" file="grph-fig.mkiv"> + <cd:command name="colorbar" level="document" category="colors" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-list"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-file.xml b/tex/context/interface/mkiv/i-file.xml index a5ed9daa3..df649e8e0 100644 --- a/tex/context/interface/mkiv/i-file.xml +++ b/tex/context/interface/mkiv/i-file.xml @@ -4,33 +4,33 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="input" file="file-ini.mkvi"> + <cd:command name="input" level="document" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="input" variant="string" file="file-ini.mkvi"> + <cd:command name="input" variant="string" level="document" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="doiffile" file="file-ini.mkvi"> + <cd:command name="doiffile" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doifnotfile" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doifelsefile" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doiffileelse" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -46,33 +46,33 @@ </cd:arguments> </cd:command> - <cd:command name="jobfilename" file="core-sys.mkiv"/> + <cd:command name="jobfilename" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="jobfilesuffix" file="core-sys.mkiv"/> + <cd:command name="jobfilesuffix" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="inputfilebarename" file="core-sys.mkiv"/> + <cd:command name="inputfilebarename" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="inputfilerealsuffix" file="core-sys.mkiv"/> + <cd:command name="inputfilerealsuffix" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="inputfilesuffix" file="core-sys.mkiv"/> + <cd:command name="inputfilesuffix" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="inputfilename" file="core-sys.mkiv"/> + <cd:command name="inputfilename" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="outputfilename" file="core-sys.mkiv"/> + <cd:command name="outputfilename" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="readingfile" type="environment" file="file-ini.mkvi"/> + <cd:command name="readingfile" type="environment" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="endofline" type="environment" begin="push" end="pop" file="file-ini.mkvi"/> + <cd:command name="endofline" type="environment" begin="push" end="pop" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="restoreendofline" file="file-ini.mkvi"/> + <cd:command name="restoreendofline" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="inputgivenfile" file="file-ini.mkvi"> + <cd:command name="inputgivenfile" level="system" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="doifelsepath" file="file-ini.mkvi"> + <cd:command name="doifelsepath" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doifpathelse" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doifelsefileexists" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doiffileexistselse" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doifelsepathexists" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doifpathexistselse" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doifelseparentfile" level="system" category="structure 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" file="file-ini.mkvi"> + <cd:command name="doifparentfileelse" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -136,27 +136,27 @@ </cd:arguments> </cd:command> - <cd:command name="splitfilename" file="file-ini.mkvi"> + <cd:command name="splitfilename" level="system" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="splitofffull" file="file-ini.mkvi"/> + <cd:command name="splitofffull" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffpath" file="file-ini.mkvi"/> + <cd:command name="splitoffpath" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffbase" file="file-ini.mkvi"/> + <cd:command name="splitoffbase" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffname" file="file-ini.mkvi"/> + <cd:command name="splitoffname" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitofftype" file="file-ini.mkvi"/> + <cd:command name="splitofftype" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffkind" file="file-ini.mkvi"/> + <cd:command name="splitoffkind" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffroot" file="file-ini.mkvi"/> + <cd:command name="splitoffroot" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="doifelseinputfile" file="file-job.mkvi"> + <cd:command name="doifelseinputfile" level="system" category="structure 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" file="file-job.mkvi"> + <cd:command name="doifinputfileelse" level="system" category="structure conditional" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -172,122 +172,128 @@ </cd:arguments> </cd:command> - <cd:command name="processfile" file="file-ini.mkvi"> + <cd:command name="processfile" level="system" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="usepath" file="file-job.mkvi"> + <cd:command name="usepath" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-path-list"/> </cd:arguments> </cd:command> - <cd:command name="usesubpath" file="file-job.mkvi"> + <cd:command name="usesubpath" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-path-list"/> </cd:arguments> </cd:command> - <cd:command name="path" type="environment" begin="push" end="pop" file="file-job.mkvi"> + <cd:command name="path" type="environment" begin="push" end="pop" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-path"/> </cd:arguments> </cd:command> - <cd:command name="resetpath" file="file-job.mkvi"/> + <cd:command name="resetpath" level="style" category="structure" file="file-job.mkvi"/> - <cd:command name="allinputpaths" file="file-job.mkvi"/> + <cd:command name="allinputpaths" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="locatefilepath" file="file-ini.mkvi"> + <cd:command name="locatefilepath" level="system" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="locatedfilepath" file="file-job.mkvi"/> + <cd:command name="locatedfilepath" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="usezipfile" file="file-job.mkvi"> + <cd:command name="usezipfile" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-file-optional"/> </cd:arguments> </cd:command> - <cd:command name="processfilemany" file="file-job.mkvi"> + <cd:command name="processfilemany" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="processfileonce" file="file-job.mkvi"> + <cd:command name="processfileonce" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="processfilenone" file="file-job.mkvi"> + <cd:command name="processfilenone" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="loadtexfile" file="file-job.mkvi"> + <cd:command name="loadtexfile" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadluafile" file="file-job.mkvi"> + <cd:command name="loadluafile" level="system" category="structure lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadcldfile" file="file-job.mkvi"> + <cd:command name="loadcldfile" level="system" category="structure lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadanyfile" file="file-job.mkvi"> + <cd:command name="loadanyfile" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadtexfileonce" file="file-job.mkvi"> + <cd:command name="loadtexfileonce" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadluafileonce" file="file-job.mkvi"> + <cd:command name="loadluafileonce" level="system" category="structure lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadcldfileonce" file="file-job.mkvi"> + <cd:command name="loadcldfileonce" level="system" category="structure lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadanyfileonce" file="file-job.mkvi"> + <cd:command name="loadanyfileonce" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="continueifinputfile" file="file-job.mkvi"> + <cd:command name="continueifinputfile" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="readjobfile" file="file-res.mkvi"> + <cd:command name="samplefile" level="document" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="readjobfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -295,7 +301,7 @@ </cd:arguments> </cd:command> - <cd:command name="readlocfile" file="file-res.mkvi"> + <cd:command name="readlocfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -303,7 +309,7 @@ </cd:arguments> </cd:command> - <cd:command name="readsysfile" file="file-res.mkvi"> + <cd:command name="readsysfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -311,7 +317,7 @@ </cd:arguments> </cd:command> - <cd:command name="readfixfile" file="file-res.mkvi"> + <cd:command name="readfixfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-file"/> @@ -320,7 +326,7 @@ </cd:arguments> </cd:command> - <cd:command name="readsetfile" file="file-res.mkvi"> + <cd:command name="readsetfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-file"/> @@ -329,7 +335,7 @@ </cd:arguments> </cd:command> - <cd:command name="readfile" file="file-res.mkvi"> + <cd:command name="readfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -337,13 +343,13 @@ </cd:arguments> </cd:command> - <cd:command name="ReadFile" file="file-res.mkvi"> + <cd:command name="ReadFile" level="system" category="structure" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="readtexfile" file="file-res.mkvi"> + <cd:command name="readtexfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -351,7 +357,7 @@ </cd:arguments> </cd:command> - <cd:command name="readxmlfile" file="file-res.mkvi"> + <cd:command name="readxmlfile" level="system" category="structure conditional xml" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -359,7 +365,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselocfile" file="file-res.mkvi"> + <cd:command name="doifelselocfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -367,7 +373,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflocfileelse" file="file-res.mkvi"> + <cd:command name="doiflocfileelse" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -375,27 +381,27 @@ </cd:arguments> </cd:command> - <cd:command name="locfilename" file="file-res.mkvi"> + <cd:command name="locfilename" level="system" category="structure" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="definefilesynonym" file="file-sys.mkvi"> + <cd:command name="definefilesynonym" level="system" category="structure" file="file-sys.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="definefilefallback" file="file-sys.mkvi"> + <cd:command name="definefilefallback" level="system" category="structure" file="file-sys.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file-list"/> </cd:arguments> </cd:command> - <cd:command name="truefilename" file="file-sys.mkvi"> + <cd:command name="truefilename" level="system" category="structure" file="file-sys.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-filler.xml b/tex/context/interface/mkiv/i-filler.xml index 894780063..69cc37fca 100644 --- a/tex/context/interface/mkiv/i-filler.xml +++ b/tex/context/interface/mkiv/i-filler.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefiller" file="spac-flr.mkiv"> + <cd:command name="definefiller" level="style" category="rules" file="spac-flr.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="setupfiller" file="spac-flr.mkiv"> + <cd:command name="setupfiller" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -75,7 +75,7 @@ <!-- - <cd:command name="setupfillers" file="spac-flr.mkiv"> + <cd:command name="setupfillers" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -86,7 +86,7 @@ --> - <cd:command name="filler" file="spac-flr.mkiv"> + <cd:command name="filler" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -99,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="checkedfiller" file="spac-flr.mkiv"> + <cd:command name="checkedfiller" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="sym"/> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelinefiller" file="node-rul.mkiv"> + <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"/> @@ -123,7 +123,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinefiller" file="node-rul.mkiv"> + <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"> @@ -177,7 +177,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinefillers" file="node-rul.mkiv"> + <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"> @@ -186,7 +186,7 @@ </cd:arguments> </cd:command> - <cd:command name="linefiller" type="environment" file="node-rul.mkiv"> + <cd:command name="linefiller" type="environment" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -198,7 +198,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlinefiller" file="node-rul.mkiv"> + <cd:command name="setlinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> diff --git a/tex/context/interface/mkiv/i-fillinline.xml b/tex/context/interface/mkiv/i-fillinline.xml index dbf9f8627..eb2f9d6ae 100644 --- a/tex/context/interface/mkiv/i-fillinline.xml +++ b/tex/context/interface/mkiv/i-fillinline.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupfillinlines" file="pack-mrl.mkiv"> + <cd:command name="setupfillinlines" level="style" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="fillinline" file="pack-mrl.mkiv"> + <cd:command name="fillinline" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfillinlines"/> @@ -40,4 +40,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fillinrule.xml b/tex/context/interface/mkiv/i-fillinrule.xml index 949b8f6ea..d73b70ff9 100644 --- a/tex/context/interface/mkiv/i-fillinrule.xml +++ b/tex/context/interface/mkiv/i-fillinrule.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupfillinrules" file="pack-mrl.mkiv"> + <cd:command name="setupfillinrules" level="style" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -43,7 +43,7 @@ </cd:arguments> </cd:command> - <cd:command name="fillinrules" file="pack-mrl.mkiv"> + <cd:command name="fillinrules" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -53,7 +53,7 @@ </cd:arguments> </cd:command> - <cd:command name="fillintext" file="pack-mrl.mkiv"> + <cd:command name="fillintext" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -63,4 +63,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-firstline.xml b/tex/context/interface/mkiv/i-firstline.xml index 59579a18c..b22035651 100644 --- a/tex/context/interface/mkiv/i-firstline.xml +++ b/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" file="typo-fln.mkiv"> + <cd:command name="definefirstline" level="style" category="fonts 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" file="typo-fln.mkiv"> + <cd:command name="setupfirstline" level="style" category="fonts 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" file="typo-fln.mkiv"> + <cd:command name="setfirstline" level="document" category="fonts colors" file="typo-fln.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="applytofirstcharacter" file="typo-fln.mkiv"> + <cd:command name="applytofirstcharacter" level="system" category="fonts colors" file="typo-fln.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml index 29816601f..8c2003568 100644 --- a/tex/context/interface/mkiv/i-fittingpage.xml +++ b/tex/context/interface/mkiv/i-fittingpage.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefittingpage" file="page-app.mkiv"> + <cd:command name="definefittingpage" level="style" category="background layout" file="page-app.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="setupfittingpage" file="page-app.mkiv"> + <cd:command name="setupfittingpage" level="style" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -33,7 +33,7 @@ </cd:parameter> <cd:parameter name="paper"> <cd:constant type="auto"/> - <cd:constant type="defaut" default="yes"/> + <cd:constant type="default" default="yes"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:inherit name="setupframed"/> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="fittingpage" type="environment" file="page-app.mkiv"> + <cd:command name="fittingpage" type="environment" level="document" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -50,9 +50,9 @@ </cd:arguments> </cd:command> - <cd:command name="fittingpage" type="environment" generated="yes" variant="example" file="page-app.mkiv"> + <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" category="background layout" file="page-app.mkiv"> <cd:sequence> - <cd:variable value="fittingpage"/> + <cd:instance value="fittingpage"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -60,36 +60,39 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="TEXpage"/> - <cd:constant value="MPpage"/> + <cd:resolve name="instance-fittingpage"/> </cd:instances> </cd:command> - <cd:command name="TEXpage" type="environment" file="page-app.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="setupTEXpage" file="page-app.mkiv"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="TEXpage" type="environment" level="document" category="background layout" file="page-app.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfittingpage"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="MPpage" type="environment" file="meta-fig.mkiv"> + <cd:command name="MPpage" type="environment" level="document" category="background layout metapost" file="meta-fig.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="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:arguments> - <cd:assignments list="yes" optional="yes"> + <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupMPpage" file="meta-fig.mkiv"> + <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml index edc7f7f03..0ecb99c16 100644 --- a/tex/context/interface/mkiv/i-floats.xml +++ b/tex/context/interface/mkiv/i-floats.xml @@ -4,10 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefloat" file="strc-flt.mkvi"> + <cd:command name="definefloat" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> - <cd:resolve name="keyword-plural-optional"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:singular"/> + <cd:constant type="cd:plural"/> + </cd:keywords> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfloat"/> </cd:assignments> @@ -17,7 +20,7 @@ </cd:instances> </cd:command> - <cd:command name="definefloat" variant="name" file="strc-flt.mkvi"> + <cd:command name="definefloat" variant="name" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-plural-optional"/> @@ -28,7 +31,7 @@ </cd:instances> </cd:command> - <cd:command name="setupfloat" file="strc-flt.mkvi"> + <cd:command name="setupfloat" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular-list-optional"/> <cd:assignments list="yes"> @@ -65,7 +68,7 @@ <cd:constant type="normal" default="yes"/> </cd:parameter> <cd:parameter name="grid"> - <cd:constant type="cd:string"/> + <cd:inherit name="snaptogrid"/> </cd:parameter> <!-- <cd:parameter name="topoffset"> @@ -121,6 +124,24 @@ <cd:parameter name="bottomafter"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="catcodes"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="freeregion"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- begin root only --> <cd:parameter name="spacebefore"> <cd:constant type="none"/> @@ -149,6 +170,18 @@ <cd:constant type="none"/> <cd:inherit name="blank"/> </cd:parameter> + <cd:parameter name="spacebeforeside"> + <cd:constant type="none"/> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceafterside"> + <cd:constant type="none"/> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="sidethreshold"> + <cd:constant type="old"/> + <cd:constant type="dimension" default="yes"/> <!-- value=".5\strutdp" --> + </cd:parameter> <cd:parameter name="margin"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -177,18 +210,18 @@ </cd:arguments> </cd:command> - <!-- + <cd:command name="setupfloats" level="style" category="structure" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-singular-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="setupfloats" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-singular-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupfloat"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="definefloatcaption" file="strc-flt.mkvi"> + <cd:command name="definefloatcaption" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -200,7 +233,7 @@ --> - <cd:command name="setupfloatcaption" file="strc-flt.mkvi"> + <cd:command name="setupfloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -233,6 +266,8 @@ <cd:constant type="top"/> <cd:constant type="bottom" default="yes"/> <cd:constant type="stretch"/> + <cd:constant type="tolerant"/> + <cd:constant type="verytolerant"/> <cd:constant type="none"/> <cd:constant type="default"/> </cd:parameter> @@ -257,6 +292,10 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <!-- headstyle headcolor headseparator --> + <cd:parameter name="headseparator"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="inbetween"> <cd:constant type="cd:command"/> </cd:parameter> @@ -312,7 +351,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaption" file="strc-flt.mkvi"> + <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -321,26 +360,19 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupcaptions" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupfloatcaption"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="placefloat" generated="yes" variant="instance" file="strc-flt.mkvi"> + <cd:command name="placefloat" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> -<!-- - <cd:variable value="float"/> ---> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> @@ -353,7 +385,7 @@ </cd:instances> </cd:command> - <cd:command name="placefloat" file="strc-flt.mkvi"> + <cd:command name="placefloat" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-floatlocation-list-optional"/> @@ -363,16 +395,7 @@ </cd:arguments> </cd:command> -<!-- - <cd:command name="placefloat" type="environment" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-singular"/> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="placefloat" generated="yes" variant="instance" file="strc-flt.mkvi"> + <cd:command name="placefloat" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> @@ -380,32 +403,23 @@ <cd:arguments> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> - <cd:resolve name="argument-text"/> </cd:arguments> <cd:instances> <cd:resolve name="instance-float"/> </cd:instances> </cd:command> ---> - - <cd:command name="placefloat" type="environment" generated="yes" variant="instance" file="strc-flt.mkvi"> - <cd:sequence> - <cd:string value="place"/> - <cd:instance value="float"/> - </cd:sequence> + <cd:command name="placefloat" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> + <cd:resolve name="keyword-singular"/> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> - <cd:instances> - <cd:resolve name="instance-float"/> - </cd:instances> </cd:command> - <cd:command name="floattext" type="environment" generated="yes" variant="example" file="strc-flt.mkvi"> + <cd:command name="floattext" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> - <cd:variable value="float"/> + <cd:instance value="float"/> <cd:string value="text"/> </cd:sequence> <cd:arguments> @@ -413,276 +427,286 @@ <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-float"/> + </cd:instances> </cd:command> - <cd:command name="placelistoffloats" generated="yes" variant="example" file="strc-flt.mkvi"> + <cd:command name="placelistoffloats" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="placelistof"/> - <cd:variable value="floats"/> + <cd:instance value="floats"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-floatlist"/> + </cd:instances> </cd:command> - <cd:command name="completelistoffloats" generated="yes" variant="example" file="strc-flt.mkvi"> + <cd:command name="completelistoffloats" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="completelistof"/> - <cd:variable value="floats"/> + <cd:instance value="floats"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-floatlist"/> + </cd:instances> </cd:command> - <cd:command name="floatuserdataparameter" file="strc-flt.mkvi"> + <cd:command name="floatuserdataparameter" level="system" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="doifelserightpagefloat" file="strc-flt.mkvi"> + <cd:command name="doifelserightpagefloat" level="system" category="structure 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" file="strc-flt.mkvi"> + <cd:command name="doifrightpagefloatelse" level="system" category="structure 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" file="strc-flt.mkvi"> + <cd:command name="doifelseoddpagefloat" level="system" category="structure 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" file="strc-flt.mkvi"> + <cd:command name="doifoddpagefloatelse" level="system" category="structure 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" file="strc-flt.mkvi"> + <cd:command name="doifelsemainfloatbody" level="system" category="structure 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" file="strc-flt.mkvi"> + <cd:command name="doifmainfloatbodyelse" level="system" category="structure conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> -<!-- + <!-- - <cd:command file="strc-flt.mkvi" name="placefigure"> - <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" 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" 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="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" 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="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" 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="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" 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" 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" 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" 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="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" 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="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" 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="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" 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" 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" 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" 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="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" 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="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" 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="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" 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" 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" 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" 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="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" 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="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" 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="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" 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" 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" 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" 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="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" 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="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" 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" file="strc-flt.mkvi"> + <cd:command name="setuplocalfloats" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -698,25 +722,25 @@ </cd:arguments> </cd:command> - <cd:command name="noflocalfloats" file="strc-flt.mkvi"/> + <cd:command name="noflocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="resetlocalfloats" file="strc-flt.mkvi"/> + <cd:command name="resetlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="somelocalfloat" file="strc-flt.mkvi"/> + <cd:command name="somelocalfloat" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="getlocalfloats" file="strc-flt.mkvi"/> + <cd:command name="getlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="flushlocalfloats" file="strc-flt.mkvi"/> + <cd:command name="flushlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="getlocalfloat" file="strc-flt.mkvi"> + <cd:command name="getlocalfloat" level="system" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="forcelocalfloats" file="strc-flt.mkvi"/> + <cd:command name="forcelocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="setupfloatsplitting" file="tabl-tsp.mkiv"> + <cd:command name="setupfloatsplitting" level="style" category="structure counter" file="tabl-tsp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -739,7 +763,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitfloat" file="tabl-tsp.mkiv"> + <cd:command name="splitfloat" level="system" category="structure" file="tabl-tsp.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfloatsplitting"/> @@ -749,20 +773,20 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotinsidesplitfloat" file="tabl-tsp.mkiv"> + <cd:command name="doifnotinsidesplitfloat" level="system" category="structure conditional" file="tabl-tsp.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="placenamedfloat" file="page-flt.mkiv"> + <cd:command name="placenamedfloat" level="document" category="structure" file="page-flt.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="placefloatwithsetups" file="page-flt.mkiv"> + <cd:command name="placefloatwithsetups" level="document" category="structure" file="page-flt.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-floatlocation-list-optional"/> diff --git a/tex/context/interface/mkiv/i-fontfamily.xml b/tex/context/interface/mkiv/i-fontfamily.xml index 2cf2fb403..e20346319 100644 --- a/tex/context/interface/mkiv/i-fontfamily.xml +++ b/tex/context/interface/mkiv/i-fontfamily.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefontfamily" file="font-sel.mkvi"> + <cd:command name="definefontfamily" level="style" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -68,7 +68,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfamily" variant="preset" file="font-sel.mkvi"> + <cd:command name="definefontfamily" variant="preset" level="style" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefallbackfamily" file="font-sel.mkvi"> + <cd:command name="definefallbackfamily" level="style" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -177,7 +177,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefallbackfamily" variant="preset" file="font-sel.mkvi"> + <cd:command name="definefallbackfamily" variant="preset" level="style" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -206,7 +206,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfamilypreset" file="font-sel.mkvi"> + <cd:command name="definefontfamilypreset" level="system" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -215,11 +215,11 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfamilypreset" variant="name" file="font-sel.mkvi"> + <cd:command name="definefontfamilypreset" variant="name" level="system" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml index c246905f0..1e6e169a4 100644 --- a/tex/context/interface/mkiv/i-fonts.xml +++ b/tex/context/interface/mkiv/i-fonts.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefontfallback" file="font-col.mkvi"> + <cd:command name="definefontfallback" level="style" category="fonts" file="font-col.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -31,66 +31,82 @@ <cd:constant type="cd:number"/> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="features"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="resetfontfallback" file="font-col.mkvi"> + <cd:command name="resetfontfallback" level="style" category="fonts" file="font-col.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="emphasistypeface" file="font-emp.mkvi"/> + <cd:command name="emphasistypeface" level="document" category="fonts" file="font-emp.mkvi"/> + + <cd:command name="emphasisboldface" level="document" category="fonts" file="font-emp.mkvi"/> + + <cd:command name="normalboldface" level="document" category="fonts" file="font-emp.mkvi"/> + + <cd:command name="normalitalicface" level="document" category="fonts" file="font-emp.mkvi"/> + + <cd:command name="normalslantedface" level="document" category="fonts" file="font-emp.mkvi"/> + + <cd:command name="normaltypeface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="emphasisboldface" file="font-emp.mkvi"/> + <cd:command name="swaptypeface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="normalboldface" file="font-emp.mkvi"/> + <cd:command name="typeface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="normaltypeface" file="font-emp.mkvi"/> + <cd:command name="boldface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="swaptypeface" file="font-emp.mkvi"/> + <cd:command name="italicface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="typeface" file="font-emp.mkvi"/> + <cd:command name="slantedface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="boldface" file="font-emp.mkvi"/> + <cd:command name="swapface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="swapface" file="font-emp.mkvi"/> + <cd:command name="em" level="document" category="fonts" file="font-emp.mkvi"/> <!-- - <cd:command name="emphbf" file="font-emp.mkvi"> + <cd:command name="emphbf" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emphit" file="font-emp.mkvi"> + <cd:command name="emphit" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emphsl" file="font-emp.mkvi"> + <cd:command name="emphsl" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emphtf" file="font-emp.mkvi"> + <cd:command name="emphtf" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emph" file="font-emp.mkvi"> + <cd:command name="emph" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emphasized" file="font-emp.mkvi"> + <cd:command name="emphasized" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> @@ -98,7 +114,7 @@ --> - <cd:command name="definefontfeature" file="font-fea.mkvi"> + <cd:command name="definefontfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -190,6 +206,10 @@ <cd:parameter name="boundingbox"> <cd:constant type="yes"/> <cd:constant type="no"/> + <cd:constant type="background"/> + <cd:constant type="frame"/> + <cd:constant type="empty"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="compose"> <cd:constant type="yes"/> @@ -270,11 +290,15 @@ <cd:parameter name="mathnolimitsmode"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="blockligatures"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="adaptfontfeature" file="font-fea.mkvi"> + <cd:command name="adaptfontfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <!-- pattern --> <cd:assignments list="yes"> @@ -283,72 +307,72 @@ </cd:arguments> </cd:command> - <cd:command name="fontfeaturelist" file="font-fea.mkvi"> + <cd:command name="fontfeaturelist" level="document" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="addfeature" file="font-fea.mkvi"> + <cd:command name="addfeature" category="fonts" level="style" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="addfeature" variant="direct" file="font-fea.mkvi"> + <cd:command name="addfeature" variant="direct" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="subtractfeature" file="font-fea.mkvi"> + <cd:command name="subtractfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="subtractfeature" variant="direct" file="font-fea.mkvi"> + <cd:command name="subtractfeature" variant="direct" clevel="style" ategory="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="replacefeature" file="font-fea.mkvi"> + <cd:command name="replacefeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="replacefeature" variant="direct" file="font-fea.mkvi"> + <cd:command name="replacefeature" variant="direct" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetandaddfeature" file="font-fea.mkvi"> + <cd:command name="resetandaddfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetandaddfeature" variant="direct" file="font-fea.mkvi"> + <cd:command name="resetandaddfeature" variant="direct" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfeature" file="font-fea.mkvi"/> + <cd:command name="resetfeature" level="style" category="fonts" file="font-fea.mkvi"/> - <cd:command name="revivefeature" file="font-fea.mkvi"/> + <cd:command name="revivefeature" level="style" category="fonts" file="font-fea.mkvi"/> - <cd:command name="setfontfeature" file="font-fea.mkvi"> + <cd:command name="setfontfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="feature" file="font-fea.mkvi"> + <cd:command name="feature" level="document" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -365,11 +389,11 @@ <cd:constant type="old"/> <cd:constant type="local"/> </cd:keywords> - <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="feature" variant="direct" file="font-fea.mkvi"> + <cd:command name="feature" variant="direct" level="document" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -386,11 +410,11 @@ <cd:constant type="old"/> <cd:constant type="local"/> </cd:keywords> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentfonthasfeature" file="font-fea.mkvi"> + <cd:command name="doifelsecurrentfonthasfeature" level="system" category="fonts conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -398,7 +422,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcurrentfonthasfeatureelse" file="font-fea.mkvi"> + <cd:command name="doifcurrentfonthasfeatureelse" level="system" category="fonts conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -406,31 +430,31 @@ </cd:arguments> </cd:command> - <cd:command name="doaddfeature" file="font-fea.mkvi"> + <cd:command name="doaddfeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="dosubtractfeature" file="font-fea.mkvi"> + <cd:command name="dosubtractfeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doreplacefeature" file="font-fea.mkvi"> + <cd:command name="doreplacefeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doresetandafffeature" file="font-fea.mkvi"> + <cd:command name="doresetandafffeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="fontclass" type="environment" file="font-fil.mkvi"> + <cd:command name="fontclass" type="environment" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="each"/> @@ -439,14 +463,14 @@ </cd:arguments> </cd:command> - <cd:command name="classfont" file="font-fil.mkvi"> + <cd:command name="classfont" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="definefontsynonym" file="font-fil.mkvi"> + <cd:command name="definefontsynonym" level="style" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -468,7 +492,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfile" file="font-fil.mkvi"> + <cd:command name="definefontfile" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -490,20 +514,20 @@ </cd:arguments> </cd:command> - <cd:command name="truefontname" file="font-fil.mkvi"> + <cd:command name="truefontname" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="expandfontsynonym" file="font-fil.mkvi"> + <cd:command name="expandfontsynonym" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefontsynonym" file="font-fil.mkvi"> + <cd:command name="doifelsefontsynonym" level="system" category="fonts conditional" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -511,7 +535,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontsynonymelse" file="font-fil.mkvi"> + <cd:command name="doiffontsynonymelse" level="system" category="fonts conditional" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -519,87 +543,87 @@ </cd:arguments> </cd:command> - <cd:command name="tracedfontname" file="font-fil.mkvi"> + <cd:command name="tracedfontname" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="fontclassname" file="font-fil.mkvi"> + <cd:command name="fontclassname" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="loadfontgoodies" file="font-gds.mkvi"> + <cd:command name="loadfontgoodies" level="style" category="fonts" file="font-gds.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setfontcolorsheme" file="font-gds.mkvi"> + <cd:command name="setfontcolorsheme" level="style" category="fonts" file="font-gds.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfontcolorsheme" file="font-gds.mkvi"/> + <cd:command name="resetfontcolorsheme" level="style" category="fonts" file="font-gds.mkvi"/> - <cd:command name="definedfont" file="font-ini.mkvi"> + <cd:command name="definedfont" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="font" type="environment" file="font-ini.mkvi"> + <cd:command name="font" type="environment" level="document" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="bodyfontsize" file="font-ini.mkvi"/> + <cd:command name="bodyfontsize" level="system" category="fonts" file="font-ini.mkvi"/> - <cd:command name="normalizebodyfontsize" file="font-ini.mkvi"> + <cd:command name="normalizebodyfontsize" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="thenormalizedbodyfontsize" file="font-ini.mkvi"> + <cd:command name="thenormalizedbodyfontsize" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="mapfontsize" file="font-fil.mkvi"> + <cd:command name="mapfontsize" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-dimension"/> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="definefontstyle" file="font-ini.mkvi"> + <cd:command name="definefontstyle" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definefontsize" file="font-ini.mkvi"> + <cd:command name="definefontsize" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definefontalternative" file="font-ini.mkvi"> + <cd:command name="definefontalternative" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definefont" file="font-ini.mkvi"> + <cd:command name="definefont" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -609,7 +633,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefont" variant="argument" file="font-ini.mkvi"> + <cd:command name="definefont" variant="argument" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -617,14 +641,14 @@ </cd:arguments> </cd:command> - <cd:command name="definefrozenfont" file="font-ini.mkvi"> + <cd:command name="definefrozenfont" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="definebodyfontenvironment" file="font-ini.mkvi"> + <cd:command name="definebodyfontenvironment" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords> @@ -693,7 +717,7 @@ <!-- - <cd:command name="setupbodyfontenvironment" file="font-ini.mkvi"> + <cd:command name="setupbodyfontenvironment" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords> @@ -708,31 +732,31 @@ --> - <cd:command name="processbodyfontenvironmentlist" file="font-fil.mkvi"> + <cd:command name="processbodyfontenvironmentlist" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="bodyfontenvironmentlist" file="font-fil.mkvi"/> + <cd:command name="bodyfontenvironmentlist" level="system" category="fonts" file="font-fil.mkvi"/> - <cd:command name="registerfontclass" file="font-fil.mkvi"> + <cd:command name="registerfontclass" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setcurrentfontclass" file="font-fil.mkvi"> + <cd:command name="setcurrentfontclass" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="tx" file="font-ini.mkvi"/> + <cd:command name="tx" level="document" category="fonts" file="font-ini.mkvi"/> - <cd:command name="txx" file="font-ini.mkvi"/> + <cd:command name="txx" level="document" category="fonts" file="font-ini.mkvi"/> - <cd:command name="definebodyfont" file="font-fil.mkvi"> + <cd:command name="definebodyfont" level="style" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -793,7 +817,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebodyfont" variant="argument" file="font-fil.mkvi"> + <cd:command name="definebodyfont" variant="argument" level="style" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -814,7 +838,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfonts" file="font-ini.mkiv"> + <cd:command name="setupfonts" level="style" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="language"> @@ -825,7 +849,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbodyfont" file="font-ini.mkiv"> + <cd:command name="setupbodyfont" level="style" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:dimension"/> @@ -858,7 +882,7 @@ </cd:arguments> </cd:command> - <cd:command name="switchtobodyfont" file="font-ini.mkvi"> + <cd:command name="switchtobodyfont" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -866,7 +890,7 @@ </cd:arguments> </cd:command> - <cd:command name="fastswitchtobodyfont" file="font-ini.mkiv"> + <cd:command name="fastswitchtobodyfont" level="system" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="x"/> @@ -879,7 +903,7 @@ </cd:arguments> </cd:command> - <cd:command name="usebodyfont" file="font-ini.mkvi"> + <cd:command name="usebodyfont" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -887,31 +911,31 @@ </cd:arguments> </cd:command> - <cd:command name="usebodyfontparameter" file="font-ini.mkvi"> + <cd:command name="usebodyfontparameter" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fontchar" file="font-ini.mkvi"> + <cd:command name="fontchar" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fontcharbyindex" file="font-ini.mkvi"> + <cd:command name="fontcharbyindex" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="tochar" file="font-ini.mkvi"> + <cd:command name="tochar" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="switchstyleonly" file="font-ini.mkiv"> + <cd:command name="switchstyleonly" clevel="style" ategory="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="rm"/> @@ -934,13 +958,13 @@ </cd:arguments> </cd:command> - <cd:command name="switchstyleonly" variant="command" file="font-ini.mkiv"> + <cd:command name="switchstyleonly" variant="command" level="style" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definebodyfontswitch" file="font-ini.mkvi"> + <cd:command name="definebodyfontswitch" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -949,28 +973,28 @@ </cd:arguments> </cd:command> - <cd:command name="setsmallbodyfont" file="font-ini.mkvi"/> + <cd:command name="setsmallbodyfont" level="style" category="fonts" file="font-ini.mkvi"/> - <cd:command name="setbigbodyfont" file="font-ini.mkvi"/> + <cd:command name="setbigbodyfont" level="style" category="fonts" file="font-ini.mkvi"/> - <cd:command name="setmainbodyfont" file="font-ini.mkvi"/> + <cd:command name="setmainbodyfont" level="style" category="fonts" file="font-ini.mkvi"/> - <cd:command name="restoreglobalbodyfont" file="font-ini.mkvi"/> + <cd:command name="restoreglobalbodyfont" level="style" category="fonts" file="font-ini.mkvi"/> - <cd:command name="predefinefont" file="font-ini.mkvi"> + <cd:command name="predefinefont" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="predefinedfont" file="font-ini.mkvi"> + <cd:command name="predefinedfont" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="showbodyfont" file="font-run.mkiv"> + <cd:command name="showbodyfont" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -978,7 +1002,7 @@ </cd:arguments> </cd:command> - <cd:command name="showbodyfontenvironment" file="font-run.mkiv"> + <cd:command name="showbodyfontenvironment" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -986,14 +1010,14 @@ </cd:arguments> </cd:command> - <cd:command name="showfont" file="font-run.mkiv"> + <cd:command name="showfont" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-font"/> <cd:resolve name="keyword-number-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="showfontstyle" file="font-run.mkiv"> + <cd:command name="showfontstyle" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setupbodyfont"/> @@ -1021,19 +1045,19 @@ </cd:arguments> </cd:command> - <cd:command name="showligature" file="font-run.mkiv"> + <cd:command name="showligature" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showligatures" file="font-run.mkiv"> + <cd:command name="showligatures" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="showfontstrip" file="font-run.mkiv"> + <cd:command name="showfontstrip" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -1041,111 +1065,109 @@ </cd:arguments> </cd:command> - <cd:command name="showminimalbaseline" file="font-run.mkiv"/> + <cd:command name="showminimalbaseline" level="document" category="fonts" file="font-run.mkiv"/> - <cd:command name="showkerning" file="font-run.mkiv"> + <cd:command name="showkerning" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showcharratio" file="font-run.mkiv"> + <cd:command name="showcharratio" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showfontparameters" file="font-run.mkiv"/> - - <cd:command name="setsmallcaps" file="font-pre.mkiv"/> + <cd:command name="showfontparameters" level="document" category="fonts" file="font-run.mkiv"/> - <cd:command name="setoldstyle" file="font-pre.mkiv"/> + <cd:command name="setsmallcaps" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="settabular" file="font-pre.mkiv"/> + <cd:command name="setoldstyle" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="setfractions" file="font-pre.mkiv"/> + <cd:command name="settabular" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="setsuperiors" file="font-pre.mkiv"/> + <cd:command name="setsuperiors" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="tinyfont" file="font-pre.mkiv"/> + <cd:command name="tinyfont" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="infofont" file="font-pre.mkiv"/> + <cd:command name="infofont" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="infofontbold" file="font-pre.mkiv"/> + <cd:command name="infofontbold" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbodyfont" file="font-pre.mkiv"/> + <cd:command name="smallbodyfont" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bigbodyfont" file="font-pre.mkiv"/> + <cd:command name="bigbodyfont" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smaller" file="font-pre.mkiv"/> + <cd:command name="smaller" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bigger" file="font-pre.mkiv"/> + <cd:command name="bigger" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="normal" file="font-pre.mkiv"/> + <cd:command name="normal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bold" file="font-pre.mkiv"/> + <cd:command name="bold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="mono" file="font-pre.mkiv"/> + <cd:command name="mono" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="monobold" file="font-pre.mkiv"/> + <cd:command name="monobold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="slanted" file="font-pre.mkiv"/> + <cd:command name="slanted" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="italic" file="font-pre.mkiv"/> + <cd:command name="italic" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="boldslanted" file="font-pre.mkiv"/> + <cd:command name="boldslanted" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="slantedbold" file="font-pre.mkiv"/> + <cd:command name="slantedbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bolditalic" file="font-pre.mkiv"/> + <cd:command name="bolditalic" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="italicbold" file="font-pre.mkiv"/> + <cd:command name="italicbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="small" file="font-pre.mkiv"/> + <cd:command name="small" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallnormal" file="font-pre.mkiv"/> + <cd:command name="smallnormal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbold" file="font-pre.mkiv"/> + <cd:command name="smallbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smalltype" file="font-pre.mkiv"/> + <cd:command name="smalltype" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallslanted" file="font-pre.mkiv"/> + <cd:command name="smallslanted" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallboldslanted" file="font-pre.mkiv"/> + <cd:command name="smallboldslanted" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallslantedbold" file="font-pre.mkiv"/> + <cd:command name="smallslantedbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbolditalic" file="font-pre.mkiv"/> + <cd:command name="smallbolditalic" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallitalicbold" file="font-pre.mkiv"/> + <cd:command name="smallitalicbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sans" file="font-pre.mkiv"/> + <cd:command name="sans" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansserif" file="font-pre.mkiv"/> + <cd:command name="sansserif" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="roman" file="font-pre.mkiv"/> + <cd:command name="roman" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serif" file="font-pre.mkiv"/> + <cd:command name="serif" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="regular" file="font-pre.mkiv"/> + <cd:command name="regular" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="handwritten" file="font-pre.mkiv"/> + <cd:command name="handwritten" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="calligraphic" file="font-pre.mkiv"/> + <cd:command name="calligraphic" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansnormal" file="font-pre.mkiv"/> + <cd:command name="sansnormal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansbold" file="font-pre.mkiv"/> + <cd:command name="sansbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serifnormal" file="font-pre.mkiv"/> + <cd:command name="serifnormal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serifbold" file="font-pre.mkiv"/> + <cd:command name="serifbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="mononormal" file="font-pre.mkiv"/> + <cd:command name="mononormal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="monobold" file="font-pre.mkiv"/> + <cd:command name="monobold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="definefontsolution" file="font-sol.mkvi"> + <cd:command name="definefontsolution" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -1155,7 +1177,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontsolution" file="font-sol.mkvi"> + <cd:command name="setupfontsolution" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -1187,7 +1209,7 @@ <!-- - <cd:command name="setupfontsolutions" file="font-sol.mkvi"> + <cd:command name="setupfontsolutions" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -1198,21 +1220,21 @@ --> - <cd:command name="setfontsolution" file="font-sol.mkvi"> + <cd:command name="setfontsolution" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfontsolution" file="font-sol.mkvi"/> + <cd:command name="resetfontsolution" level="style" category="fonts" file="font-sol.mkvi"/> - <cd:command name="fontsolution" type="environment" file="font-sol.mkvi"> + <cd:command name="fontsolution" type="environment" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definealternativestyle" file="font-sty.mkvi"> + <cd:command name="definealternativestyle" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-command"/> @@ -1220,17 +1242,28 @@ </cd:arguments> </cd:command> - <cd:command name="applyalternativestyle" file="font-sty.mkvi"> + <cd:command name="applyalternativestyle" level="system" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dontconvertfont" file="font-sty.mkvi"/> + <cd:command name="setupalternativestyles" level="style" category="fonts" file="font-sty.mkvi"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="method"> + <cd:constant type="normal" default="yes"/> + <cd:constant type="auto"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="redoconvertfont" file="font-sty.mkvi"/> + <cd:command name="dontconvertfont" level="system" category="fonts" file="font-sty.mkvi"/> - <cd:command name="definestyle" file="font-sty.mkvi"> + <cd:command name="redoconvertfont" level="system" category="fonts" file="font-sty.mkvi"/> + + <cd:command name="definestyle" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -1240,7 +1273,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupstyle" file="font-sty.mkvi"> + <cd:command name="setupstyle" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -1257,22 +1290,22 @@ </cd:arguments> </cd:command> - <cd:command name="style" type="environment" generated="yes" variant="example" file="font-sty.mkvi"> + <cd:command name="style" type="environment" generated="yes" variant="instance" level="document" category="fonts" file="font-sty.mkvi"> <cd:sequence> - <cd:variable value="style"/> + <cd:instance value="style"/> </cd:sequence> </cd:command> - <cd:command name="style" generated="yes" variant="example" file="font-sty.mkvi"> + <cd:command name="style" generated="yes" variant="instance" level="document" category="fonts" file="font-sty.mkvi"> <cd:sequence> - <cd:variable value="style"/> + <cd:instance value="style"/> </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="style" type="environment" variant="argument" file="font-sty.mkvi"> + <cd:command name="style" type="environment" variant="argument" level="document" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -1281,7 +1314,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" type="environment" file="font-sty.mkvi"> + <cd:command name="style" type="environment" level="document" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -1289,7 +1322,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" variant="argument" file="font-sty.mkvi"> + <cd:command name="style" variant="argument" level="document" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -1299,7 +1332,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" file="font-sty.mkvi"> + <cd:command name="style" level="document" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -1308,7 +1341,7 @@ </cd:arguments> </cd:command> - <cd:command name="definestyleinstance" file="font-sty.mkvi"> + <cd:command name="definestyleinstance" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -1334,59 +1367,59 @@ </cd:arguments> </cd:command> - <cd:command name="styleinstance" file="font-sty.mkvi"> + <cd:command name="styleinstance" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseitalic" file="font-sym.mkvi"> + <cd:command name="doifelseitalic" level="system" category="fonts 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" file="font-sym.mkvi"> + <cd:command name="doifitalicelse" level="system" category="fonts conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="getprivateslot" file="font-ini.mkvi"> + <cd:command name="getprivateslot" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getprivatechar" file="font-ini.mkvi"> + <cd:command name="getprivatechar" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="glyphfontfile" file="font-sym.mkvi"> + <cd:command name="glyphfontfile" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="getnamedglyphstyled" file="font-sym.mkvi"> + <cd:command name="getnamedglyphstyled" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getnamedglyphdirect" file="font-sym.mkvi"> + <cd:command name="getnamedglyphdirect" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getglyphstyled" file="font-sym.mkvi"> + <cd:command name="getglyphstyled" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1396,7 +1429,7 @@ </cd:arguments> </cd:command> - <cd:command name="getglyphdirect" file="font-sym.mkvi"> + <cd:command name="getglyphdirect" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1406,31 +1439,27 @@ </cd:arguments> </cd:command> - <cd:command name="resolvedglyphstyled" file="font-sym.mkvi"> + <cd:command name="resolvedglyphstyled" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> + <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="resolvedglyphdirect" file="font-sym.mkvi"> + <cd:command name="resolvedglyphdirect" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> + <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="setfont" file="font-sym.mkvi"> + <cd:command name="setfont" level="system" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="string-font"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefontchar" file="font-sym.mkvi"> + <cd:command name="doifelsefontchar" level="system" category="fonts conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-number"/> @@ -1439,7 +1468,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontcharelse" file="font-sym.mkvi"> + <cd:command name="doiffontcharelse" level="system" category="fonts conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-number"/> @@ -1448,15 +1477,15 @@ </cd:arguments> </cd:command> - <cd:command name="showchardata" file="font-tra.mkiv"> + <cd:command name="showchardata" level="document" category="fonts" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showfontdata" file="font-tra.mkiv"/> + <cd:command name="showfontdata" level="document" category="fonts" file="font-tra.mkiv"/> - <cd:command name="doifelsefontpresent" file="font-tra.mkiv"> + <cd:command name="doifelsefontpresent" level="system" category="fonts conditional" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-true"/> @@ -1464,7 +1493,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontpresentelse" file="font-tra.mkiv"> + <cd:command name="doiffontpresentelse" level="system" category="fonts conditional" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-true"/> @@ -1472,7 +1501,7 @@ </cd:arguments> </cd:command> - <cd:command name="showotfcomposition" file="font-tra.mkiv"> + <cd:command name="showotfcomposition" level="document" category="fonts" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1486,31 +1515,31 @@ </cd:arguments> </cd:command> - <cd:command name="fontclass" file="font-var.mkvi"/> + <cd:command name="fontclass" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontbody" file="font-var.mkvi"/> + <cd:command name="fontbody" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontstyle" file="font-var.mkvi"/> + <cd:command name="fontstyle" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontalternative" file="font-var.mkvi"/> + <cd:command name="fontalternative" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontsize" file="font-var.mkvi"/> + <cd:command name="fontsize" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontface" file="font-var.mkvi"/> + <cd:command name="fontface" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="typescriptone" file="type-ini.mkvi"/> + <cd:command name="typescriptone" level="system" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescripttwo" file="type-ini.mkvi"/> + <cd:command name="typescripttwo" level="system" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescriptthree" file="type-ini.mkvi"/> + <cd:command name="typescriptthree" level="system" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescriptcollection" type="environment" file="type-ini.mkvi"> + <cd:command name="typescriptcollection" type="environment" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usetypescriptfile" file="type-ini.mkvi"> + <cd:command name="usetypescriptfile" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -1519,7 +1548,7 @@ </cd:arguments> </cd:command> - <cd:command name="usetypescript" file="type-ini.mkvi"> + <cd:command name="usetypescript" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="serif"/> @@ -1545,22 +1574,22 @@ </cd:arguments> </cd:command> - <cd:command name="loadtypescriptfile" file="type-ini.mkvi"> + <cd:command name="loadtypescriptfile" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="quittypescriptscanning" file="type-ini.mkvi"/> + <cd:command name="quittypescriptscanning" level="style" category="fonts" file="type-ini.mkvi"/> - <cd:command name="definetypescriptsynonym" file="type-ini.mkvi"> + <cd:command name="definetypescriptsynonym" level="system" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="typescript" type="environment" file="type-ini.mkvi"> + <cd:command name="typescript" type="environment" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="serif"/> @@ -1578,20 +1607,20 @@ </cd:arguments> </cd:command> - <cd:command name="definetypescriptprefix" file="type-ini.mkvi"> + <cd:command name="definetypescriptprefix" level="system" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="typescriptprefix" file="type-ini.mkvi"> + <cd:command name="typescriptprefix" level="system" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definetypeface" file="type-ini.mkvi"> + <cd:command name="definetypeface" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -1640,7 +1669,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontexpansion" file="hand-ini.mkiv"> + <cd:command name="setupfontexpansion" level="style" category="fonts" file="hand-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -1663,7 +1692,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontprotrusion" file="hand-ini.mkiv"> + <cd:command name="setupfontprotrusion" level="style" category="fonts" file="hand-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -1683,9 +1712,17 @@ </cd:arguments> </cd:command> - <cd:command name="blockligatures" file="font-fea.mkiv"> + <cd:command name="blockligatures" level="style" category="fonts" file="font-fea.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-text-list"/> + </cd:arguments> + </cd:command> + + <!-- question for ws: maybe move to i-file with ... level="system" category="structure" ... --> + + <cd:command name="addfontpath" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> - <cd:resolve name="keyword-list"/> + <cd:resolve name="keyword-path-list"/> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-form.xml b/tex/context/interface/mkiv/i-form.xml index 13e669427..fcb4979d0 100644 --- a/tex/context/interface/mkiv/i-form.xml +++ b/tex/context/interface/mkiv/i-form.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupforms" file="scrn-fld.mkvi"> + <cd:command name="setupforms" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -20,4 +20,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-formula.xml b/tex/context/interface/mkiv/i-formula.xml index f6522fca4..07127a629 100644 --- a/tex/context/interface/mkiv/i-formula.xml +++ b/tex/context/interface/mkiv/i-formula.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineformula" file="math-for.mkiv"> + <cd:command name="defineformula" level="style" category="mathematics" file="math-for.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="setupformula" file="math-for.mkiv"> + <cd:command name="setupformula" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -31,6 +31,11 @@ <cd:constant type="flushright"/> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="split"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="page"/> + </cd:parameter> <cd:parameter name="strut"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> @@ -86,25 +91,39 @@ <cd:parameter name="frame"> <cd:constant type="number"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant type="none" default="yes"/> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="catcodes"> + <cd:constant type="cd:name"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupformulas" file="math-for.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupformula"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupformulas" level="style" category="mathematics" file="math-for.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupformula"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="definesubformula" file="math-for.mkiv"> + <cd:command name="definesubformula" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -114,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsubformula" file="math-for.mkiv"> + <cd:command name="setupsubformula" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -125,66 +144,98 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupsubformulas" file="math-for.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupsubformula"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupsubformulas" level="style" category="mathematics" file="math-for.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupsubformula"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="formula" type="environment" generated="yes" variant="example" file="strc-mat.mkiv"> + <cd:command name="formula" type="environment" generated="yes" variant="instance" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:sequence> - <cd:variable value="formula"/> + <cd:instance value="formula"/> <cd:string value="formula"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> </cd:arguments> <cd:instances> - <cd:constant value="sp"/> - <cd:constant value="sd"/> - <cd:constant value="mp"/> - <cd:constant value="md"/> + <cd:resolve name="instance-formula"/> </cd:instances> </cd:command> - <cd:command name="formula" type="environment" file="strc-mat.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="spformula" type="environment" file="strc-mat.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> + <cd:command name="formula" type="environment" generated="yes" variant="instance:assignment" level="document" category="mathematics" file="strc-mat.mkiv"> + <cd:sequence> + <cd:instance value="formula"/> + <cd:string value="formula"/> + </cd:sequence> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupformula"/> + </cd:assignments> + </cd:arguments> + <cd:instances> + <cd:resolve name="instance-formula"/> + </cd:instances> + </cd:command> - <cd:command name="sdformula" type="environment" file="strc-mat.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> + --> - <cd:command name="mpformula" type="environment" file="strc-mat.mkiv"> + <cd:command name="formula" 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" file="strc-mat.mkiv"> + <cd:command name="formula" type="environment" variant="assignment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> - <cd:resolve name="keyword-formula-list-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="option"> + <cd:resolve name="value-formula"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:resolve name="value-leftskip"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="snaptogrid"/> + </cd:parameter> + </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="defineformulaalternative" file="strc-mat.mkiv"> + <!-- + + <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"/> <cd:resolve name="keyword-csname"/> @@ -192,41 +243,41 @@ </cd:arguments> </cd:command> - <cd:command name="formula" file="strc-mat.mkiv"> + <cd:command name="formula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="displaymath" type="environment" file="strc-mat.mkiv"/> + <cd:command name="displaymath" type="environment" level="system" category="mathematics" file="strc-mat.mkiv"/> - <cd:command name="formulas" type="environment" file="strc-mat.mkiv"> + <cd:command name="formulas" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subformulas" type="environment" file="strc-mat.mkiv"> + <cd:command name="subformulas" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="namedsubformulas" type="environment" file="strc-mat.mkiv"> + <cd:command name="namedsubformulas" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="placeformula" file="strc-mat.mkiv"> + <cd:command name="placeformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placeformula" type="environment" file="strc-mat.mkiv"> + <cd:command name="placeformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="title"> @@ -242,31 +293,37 @@ </cd:arguments> </cd:command> - <cd:command name="placeformula" type="environment" variant="argument" file="strc-mat.mkiv"> + <cd:command name="placeformula" type="environment" variant="argument" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placenamedformula" file="strc-mat.mkiv"> + <cd:command name="placenamedformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="placesubformula" file="strc-mat.mkiv"> + <cd:command name="placesubformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="formulanumber" file="strc-mat"> + <cd:command name="formulanumber" level="document" category="mathematics" file="strc-mat"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placecurrentformulanumber" file="strc-mat"/> + <cd:command name="placecurrentformulanumber" level="system" category="mathematics" file="strc-mat"/> + + <cd:command name="alignhere" scope="formula" level="document" category="mathematics" file="strc-mat"/> + + <cd:command name="breakhere" scope="formula" level="document" category="mathematics" file="strc-mat"/> + + <cd:command name="splitformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-fraction.xml b/tex/context/interface/mkiv/i-fraction.xml index 2624b8a5c..33252dde2 100644 --- a/tex/context/interface/mkiv/i-fraction.xml +++ b/tex/context/interface/mkiv/i-fraction.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathfraction" file="math-frc.mkiv"> + <cd:command name="definemathfraction" level="style" category="mathematics" file="math-frc.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="setupmathfraction" file="math-frc.mkiv"> + <cd:command name="setupmathfraction" level="style" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -63,121 +63,125 @@ <cd:constant type="none" default="yes"/> <cd:constant type="overlay"/> </cd:parameter> + <cd:parameter name="inlinethreshold"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="displaythreshold"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="fences"> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupmathfractions" file="math-frc.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupmathfraction"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupmathfractions" level="style" category="mathematics" file="math-frc.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupmathfraction"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="fraction" generated="yes" variant="example" file="math-frc.mkiv"> + <cd:command name="fraction" generated="yes" variant="instance" level="document" category="mathematics" file="math-frc.mkiv"> <cd:sequence> - <cd:variable value="fraction"/> + <cd:instance value="fraction"/> </cd:sequence> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="xfrac"/> - <cd:constant value="xxfrac"/> - <cd:constant value="frac"/> - <cd:constant value="sfrac"/> - <cd:constant value="dfrac"/> - <cd:constant value="binom"/> - <cd:constant value="dbinom"/> - <cd:constant value="tbinom"/> + <cd:resolve name="instance-fraction"/> </cd:instances> </cd:command> - <cd:command name="frac" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="xfrac" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </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="xxfrac" 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="tfrac" 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="sfrac" 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="dfrac" 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="binom" 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="dbinom" 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="tbinom" 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" file="math-frc.mkiv"> + <cd:command name="splitfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="splitdfrac" file="math-frc.mkiv"> + <cd:command name="splitdfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="cfrac" file="math-frc.mkiv"> + <cd:command name="cfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="l"/> @@ -198,4 +202,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml index c7633aa91..a4667dd2e 100644 --- a/tex/context/interface/mkiv/i-framed.xml +++ b/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" file="pack-rul.mkiv"> + <cd:command name="defineframed" level="style" category="background rules" 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" file="pack-rul.mkiv"> + <cd:command name="setupframed" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -220,19 +220,19 @@ </cd:arguments> </cd:command> - <cd:command name="frameddimension" file="pack-rul.mkiv"> + <cd:command name="frameddimension" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="framedparameter" file="pack-rul.mkiv"> + <cd:command name="framedparameter" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="framed" file="pack-rul.mkiv"> + <cd:command name="framed" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -241,9 +241,9 @@ </cd:arguments> </cd:command> - <cd:command name="framed" generated="yes" variant="example" file="pack-rul.mkiv"> + <cd:command name="framed" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> <cd:sequence> - <cd:variable value="framed"/> + <cd:instance value="framed"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -252,12 +252,11 @@ <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="unframed"/> - <cd:constant value="fitfieldframed"/> + <cd:resolve name="instance-framed"/> </cd:instances> </cd:command> - <cd:command name="normalframedwithsettings" file="pack-rul.mkiv"> + <cd:command name="normalframedwithsettings" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupframed"/> @@ -266,7 +265,7 @@ </cd:arguments> </cd:command> - <cd:command name="framed" type="environment" file="pack-rul.mkiv"> + <cd:command name="framed" type="environment" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -275,7 +274,7 @@ </cd:arguments> </cd:command> - <cd:command name="fastlocalframed" file="pack-rul.mkiv"> + <cd:command name="fastlocalframed" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -285,7 +284,7 @@ </cd:arguments> </cd:command> - <cd:command name="localframed" file="pack-rul.mkiv"> + <cd:command name="localframed" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -295,14 +294,14 @@ </cd:arguments> </cd:command> - <cd:command name="directlocalframed" file="pack-rul.mkiv"> + <cd:command name="directlocalframed" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="localframedwithsettings" file="pack-rul.mkiv"> + <cd:command name="localframedwithsettings" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -312,7 +311,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeframed" file="pack-rul.mkiv"> + <cd:command name="placeframed" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -322,7 +321,7 @@ </cd:arguments> </cd:command> - <cd:command name="inframed" file="pack-rul.mkiv"> + <cd:command name="inframed" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -331,16 +330,20 @@ </cd:arguments> </cd:command> - <cd:command name="unframed" 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" file="pack-rul.mkiv"> + <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:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -350,7 +353,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathframed" file="pack-rul.mkiv"> + <cd:command name="setupmathframed" level="style" category="background rules mathematics" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -359,9 +362,9 @@ </cd:arguments> </cd:command> - <cd:command name="mathframed" generated="yes" variant="example" file="pack-rul.mkiv"> + <cd:command name="mathframed" generated="yes" variant="instance" level="document" category="background rules mathematics" file="pack-rul.mkiv"> <cd:sequence> - <cd:variable value="mathframed"/> + <cd:instance value="mathframed"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -370,40 +373,42 @@ <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="mframed"/> - <cd:constant value="inmframed"/> - <cd:constant value="mcframed"/> + <cd:resolve name="instance-mathframed"/> </cd:instances> </cd:command> - <cd:command name="mframed" 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" 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="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="mcframed" 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="defineformulaframed" file="math-for.mkiv"> + <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:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -413,7 +418,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupformulaframed" file="math-for.mkiv"> + <cd:command name="setupformulaframed" level="style" category="background rules mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -422,7 +427,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineframedtext" file="pack-rul.mkiv"> + <cd:command name="defineframedtext" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -432,7 +437,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedtext" file="pack-rul.mkiv"> + <cd:command name="setupframedtext" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -473,22 +478,18 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupframedtexts" file="pack-rul.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupframedtexts" level="style" category="background rules" file="pack-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupframedtext"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="framedtext" generated="yes" variant="example" file="pack-rul.mkiv"> + <cd:command name="framedtext" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> <cd:sequence> - <cd:variable value="framedtext"/> + <cd:instance value="framedtext"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -497,13 +498,13 @@ <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="framedtext"/> + <cd:resolve name="instance-framedtext"/> </cd:instances> </cd:command> - <cd:command name="framedtext" type="environment" generated="yes" variant="example" file="pack-rul.mkiv"> + <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> <cd:sequence> - <cd:variable value="framedtext"/> + <cd:instance value="framedtext"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -517,34 +518,38 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="framedtext"/> + <cd:resolve name="instance-framedtext"/> </cd:instances> </cd:command> - <cd:command name="framedtext" 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" 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="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" file="pack-rul.mkiv"> + <cd:command name="defineframedcontent" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -554,7 +559,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedcontent" file="pack-rul.mkiv"> + <cd:command name="setupframedcontent" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -585,7 +590,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedcontent" type="environment" file="pack-rul.mkiv"> + <cd:command name="framedcontent" type="environment" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -594,32 +599,32 @@ </cd:arguments> </cd:command> - <cd:command name="installleftframerenderer" file="pack-fen.mkiv"> + <cd:command name="installleftframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installrightframerenderer" file="pack-fen.mkiv"> + <cd:command name="installrightframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installtopframerenderer" file="pack-fen.mkiv"> + <cd:command name="installtopframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installbottomframerenderer" file="pack-fen.mkiv"> + <cd:command name="installbottomframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-framedtable.xml b/tex/context/interface/mkiv/i-framedtable.xml new file mode 100644 index 000000000..51699b5bc --- /dev/null +++ b/tex/context/interface/mkiv/i-framedtable.xml @@ -0,0 +1,86 @@ +<?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="defineframedtable" level="style" category="tables" 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:arguments> + <cd:resolve name="keyword-name-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="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupframedtablerow" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:keywords> + <cd:constant type="cd:number"/> + <cd:constant type="each"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupframedtablecolumn" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:keywords> + <cd:constant type="cd:number"/> + <cd:constant type="each"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="framedtable" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="framedrow" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="framedcell" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml index e66a039dc..d90be9e7b 100644 --- a/tex/context/interface/mkiv/i-graphics.xml +++ b/tex/context/interface/mkiv/i-graphics.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineexternalfigure" file="grph-inc.mkiv"> + <cd:command name="defineexternalfigure" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -16,7 +16,7 @@ <!-- - <cd:command name="defineexternalfigures" file="grph-inc.mkiv"> + <cd:command name="defineexternalfigures" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -28,7 +28,7 @@ --> - <cd:command name="setupexternalfigure" file="grph-inc.mkvi"> + <cd:command name="setupexternalfigure" level="style" category="graphics" file="grph-inc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -178,9 +178,11 @@ <cd:parameter name="backgroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> + <!-- + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + --> <cd:parameter name="xmax"> <cd:constant type="cd:number"/> </cd:parameter> @@ -240,7 +242,7 @@ <!-- - <cd:command name="setupexternalfigures" file="grph-inc.mkvi"> + <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"> @@ -251,7 +253,7 @@ --> - <cd:command name="useexternalfigure" file="grph-inc.mkiv"> + <cd:command name="useexternalfigure" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -262,7 +264,7 @@ </cd:arguments> </cd:command> - <cd:command name="externalfigure" file="grph-inc.mkiv"> + <cd:command name="externalfigure" level="document" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-optional"/> @@ -272,7 +274,7 @@ </cd:arguments> </cd:command> - <cd:command name="getfiguredimensions" file="grph-inc.mkiv"> + <cd:command name="getfiguredimensions" level="system" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -281,32 +283,32 @@ </cd:arguments> </cd:command> - <cd:command name="figurewidth" file="grph-inc.mkiv"/> + <cd:command name="figurewidth" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figureheight" file="grph-inc.mkiv"/> + <cd:command name="figureheight" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurenaturalwidth" file="grph-inc.mkiv"/> + <cd:command name="figurenaturalwidth" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurenaturalheight" file="grph-inc.mkiv"/> + <cd:command name="figurenaturalheight" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurefullname" file="grph-inc.mkiv"/> + <cd:command name="figurefullname" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurefilename" file="grph-inc.mkiv"/> + <cd:command name="figurefilename" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurefilepath" file="grph-inc.mkiv"/> + <cd:command name="figurefilepath" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurefiletype" file="grph-inc.mkiv"/> + <cd:command name="figurefiletype" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="noffigurepages" file="grph-inc.mkiv"/> + <cd:command name="noffigurepages" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="definegraphictypesynonym" file="grph-inc.mkiv"> + <cd:command name="definegraphictypesynonym" level="system" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefigure" file="grph-inc.mkiv"> + <cd:command name="doifelsefigure" level="system" category="graphics conditional" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -314,7 +316,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffigureelse" file="grph-inc.mkiv"> + <cd:command name="doiffigureelse" level="system" category="graphics conditional" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -322,7 +324,7 @@ </cd:arguments> </cd:command> - <cd:command name="registerexternalfigure" file="grph-inc.mkiv"> + <cd:command name="registerexternalfigure" level="system" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-optional"/> @@ -332,7 +334,7 @@ </cd:arguments> </cd:command> - <cd:command name="usefigurebase" file="grph-inc.mkiv"> + <cd:command name="usefigurebase" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -341,81 +343,81 @@ </cd:arguments> </cd:command> - <cd:command name="externalfigurecollection" type="environment" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollection" type="environment" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionminwidth" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionminwidth" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionmaxwidth" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionmaxwidth" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionminheight" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionminheight" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionmaxheight" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionmaxheight" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionparameter" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionparameter" level="system" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="efcminwidth" file="grph-inc.mkiv"> + <cd:command name="efcminwidth" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcmaxwidth" file="grph-inc.mkiv"> + <cd:command name="efcmaxwidth" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcminheight" file="grph-inc.mkiv"> + <cd:command name="efcminheight" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcmaxheight" file="grph-inc.mkiv"> + <cd:command name="efcmaxheight" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcparameter" file="grph-inc.mkiv"> + <cd:command name="efcparameter" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="overlayfigure" file="grph-inc.mkiv"> + <cd:command name="overlayfigure" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="bitmapimage" file="grph-inc.mkiv"> + <cd:command name="bitmapimage" level="document" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -442,7 +444,7 @@ </cd:arguments> </cd:command> - <cd:command name="bitmapimage" type="environment" file="grph-inc.mkiv"> + <cd:command name="bitmapimage" type="environment" level="document" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -466,7 +468,7 @@ </cd:arguments> </cd:command> - <cd:command name="typesetbuffer" file="grph-fig.mkiv"> + <cd:command name="typesetbuffer" level="document" category="graphics buffer" file="grph-fig.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="*"/> @@ -478,7 +480,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetypesetting" file="grph-fig.mkiv"> + <cd:command name="definetypesetting" level="style" category="graphics structure" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text-optional"/> @@ -488,7 +490,7 @@ </cd:arguments> </cd:command> - <cd:command name="typesetfile" file="grph-fig.mkiv"> + <cd:command name="typesetfile" level="document" category="graphics structure" file="grph-fig.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -504,7 +506,7 @@ </cd:arguments> </cd:command> - <cd:command name="backgroundimage" file="pack-box.mkiv"> + <cd:command name="backgroundimage" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-dimension"/> @@ -513,7 +515,7 @@ </cd:arguments> </cd:command> - <cd:command name="backgroundimagefill" file="pack-box.mkiv"> + <cd:command name="backgroundimagefill" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-dimension"/> @@ -522,4 +524,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-grid.xml b/tex/context/interface/mkiv/i-grid.xml index ac678e544..bd96388f3 100644 --- a/tex/context/interface/mkiv/i-grid.xml +++ b/tex/context/interface/mkiv/i-grid.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="showgrid" file="page-grd.mkiv"> + <cd:command name="showgrid" level="document" category="layout" file="page-grd.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -23,7 +23,7 @@ </cd:arguments> </cd:command> - <cd:command name="definegridsnapping" file="spac-ver.mkiv"> + <cd:command name="definegridsnapping" level="style" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="snaptogrid" file="spac-ver.mkiv"> + <cd:command name="snaptogrid" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-grid"/> @@ -69,7 +69,7 @@ </cd:arguments> </cd:command> - <cd:command name="snaptogrid" variant="list" file="spac-ver.mkiv"> + <cd:command name="snaptogrid" variant="list" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -79,7 +79,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeongrid" file="spac-ver.mkiv"> + <cd:command name="placeongrid" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-grid"/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeongrid" variant="list" file="spac-ver.mkiv"> + <cd:command name="placeongrid" variant="list" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="gridsnapping" type="environment" file="spac-ver.mkiv"> + <cd:command name="gridsnapping" type="environment" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-grid"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="gridsnapping" type="environment" variant="list" file="spac-ver.mkiv"> + <cd:command name="gridsnapping" type="environment" variant="list" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -113,15 +113,15 @@ </cd:arguments> </cd:command> - <cd:command name="usegridparameter" file="spac-ver.mkiv"> + <cd:command name="usegridparameter" level="system" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="showgridsnapping" file="spac-ver.mkiv"/> + <cd:command name="showgridsnapping" level="document" category="layout" file="spac-ver.mkiv"/> - <cd:command name="basegrid" file="meta-grd.mkiv"> + <cd:command name="basegrid" level="document" category="graphics" file="meta-grd.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -178,7 +178,7 @@ </cd:arguments> </cd:command> - <cd:command name="grid" file="meta-grd.mkiv"> + <cd:command name="grid" level="document" category="graphics" file="meta-grd.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="basegrid"/> @@ -186,4 +186,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-help.xml b/tex/context/interface/mkiv/i-help.xml index d0c0aa103..6e8612c5a 100644 --- a/tex/context/interface/mkiv/i-help.xml +++ b/tex/context/interface/mkiv/i-help.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehelp" file="scrn-hlp.mkvi"> + <cd:command name="definehelp" level="style" category="pdf" file="scrn-hlp.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="setuphelp" file="scrn-hlp.mkvi"> + <cd:command name="setuphelp" level="style" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -23,9 +23,9 @@ </cd:arguments> </cd:command> - <cd:command name="help" generated="yes" variant="example" file="scrn-hlp.mkvi"> + <cd:command name="help" generated="yes" variant="instance" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:sequence> - <cd:variable value="help"/> + <cd:instance value="help"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-reference-optional"/> @@ -33,46 +33,46 @@ <cd:resolve name="argument-text"/> </cd:arguments> <cd:instances> - <cd:constant value="helptext"/> + <cd:resolve name="instance-help"/> </cd:instances> </cd:command> - <cd:command name="help" type="environment" generated="yes" variant="example" file="scrn-hlp.mkvi"> + <cd:command name="help" type="environment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:sequence> - <cd:variable value="help"/> + <cd:instance value="help"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-reference-optional"/> </cd:arguments> <cd:instances> - <cd:constant value="helptext"/> + <cd:resolve name="instance-help"/> </cd:instances> </cd:command> - <cd:command name="doifelsehelp" file="scrn-hlp.mkvi"> + <cd:command name="doifelsehelp" level="system" category="pdf 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" file="scrn-hlp.mkvi"> + <cd:command name="doifhelpelse" level="system" category="pdf conditional" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="placehelp" file="scrn-hlp.mkvi"/> + <cd:command name="placehelp" level="document" category="pdf" file="scrn-hlp.mkvi"/> - <cd:command name="showhelp" file="scrn-hlp.mkvi"> + <cd:command name="showhelp" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="helptext" file="scrn-hlp.mkvi"> + <cd:command name="helptext" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-optional"/> <cd:resolve name="argument-text"/> @@ -80,10 +80,10 @@ </cd:arguments> </cd:command> - <cd:command name="helptext" type="environment" file="scrn-hlp.mkvi"> + <cd:command name="helptext" type="environment" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hemistich.xml b/tex/context/interface/mkiv/i-hemistich.xml new file mode 100644 index 000000000..a508c51f8 --- /dev/null +++ b/tex/context/interface/mkiv/i-hemistich.xml @@ -0,0 +1,92 @@ +<?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="definehemistich" level="style" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuphemistich"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuphemistich" level="style" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="width"> + <cd:constant type="local" default="yes"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="separator"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="leftstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="leftcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rightstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="rightcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="separatorstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="separatorcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="hemistiches" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="hemistiches" variant="assignment" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuphemistich"/> + </cd:assignments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="hemistich" generated="yes" variant="instance" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:sequence> + <cd:instance value="hemistich"/> + </cd:sequence> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="hemistichescaesura" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + <cd:constant type="cd:command"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-highlight.xml b/tex/context/interface/mkiv/i-highlight.xml index 7a990b13b..9da39818e 100644 --- a/tex/context/interface/mkiv/i-highlight.xml +++ b/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" file="core-sys.mkiv"> + <cd:command name="definehighlight" level="style" category="fonts 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" file="core-sys.mkiv"> + <cd:command name="setuphighlight" level="style" category="fonts 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" file="core-sys.mkiv"> + <cd:command name="highlight" generated="yes" variant="example" level="document" category="fonts 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" file="core-sys.mkiv"> + <cd:command name="highlight" level="document" category="fonts 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" file="core-sys.mkiv"> + <cd:command name="highlight" type="environment" level="document" category="fonts colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="directhighlight" file="core-sys.mkiv"> + <cd:command name="directhighlight" level="document" category="fonts colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml index 9b9c777a5..c1626e7b1 100644 --- a/tex/context/interface/mkiv/i-hspace.xml +++ b/tex/context/interface/mkiv/i-hspace.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehspace" file="spac-hor.mkiv"> + <cd:command name="definehspace" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="hspace" file="spac-hor.mkiv"> + <cd:command name="hspace" level="document" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords optional="yes"> @@ -40,29 +40,29 @@ </cd:arguments> </cd:command> - <cd:command name="hairspace" file="spac-hor.mkiv"/> + <cd:command name="hairspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="thinspace" file="spac-hor.mkiv"/> + <cd:command name="thinspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="medspace" file="spac-hor.mkiv"/> + <cd:command name="medspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="thickspace" file="spac-hor.mkiv"/> + <cd:command name="thickspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="autoinsertnextspace" file="spac-hor.mkiv"/> + <cd:command name="autoinsertnextspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="hglue" file="spac-ver.mkiv"> + <cd:command name="hglue" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="string-dimension"/> </cd:arguments> </cd:command> - <cd:command name="frenchspacing" file="spac-hor.mkiv"/> + <cd:command name="frenchspacing" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="newfrenchspacing" file="spac-hor.mkiv"/> + <cd:command name="newfrenchspacing" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="nonfrenchspacing" file="spac-hor.mkiv"/> + <cd:command name="nonfrenchspacing" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="setupspacing" file="spac-hor.mkiv"> + <cd:command name="setupspacing" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="fixed"/> @@ -72,45 +72,45 @@ </cd:arguments> </cd:command> - <cd:command name="space" file="spac-hor.mkiv"/> + <cd:command name="space" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="removelastspace" file="spac-hor.mkiv"/> + <cd:command name="removelastspace" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="nospace" file="spac-hor.mkiv"/> + <cd:command name="nospace" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="fixedspace" file="spac-hor.mkiv"/> + <cd:command name="fixedspace" level="document" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="fixedspaces" file="spac-hor.mkiv"/> + <cd:command name="fixedspaces" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="keepunwantedspaces" file="spac-hor.mkiv"/> + <cd:command name="keepunwantedspaces" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="removeunwantedspaces" file="spac-hor.mkiv"/> + <cd:command name="removeunwantedspaces" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="thinspace" file="spac-hor.mkiv"/> + <cd:command name="thinspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="negthinspace" file="spac-hor.mkiv"/> + <cd:command name="negthinspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="enspace" file="spac-hor.mkiv"/> + <cd:command name="enspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="enskip" file="spac-hor.mkiv"/> + <cd:command name="enskip" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="quad" file="spac-hor.mkiv"/> + <cd:command name="quad" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="qquad" file="spac-hor.mkiv"/> + <cd:command name="qquad" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="emspace" file="spac-hor.mkiv"/> + <cd:command name="emspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="dotfskip" file="spac-hor.mkiv"> + <cd:command name="dotfskip" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="leftskipadaption" file="spac-hor.mkiv"/> + <cd:command name="leftskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"/> - <cd:command name="rightskipadaption" file="spac-hor.mkiv"/> + <cd:command name="rightskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"/> - <cd:command name="dosetleftskipadaption" file="spac-hor.mkiv"> + <cd:command name="dosetleftskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-leftskip"/> @@ -118,7 +118,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosetrightskipadaption" file="spac-hor.mkiv"> + <cd:command name="dosetrightskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-rightskip"/> @@ -126,7 +126,7 @@ </cd:arguments> </cd:command> - <cd:command name="doadaptleftskip" file="spac-hor.mkiv"> + <cd:command name="doadaptleftskip" level="system" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-leftskip"/> @@ -134,7 +134,7 @@ </cd:arguments> </cd:command> - <cd:command name="doadaptrightskip" file="spac-hor.mkiv"> + <cd:command name="doadaptrightskip" level="system" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-rightskip"/> @@ -142,7 +142,7 @@ </cd:arguments> </cd:command> - <cd:command name="activatespacehandler" file="spac-hor.mkiv"> + <cd:command name="activatespacehandler" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="on"/> @@ -156,10 +156,10 @@ </cd:arguments> </cd:command> - <cd:command name="quads" file="spac-hor.mkiv"> + <cd:command name="quads" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hyphenation.xml b/tex/context/interface/mkiv/i-hyphenation.xml index 36cbc67e4..75cdbae75 100644 --- a/tex/context/interface/mkiv/i-hyphenation.xml +++ b/tex/context/interface/mkiv/i-hyphenation.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuphyphenation" file="lang-hyp.mkiv"> + <cd:command name="setuphyphenation" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="hyphenation" type="environment" file="lang-hyp.mkiv"> + <cd:command name="hyphenation" type="environment" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="original"/> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="definehypenationfeatures" file="lang-hyp.mkiv"> + <cd:command name="definehypenationfeatures" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="sethyphenationfeatures" file="lang-hyp.mkiv"> + <cd:command name="sethyphenationfeatures" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -97,37 +97,37 @@ </cd:arguments> </cd:command> - <cd:command name="resethyphenationfeatures" file="lang-hyp.mkiv"/> + <cd:command name="resethyphenationfeatures" level="style" category="language" file="lang-hyp.mkiv"/> - <cd:command name="registerhyphenationpattern" file="lang-hyp.mkiv"> + <cd:command name="registerhyphenationpattern" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="unregisterhyphenationpattern" file="lang-hyp.mkiv"> + <cd:command name="unregisterhyphenationpattern" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="showhyphenationtrace" file="lang-hyp.mkiv"> + <cd:command name="showhyphenationtrace" level="document" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="registerhyphenationexception" file="lang-hyp.mkiv"> + <cd:command name="registerhyphenationexception" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setuphyphenmark" file="typo-del.mkiv"> + <cd:command name="setuphyphenmark" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="sign"> @@ -138,13 +138,13 @@ </cd:arguments> </cd:command> - <cd:command name="definebreakpoints" file="typo-brk.mkiv"> + <cd:command name="definebreakpoints" level="style" category="language" file="typo-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definebreakpoint" file="typo-brk.mkiv"> + <cd:command name="definebreakpoint" level="style" category="language" file="typo-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -184,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="setbreakpoints" file="typo-brk.mkiv"> + <cd:command name="setbreakpoints" level="style" category="language" file="typo-brk.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -193,72 +193,72 @@ </cd:arguments> </cd:command> - <cd:command name="resetbreakpoints" file="typo-brk.mkiv"/> + <cd:command name="resetbreakpoints" level="style" category="language" file="typo-brk.mkiv"/> - <cd:command name="showhyphens" file="supp-box.mkiv"> + <cd:command name="showhyphens" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedword" file="supp-box.mkiv"> + <cd:command name="hyphenatedword" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedpar" file="supp-box.mkiv"> + <cd:command name="hyphenatedpar" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedfile" file="supp-box.mkiv"> + <cd:command name="hyphenatedfile" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedcoloredword" file="supp-box.mkiv"> + <cd:command name="hyphenatedcoloredword" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedhbox" file="supp-box.mkiv"> + <cd:command name="hyphenatedhbox" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="sethyphenatedurlbefore" file="lang-url.mkiv"> + <cd:command name="sethyphenatedurlbefore" level="style" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="sethyphenatedurlafter" file="lang-url.mkiv"> + <cd:command name="sethyphenatedurlafter" level="style" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="sethyphenatedurlnormal" file="lang-url.mkiv"> + <cd:command name="sethyphenatedurlnormal" level="style" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedurl" file="lang-url.mkiv"> + <cd:command name="hyphenatedurl" level="document" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedfilename" file="lang-url.mkiv"> + <cd:command name="hyphenatedfilename" level="document" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-imposition.xml b/tex/context/interface/mkiv/i-imposition.xml index b4bd4dee5..98fdcf253 100644 --- a/tex/context/interface/mkiv/i-imposition.xml +++ b/tex/context/interface/mkiv/i-imposition.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="installshipoutmethod" file="page-imp.mkiv"> + <cd:command name="installshipoutmethod" level="system" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="invokepageheandler" file="page-imp.mkiv"> + <cd:command name="invokepageheandler" level="system" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuparranging" file="page-imp.mkiv"> + <cd:command name="setuparranging" level="style" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="disable"/> @@ -68,7 +68,7 @@ </cd:arguments> </cd:command> - <cd:command name="installpagearrangement" file="page-imp.mkiv"> + <cd:command name="installpagearrangement" level="system" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -77,6 +77,6 @@ </cd:arguments> </cd:command> - <cd:command name="arrangedpages" type="environment" begin="push" end="pop" file="page-imp.mkiv"/> + <cd:command name="arrangedpages" type="environment" begin="push" end="pop" level="system" category="layout" file="page-imp.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-indent.xml b/tex/context/interface/mkiv/i-indent.xml index 7e2fb5ca3..ed91b9193 100644 --- a/tex/context/interface/mkiv/i-indent.xml +++ b/tex/context/interface/mkiv/i-indent.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineindenting" file="spac-hor.mkiv"> + <cd:command name="defineindenting" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupindenting" file="spac-hor.mkiv"> + <cd:command name="setupindenting" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="small" prefix="cd:sign" method="none"/> @@ -54,21 +54,21 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizeindenting" file="spac-hor.mkiv"/> + <cd:command name="synchronizeindenting" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="useindentingparameter" file="spac-hor.mkiv"> + <cd:command name="useindentingparameter" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="indentation" file="spac-hor.mkiv" coreprimitive="yes"/> + <cd:command name="indentation" coreprimitive="yes" level="document" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="noindentation" file="spac-hor.mkiv" coreprimitive="yes"/> + <cd:command name="noindentation" coreprimitive="yes" level="document" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="doindentation" file="spac-hor.mkiv" coreprimitive="yes"/> + <cd:command name="doindentation" coreprimitive="yes" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="checknextindentation" file="spac-hor.mkiv"> + <cd:command name="checknextindentation" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -78,14 +78,14 @@ </cd:arguments> </cd:command> - <cd:command name="useindentnextparameter" file="spac-hor.mkiv"> + <cd:command name="useindentnextparameter" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dorechecknextindentation" file="spac-hor.mkiv"/> + <cd:command name="dorechecknextindentation" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="indentation" type="environment" begin="push" end="pop" file="spac-hor.mkiv"/> + <cd:command name="indentation" type="environment" begin="push" end="pop" level="system" category="whitespace" file="spac-hor.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-indentedtext.xml b/tex/context/interface/mkiv/i-indentedtext.xml index 98812d5e0..8d19c321f 100644 --- a/tex/context/interface/mkiv/i-indentedtext.xml +++ b/tex/context/interface/mkiv/i-indentedtext.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineindentedtext" file="strc-ind.mkiv"> + <cd:command name="defineindentedtext" level="style" category="structure" file="strc-ind.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="setupindentedtext" file="strc-ind.mkiv"> + <cd:command name="setupindentedtext" level="style" category="structure" file="strc-ind.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -57,16 +57,16 @@ </cd:arguments> </cd:command> - <cd:command name="indentedtext" type="environment" generated="yes" variant="example" file="strc-ind.mkiv"> + <cd:command name="indentedtext" type="environment" generated="yes" variant="example" level="document" category="structure" file="strc-ind.mkiv"> <cd:sequence> <cd:variable value="indentedtext"/> </cd:sequence> </cd:command> - <cd:command name="indentedtext" type="environment" file="strc-ind.mkiv"> + <cd:command name="indentedtext" type="environment" level="document" category="structure" file="strc-ind.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-initial.xml b/tex/context/interface/mkiv/i-initial.xml index d50a7bc61..6c0dd7657 100644 --- a/tex/context/interface/mkiv/i-initial.xml +++ b/tex/context/interface/mkiv/i-initial.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinitial" file="typo-drp.mkiv"> + <cd:command name="defineinitial" level="style" category="fonts" file="typo-drp.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="setupinitial" file="typo-drp.mkiv"> + <cd:command name="setupinitial" level="style" category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -63,13 +63,13 @@ </cd:arguments> </cd:command> - <cd:command name="placeinitial" file="typo-drp.mkiv"> + <cd:command name="placeinitial" level="document" category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="setinitial" file="typo-drp.mkiv"> + <cd:command name="setinitial" level="document" category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-injector.xml b/tex/context/interface/mkiv/i-injector.xml index 321aa75c8..3728d7bb8 100644 --- a/tex/context/interface/mkiv/i-injector.xml +++ b/tex/context/interface/mkiv/i-injector.xml @@ -4,37 +4,37 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="resetinjector" file="typo-inj.mkiv"> + <cd:command name="resetinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="markinjector" file="typo-inj.mkiv"> + <cd:command name="markinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="checkinjector" file="typo-inj.mkiv"> + <cd:command name="checkinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="checkpreviousinjector" file="typo-inj.mkiv"> + <cd:command name="checkpreviousinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="checknextinjector" file="typo-inj.mkiv"> + <cd:command name="checknextinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setinjector" file="typo-inj.mkiv"> + <cd:command name="setinjector" level="document" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-list"/> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="showinjector" file="typo-inj.mkiv"> + <cd:command name="showinjector" level="document" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> @@ -50,19 +50,19 @@ <!-- - <cd:command name="doinstallinjector" file="typo-inj.mkiv"> + <cd:command name="doinstallinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doactivateinjector" file="typo-inj.mkiv"> + <cd:command name="doactivateinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dotestinjector" file="typo-inj.mkiv"> + <cd:command name="dotestinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -70,4 +70,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-insertion.xml b/tex/context/interface/mkiv/i-insertion.xml index 9250c9ebf..c8c4ed721 100644 --- a/tex/context/interface/mkiv/i-insertion.xml +++ b/tex/context/interface/mkiv/i-insertion.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinsertion" file="page-ins.mkiv"> + <cd:command name="defineinsertion" level="system" category="structure" file="page-ins.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="setupinsertion" file="page-ins.mkiv"> + <cd:command name="setupinsertion" level="system" category="structure" file="page-ins.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseinsertion" file="page-ins.mkiv"> + <cd:command name="doifelseinsertion" level="system" category="structure 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" file="page-ins.mkiv"> + <cd:command name="doifinsertionelse" level="system" category="structure 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interaction.xml b/tex/context/interface/mkiv/i-interaction.xml index 1c3285b84..2496e5d94 100644 --- a/tex/context/interface/mkiv/i-interaction.xml +++ b/tex/context/interface/mkiv/i-interaction.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinteraction" file="scrn-ini.mkvi"> + <cd:command name="defineinteraction" level="style" category="pdf" file="scrn-ini.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="setupinteraction" file="scrn-ini.mkvi"> + <cd:command name="setupinteraction" level="style" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -119,13 +119,13 @@ </cd:arguments> </cd:command> - <cd:command name="setupinteraction" variant="name" file="scrn-ini.mkvi"> + <cd:command name="setupinteraction" variant="name" level="style" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="interaction" type="environment" file="scrn-ini.mkvi"> + <cd:command name="interaction" type="environment" level="system" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hidden"/> @@ -134,7 +134,7 @@ </cd:arguments> </cd:command> - <cd:command name="setinteraction" file="scrn-ini.mkvi"> + <cd:command name="setinteraction" level="system" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hidden"/> @@ -143,18 +143,18 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselocation" file="scrn-ini.mkvi"> + <cd:command name="doifelselocation" level="system" category="pdf 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" file="scrn-ini.mkvi"> + <cd:command name="doiflocationelse" level="system" category="pdf conditional" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionbar.xml b/tex/context/interface/mkiv/i-interactionbar.xml index 67c31216a..e03d2a071 100644 --- a/tex/context/interface/mkiv/i-interactionbar.xml +++ b/tex/context/interface/mkiv/i-interactionbar.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinteractionbar" file="scrn-bar.mkvi"> + <cd:command name="defineinteractionbar" level="style" category="pdf" file="scrn-bar.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="setupinteractionbar" file="scrn-bar.mkvi"> + <cd:command name="setupinteractionbar" level="style" category="pdf" file="scrn-bar.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="interactionbar" file="scrn-bar.mkvi"> + <cd:command name="interactionbar" level="style" category="pdf" file="scrn-bar.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -84,7 +84,7 @@ </cd:arguments> </cd:command> - <cd:command name="interactionbuttons" file="scrn-bar.mkvi"> + <cd:command name="interactionbuttons" level="style" category="pdf" file="scrn-bar.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupinteractionbar"/> @@ -97,4 +97,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionmenu.xml b/tex/context/interface/mkiv/i-interactionmenu.xml index 22b928a5a..32fac36f9 100644 --- a/tex/context/interface/mkiv/i-interactionmenu.xml +++ b/tex/context/interface/mkiv/i-interactionmenu.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinteractionmenu" file="scrn-but.mkvi"> + <cd:command name="defineinteractionmenu" 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="setupinteractionmenu" file="scrn-but.mkvi"> + <cd:command name="setupinteractionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -125,7 +125,7 @@ <!-- - <cd:command name="setupinteractionmenus" file="scrn-but.mkvi"> + <cd:command name="setupinteractionmenus" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -136,13 +136,13 @@ --> - <cd:command name="interactionmenu" type="environment" file="scrn-but.mkvi"> + <cd:command name="interactionmenu" type="environment" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetinteractionmenu" file="scrn-but.mkvi"> + <cd:command name="resetinteractionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -150,7 +150,7 @@ <!-- - <cd:command name="raw" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="raw" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -158,13 +158,13 @@ </cd:arguments> </cd:command> - <cd:command name="raw" type="environment" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="raw" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="but" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="but" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -172,13 +172,13 @@ </cd:arguments> </cd:command> - <cd:command name="but" type="environment" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="but" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="got" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="got" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -186,38 +186,38 @@ </cd:arguments> </cd:command> - <cd:command name="got" type="environment" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="got" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="nop" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="nop" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="\"/> </cd:arguments> </cd:command> - <cd:command name="nop" type="environment" scope="interactionmenu" file="scrn-but.mkvi"/> + <cd:command name="nop" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"/> - <cd:command name="txt" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="txt" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="\"/> </cd:arguments> </cd:command> - <cd:command name="txt" type="environment" scope="interactionmenu" file="scrn-but.mkvi"/> + <cd:command name="txt" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"/> - <cd:command name="rul" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="rul" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="\"/> </cd:arguments> </cd:command> - <cd:command name="rul" type="environment" scope="interactionmenu" file="scrn-but.mkvi"/> + <cd:command name="rul" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"/> <cd:command name="com" scope="interactionmenu" file="scrn-but.mkvi"> <cd:arguments> @@ -226,17 +226,17 @@ </cd:arguments> </cd:command> - <cd:command name="com" type="environment" scope="interactionmenu" file="scrn-but.mkvi"/> + <cd:command name="com" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"/> --> - <cd:command name="includemenu" file="scrn-but.mkvi"> + <cd:command name="includemenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -245,7 +245,7 @@ </cd:arguments> </cd:command> - <cd:command name="menubutton" variant="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="menubutton" variant="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -258,7 +258,7 @@ </cd:arguments> </cd:command> - <cd:command name="menubutton" variant="button" file="scrn-but.mkvi"> + <cd:command name="menubutton" variant="button" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -270,11 +270,11 @@ </cd:arguments> </cd:command> - <cd:command name="registermenubuttons" file="scrn-but.mkvi"> + <cd:command name="registermenubuttons" level="system" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionscreen.xml b/tex/context/interface/mkiv/i-interactionscreen.xml index 6e337f6d6..bf26cd962 100644 --- a/tex/context/interface/mkiv/i-interactionscreen.xml +++ b/tex/context/interface/mkiv/i-interactionscreen.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupinteractionscreen" file="scrn-pag.mkvi"> + <cd:command name="setupinteractionscreen" level="style" category="pdf" file="scrn-pag.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -45,10 +45,15 @@ <cd:constant type="portrait"/> <cd:constant type="page"/> <cd:constant type="paper"/> + <cd:constant type="attachment"/> + <cd:constant type="layer"/> </cd:parameter> <cd:parameter name="copies"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="print"> + <cd:constant type="cd:list"/> + </cd:parameter> <cd:parameter name="delay"> <cd:constant type="none" default="yes"/> <cd:constant type="cd:number"/> @@ -57,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="screen" file="scrn-pag.mkvi"> + <cd:command name="screen" level="document" category="pdf" file="scrn-pag.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="page"/> diff --git a/tex/context/interface/mkiv/i-interface.xml b/tex/context/interface/mkiv/i-interface.xml index a9b35bbe5..66b48535e 100644 --- a/tex/context/interface/mkiv/i-interface.xml +++ b/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" file="mult-ini.mkiv"/> + <cd:command name="defaultinterface" level="system" file="mult-ini.mkiv"/> - <cd:command name="currentinterface" file="mult-ini.mkiv"/> + <cd:command name="currentinterface" level="system" file="mult-ini.mkiv"/> - <cd:command name="currentresponses" file="mult-ini.mkiv"/> + <cd:command name="currentresponses" level="system" file="mult-ini.mkiv"/> - <cd:command name="interface" type="environment" file="mult-ini.mkiv"> + <cd:command name="interface" type="environment" level="system" 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" file="mult-ini.mkiv"> + <cd:command name="defineinterfaceconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defineinterfacevariable" file="mult-ini.mkiv"> + <cd:command name="defineinterfacevariable" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defineinterfaceelement" file="mult-ini.mkiv"> + <cd:command name="defineinterfaceelement" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definefileconstant" file="mult-ini.mkiv"> + <cd:command name="definefileconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definesystemconstant" file="mult-ini.mkiv"> + <cd:command name="definesystemconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definemessageconstant" file="mult-ini.mkiv"> + <cd:command name="definemessageconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definesystemvariable" file="mult-ini.mkiv"> + <cd:command name="definesystemvariable" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacemessage" file="mult-ini.mkiv"> + <cd:command name="setinterfacemessage" level="system" 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" file="mult-ini.mkiv"> + <cd:command name="setmessagetext" level="system" 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" file="mult-ini.mkiv"/> + <cd:command name="currentmessagetext" level="system" file="mult-ini.mkiv"/> - <cd:command name="getmessage" file="mult-ini.mkiv"> + <cd:command name="getmessage" level="system" 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" file="mult-ini.mkiv"> + <cd:command name="doifelsemessage" level="system" 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" file="mult-ini.mkiv"> + <cd:command name="doifmessageelse" level="system" 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" file="mult-ini.mkiv"> + <cd:command name="showmessage" level="system" 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" file="mult-ini.mkiv"> + <cd:command name="writestatus" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="message" file="mult-ini.mkiv"> + <cd:command name="message" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="inlinemessage" file="mult-ini.mkiv"> + <cd:command name="inlinemessage" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="displaymessage" file="mult-ini.mkiv"> + <cd:command name="displaymessage" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showwarning" file="mult-ini.mkiv"> + <cd:command name="showwarning" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -170,28 +170,28 @@ </cd:arguments> </cd:command> - <cd:command name="setinterfaceconstant" file="mult-ini.mkiv"> + <cd:command name="setinterfaceconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacevariable" file="mult-ini.mkiv"> + <cd:command name="setinterfacevariable" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfaceelements" file="mult-ini.mkiv"> + <cd:command name="setinterfaceelement" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacecommand" file="mult-ini.mkiv"> + <cd:command name="setinterfacecommand" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -199,4 +199,4 @@ </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interlinespace.xml b/tex/context/interface/mkiv/i-interlinespace.xml index b93bac7f5..94911afb9 100644 --- a/tex/context/interface/mkiv/i-interlinespace.xml +++ b/tex/context/interface/mkiv/i-interlinespace.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinterlinespace" file="spac-ver.mkiv"> + <cd:command name="defineinterlinespace" level="style" category="whitespace" file="spac-ver.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="setupinterlinespace" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" level="style" category="whitespace" file="spac-ver.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="setupinterlinespace" variant="argument" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" variant="argument" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -69,13 +69,13 @@ </cd:arguments> </cd:command> - <cd:command name="setupinterlinespace" variant="name" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" variant="name" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setuplocalinterlinespace" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -84,7 +84,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplocalinterlinespace" variant="argument" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" variant="argument" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -100,13 +100,13 @@ </cd:arguments> </cd:command> - <cd:command name="setuplocalinterlinespace" variant="name" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" variant="name" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="switchtointerlinespace" file="spac-ver.mkiv"> + <cd:command name="switchtointerlinespace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -115,7 +115,7 @@ </cd:arguments> </cd:command> - <cd:command name="switchtointerlinespace" variant="argument" file="spac-ver.mkiv"> + <cd:command name="switchtointerlinespace" variant="argument" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -131,13 +131,13 @@ </cd:arguments> </cd:command> - <cd:command name="switchtointerlinespace" variant="name" file="spac-ver.mkiv"> + <cd:command name="switchtointerlinespace" variant="name" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="dosetupcheckedinterlinespace" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:assignments delimiters="braces" list="yes"> <cd:inherit name="setupinterlinespace"/> @@ -145,7 +145,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosetupcheckedinterlinespace" variant="argument" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" variant="argument" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="on"/> @@ -161,16 +161,16 @@ </cd:arguments> </cd:command> - <cd:command name="dosetupcheckedinterlinespace" variant="name" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" variant="name" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="useinterlinespaceparameter" file="spac-ver.mkiv"> + <cd:command name="useinterlinespaceparameter" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-ipsum.xml b/tex/context/interface/mkiv/i-ipsum.xml index f96fc5229..b3fb7cfdd 100644 --- a/tex/context/interface/mkiv/i-ipsum.xml +++ b/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" file="m-ipsum.mkiv"> + <cd:command name="defineipsum" level="style" 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" file="m-ipsum.mkiv"> + <cd:command name="setupipsum" level="style" 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" file="m-ipsum.mkiv"> + <cd:command name="ipsum" level="document" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -72,7 +72,7 @@ </cd:arguments> </cd:command> - <cd:command name="directipsum" file="m-ipsum.mkiv"> + <cd:command name="directipsum" level="document" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-italiccorrection.xml b/tex/context/interface/mkiv/i-italiccorrection.xml index f8d711ae8..2d406bdf5 100644 --- a/tex/context/interface/mkiv/i-italiccorrection.xml +++ b/tex/context/interface/mkiv/i-italiccorrection.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setitaliccorrection" file="typo-itc.mkvi"> + <cd:command name="setitaliccorrection" level="system" category="fonts" file="typo-itc.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -14,11 +14,11 @@ </cd:arguments> </cd:command> - <cd:command name="resetitaliccorrection" file="typo-itc.mkvi"/> + <cd:command name="resetitaliccorrection" level="style" category="fonts" file="typo-itc.mkvi"/> - <cd:command name="italiccorrection" file="typo-itc.mkvi"/> + <cd:command name="italiccorrection" level="style" category="fonts" file="typo-itc.mkvi"/> - <cd:command name="setupitaliccorrection" file="typo-itc.mkvi"> + <cd:command name="setupitaliccorrection" level="style" category="fonts" file="typo-itc.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="text"/> @@ -29,4 +29,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml index 6fb28b635..84cae20bb 100644 --- a/tex/context/interface/mkiv/i-itemgroup.xml +++ b/tex/context/interface/mkiv/i-itemgroup.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineitemgroup" file="strc-itm.mkvi"> + <cd:command name="defineitemgroup" level="style" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -43,6 +43,7 @@ <cd:constant type="joinedup"/> <cd:constant type="serried"/> <cd:constant type="stopper"/> + <cd:constant type="nostopper"/> <cd:constant type="unpacked"/> <cd:constant type="repeat"/> <cd:constant type="norepeat"/> @@ -193,12 +194,15 @@ <cd:parameter name="symcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" variant="assignment" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" variant="assignment" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -376,12 +380,15 @@ <cd:parameter name="symcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupitemgroups" file="strc-itm.mkvi"> + <cd:command name="setupitemgroups" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -393,7 +400,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" generated="yes" variant="instance" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" generated="yes" variant="instance" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="itemgroup"/> @@ -415,7 +422,7 @@ </cd:instances> </cd:command> - <cd:command name="itemgroup" type="environment" generated="yes" variant="instance" file="strc-itm.mkvi"> + <cd:command name="itemgroup" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-itm.mkvi"> <cd:sequence> <cd:instance value="itemgroup"/> </cd:sequence> @@ -432,7 +439,7 @@ </cd:instances> </cd:command> - <cd:command name="itemgroup" type="environment" file="strc-itm.mkvi"> + <cd:command name="itemgroup" type="environment" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -444,15 +451,15 @@ </cd:arguments> </cd:command> - <cd:command name="item" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="item" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="noitem" scope="itemgroup" file="strc-itm.mkvi"/> + <cd:command name="noitem" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"/> - <cd:command name="itemtag" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="itemtag" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> @@ -460,36 +467,36 @@ <!-- - <cd:command name="itm" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="itm" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="but" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="but" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="nop" scope="itemgroup" file="strc-itm.mkvi"/> + <cd:command name="nop" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"/> - <cd:command name="txt" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="txt" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="head" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="head" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="par"/> </cd:arguments> </cd:command> - <cd:command name="headsym" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="headsym" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -497,44 +504,44 @@ </cd:arguments> </cd:command> - <cd:command name="sym" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="sym" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ran" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="ran" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mar" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="mar" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="sub" scope="itemgroup" file="strc-itm.mkvi"/> + <cd:command name="sub" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"/> - <cd:command name="its" scope="itemgroup" file="strc-itm.mkvi"/> + <cd:command name="its" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"/> --> - <cd:command name="item" type="environment" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="item" type="environment" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="head" type="environment" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="head" type="environment" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="specialitem" type="environment" variant="item" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="item" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="item" default="yes"/> @@ -543,7 +550,7 @@ </cd:arguments> </cd:command> - <cd:command name="specialitem" type="environment" variant="symbol" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="symbol" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -554,7 +561,7 @@ </cd:arguments> </cd:command> - <cd:command name="specialitem" type="environment" variant="none" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="none" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="sub"/> @@ -565,7 +572,7 @@ <!-- - <cd:command name="itemize" type="environment" file="strc-itm.mkvi"> + <cd:command name="itemize" type="environment" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setupitemgroup"/> @@ -576,7 +583,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemize" file="strc-itm.mkvi"> + <cd:command name="setupitemize" level="style" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="each"/> diff --git a/tex/context/interface/mkiv/i-items.xml b/tex/context/interface/mkiv/i-items.xml index d3f68132a..ab50b669d 100644 --- a/tex/context/interface/mkiv/i-items.xml +++ b/tex/context/interface/mkiv/i-items.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineitems" file="typo-itm.mkiv"> + <cd:command name="defineitems" level="style" category="symbols" file="typo-itm.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="setupitems" file="typo-itm.mkiv"> + <cd:command name="setupitems" level="style" category="symbols" file="typo-itm.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -73,7 +73,7 @@ </cd:arguments> </cd:command> - <cd:command name="items" file="typo-itm.mkiv"> + <cd:command name="items" level="document" category="symbols" file="typo-itm.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupitems"/> @@ -82,4 +82,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-javascript.xml b/tex/context/interface/mkiv/i-javascript.xml index 965ed5388..e97c5109c 100644 --- a/tex/context/interface/mkiv/i-javascript.xml +++ b/tex/context/interface/mkiv/i-javascript.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="JScode" type="environment" file="java-ini.mkiv"> + <cd:command name="JScode" type="environment" level="system" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:keywords delimiters="none"> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="JSpreamble" type="environment" file="java-ini.mkiv"> + <cd:command name="JSpreamble" type="environment" level="system" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:keywords delimiters="none"> @@ -27,25 +27,25 @@ </cd:arguments> </cd:command> - <cd:command name="setJSpreamble" file="java-ini.mkiv"> + <cd:command name="setJSpreamble" level="system" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="addtoJSpreamble" file="java-ini.mkiv"> + <cd:command name="addtoJSpreamble" level="system" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="useJSscripts" file="java-ini.mkiv"> + <cd:command name="useJSscripts" level="style" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-kerning.xml b/tex/context/interface/mkiv/i-kerning.xml index aacb4a6ea..b45e916f2 100644 --- a/tex/context/interface/mkiv/i-kerning.xml +++ b/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" file="typo-krn.mkiv"> + <cd:command name="definecharacterkerning" level="style" category="fonts 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" file="typo-krn.mkiv"> + <cd:command name="setupcharacterkerning" level="style" category="fonts 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" file="typo-krn.mkiv"> + <cd:command name="setcharacterkerning" level="style" category="fonts 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" file="typo-krn.mkiv"/> + <cd:command name="resetcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"/> - <cd:command name="characterkerning" generated="yes" variant="example" file="typo-krn.mkiv"> + <cd:command name="characterkerning" generated="yes" variant="example" level="document" category="fonts 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" file="typo-krn.mkiv"> + <cd:command name="kerncharacters" level="document" category="fonts 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" file="typo-krn.mkiv"> + <cd:command name="letterspacing" level="document" category="fonts 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" file="typo-krn.mkiv"> + <cd:command name="stretched" level="document" category="fonts 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" file="typo-krn.mkiv"> + <cd:command name="setupstretched" level="style" category="fonts whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacterkerning"/> @@ -90,4 +90,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-label.xml b/tex/context/interface/mkiv/i-label.xml index fe7851d9d..a09360aa7 100644 --- a/tex/context/interface/mkiv/i-label.xml +++ b/tex/context/interface/mkiv/i-label.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelabel" file="strc-lab.mkiv"> + <cd:command name="definelabel" level="style" category="structure" file="strc-lab.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="setuplabel" file="strc-lab.mkiv"> + <cd:command name="setuplabel" level="style" category="structure" file="strc-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -131,6 +131,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </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:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -178,7 +184,7 @@ <!-- - <cd:command name="setuplabels" file="strc-lab.mkiv"> + <cd:command name="setuplabels" level="style" category="structure" file="strc-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -189,7 +195,7 @@ --> - <cd:command name="label" generated="yes" variant="example" file="strc-lab.mkiv"> + <cd:command name="label" generated="yes" variant="example" level="document" category="structure" file="strc-lab.mkiv"> <cd:sequence> <cd:variable value="label"/> </cd:sequence> @@ -199,7 +205,7 @@ </cd:arguments> </cd:command> - <cd:command name="currentlabel" generated="yes" variant="example" file="strc-lab.mkiv"> + <cd:command name="currentlabel" generated="yes" variant="example" level="document" category="structure" file="strc-lab.mkiv"> <cd:sequence> <cd:string value="current"/> <cd:variable value="label"/> @@ -210,4 +216,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-labeltext.xml b/tex/context/interface/mkiv/i-labeltext.xml index 34c70231f..7ad6b6ba8 100644 --- a/tex/context/interface/mkiv/i-labeltext.xml +++ b/tex/context/interface/mkiv/i-labeltext.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelabelclass" file="lang-lab.mkiv"> + <cd:command name="definelabelclass" level="system" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="setuplabeltext" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="setuplabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="label"/> @@ -26,7 +26,7 @@ </cd:instances> </cd:command> - <cd:command name="presetlabeltext" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="presetlabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="preset"/> <cd:instance value="label"/> @@ -41,7 +41,7 @@ </cd:instances> </cd:command> - <cd:command name="copylabeltext" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="copylabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="copy"/> <cd:instance value="label"/> @@ -56,7 +56,7 @@ </cd:instances> </cd:command> - <cd:command name="labeltext" type="environment" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="labeltext" type="environment" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -70,7 +70,7 @@ </cd:instances> </cd:command> - <cd:command name="labellanguage" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="labellanguage" generated="yes" variant="instance" level="system" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:instance value="label"/> <cd:string value="language"/> @@ -80,7 +80,7 @@ </cd:instances> </cd:command> - <cd:command name="labeltext" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="labeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -93,7 +93,7 @@ </cd:instances> </cd:command> - <cd:command name="labeltexts" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="labeltexts" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:instance value="label"/> <cd:string value="texts"/> @@ -107,7 +107,7 @@ </cd:instances> </cd:command> - <cd:command name="leftlabeltext" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="leftlabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="left"/> <cd:instance value="label"/> @@ -121,7 +121,7 @@ </cd:instances> </cd:command> - <cd:command name="rightlabeltext" generated="yes" variant="instance" file="lang-lab.mkiv"> + <cd:command name="rightlabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="right"/> <cd:instance value="label"/> @@ -137,382 +137,382 @@ <!-- - <cd:command name="setuplabeltext" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"/> + <cd:command name="labellanguage" level="system" category="language" file="lang-lab.mkiv"/> - <cd:command name="labeltext" 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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"/> + <cd:command name="headlanguage" level="system" category="language" file="lang-lab.mkiv"/> - <cd:command name="headtext" 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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"/> + <cd:command name="mathlabellanguage" level="system" category="language" file="lang-lab.mkiv"/> - <cd:command name="mathlabeltext" 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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"> + <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" file="lang-lab.mkiv"/> + <cd:command name="taglabellanguage" level="system" category="language" file="lang-lab.mkiv"/> - <cd:command name="taglabeltext" 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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"/> + <cd:command name="unitlanguage" level="system" category="language" file="phys-dim.mkiv"/> - <cd:command name="unittext" 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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"/> + <cd:command name="operatorlanguage" level="system" category="language" file="phys-dim.mkiv"/> - <cd:command name="operatortext" 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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"/> + <cd:command name="prefixlanguage" level="system" category="language" file="phys-dim.mkiv"/> - <cd:command name="prefixtext" 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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"> + <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" file="phys-dim.mkiv"/> + <cd:command name="suffixlanguage" level="system" category="language" file="phys-dim.mkiv"/> - <cd:command name="suffixtext" 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" file="publ-ini.mkiv"> + <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" file="publ-ini.mkiv"> + <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" file="publ-ini.mkiv"> + <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" file="publ-ini.mkiv"> + <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" file="publ-ini.mkiv"/> + <cd:command name="btxlabellanguage" level="system" category="language" file="publ-ini.mkiv"/> - <cd:command name="btxlabeltext" 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> @@ -520,4 +520,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-language.xml b/tex/context/interface/mkiv/i-language.xml index 395e08c34..357061321 100644 --- a/tex/context/interface/mkiv/i-language.xml +++ b/tex/context/interface/mkiv/i-language.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="installlanguage" file="lang-ini.mkiv"> + <cd:command name="installlanguage" level="system" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -13,14 +13,14 @@ </cd:arguments> </cd:command> - <cd:command name="installlanguage" variant="name" file="lang-ini.mkiv"> + <cd:command name="installlanguage" variant="name" level="system" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="setuplanguage" file="lang-ini.mkiv"> + <cd:command name="setuplanguage" level="style" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -62,6 +62,12 @@ <cd:parameter name="font"> <cd:constant type="auto"/> </cd:parameter> + <cd:parameter name="bidi"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="l2r"/> + <cd:constant type="r2l"/> + </cd:parameter> <cd:parameter name="text"> <cd:constant type="cd:text"/> </cd:parameter> @@ -124,15 +130,15 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselanguage" file="lang-ini.mkiv"> + <cd:command name="doifelselanguage" level="system" category="language conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - - <cd:command name="doiflanguageelse" file="lang-ini.mkiv"> + + <cd:command name="doiflanguageelse" level="system" category="language conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -140,15 +146,15 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepatterns" file="lang-ini.mkiv"> + <cd:command name="doifelsepatterns" level="system" category="language conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - - <cd:command name="doifpatternselse" file="lang-ini.mkiv"> + + <cd:command name="doifpatternselse" level="system" category="language conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -156,41 +162,41 @@ </cd:arguments> </cd:command> - <cd:command name="language" generated="yes" variant="example" file="lang-ini.mkiv"> + <cd:command name="language" generated="yes" variant="example" level="document" category="language" file="lang-ini.mkiv"> <cd:sequence> <cd:variable value="language"/> </cd:sequence> </cd:command> - <cd:command name="language" file="lang-ini.mkiv"> + <cd:command name="language" level="document" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="mainlanguage" file="lang-ini.mkiv"> + <cd:command name="mainlanguage" level="style" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="uselanguageparameter" file="lang-ini.mkiv"> + <cd:command name="uselanguageparameter" level="system" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="exceptions" type="environment" file="lang-ini.mkiv"> + <cd:command name="exceptions" type="environment" level="style" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="currentlanguage" file="lang-ini.mkiv"/> + <cd:command name="currentlanguage" level="system" category="language" file="lang-ini.mkiv"/> - <cd:command name="currentmainlanguage" file="lang-ini.mkiv"/> + <cd:command name="currentmainlanguage" level="system" category="language" file="lang-ini.mkiv"/> - <cd:command name="commalistsentence" file="lang-lab.mkiv"> + <cd:command name="commalistsentence" level="document" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:text"/> diff --git a/tex/context/interface/mkiv/i-layer.xml b/tex/context/interface/mkiv/i-layer.xml index 9157ecdbf..77aaf7d52 100644 --- a/tex/context/interface/mkiv/i-layer.xml +++ b/tex/context/interface/mkiv/i-layer.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuplayeredtext" file="pack-box.mkiv"> + <cd:command name="setuplayeredtext" level="style" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -19,7 +19,7 @@ </cd:arguments> </cd:command> - <cd:command name="layeredtext" file="pack-box.mkiv"> + <cd:command name="layeredtext" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplayer"/> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelayeredtext" file="pack-box.mkiv"> + <cd:command name="placelayeredtext" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlayerframed" file="pack-box.mkiv"> + <cd:command name="setlayerframed" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlayerframed" variant="combination" file="pack-box.mkiv"> + <cd:command name="setlayerframed" variant="combination" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -70,7 +70,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlayertext" file="pack-box.mkiv"> + <cd:command name="setlayertext" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -94,7 +94,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelayer" file="pack-lyr.mkiv"> + <cd:command name="definelayer" level="style" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -104,7 +104,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayer" file="pack-lyr.mkiv"> + <cd:command name="setuplayer" level="style" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -221,37 +221,37 @@ </cd:arguments> </cd:command> - <cd:command name="resetlayer" file="pack-lyr.mkiv"> + <cd:command name="resetlayer" level="style" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushlayer" file="pack-lyr.mkiv"> + <cd:command name="flushlayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tightlayer" file="pack-lyr.mkiv"> + <cd:command name="tightlayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="placelayer" file="pack-lyr.mkiv"> + <cd:command name="placelayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="composedlayer" file="pack-lyr.mkiv"> + <cd:command name="composedlayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setlayer" file="pack-lyr.mkiv"> + <cd:command name="setlayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -267,7 +267,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelayerpreset" file="pack-lyr.mkiv"> + <cd:command name="definelayerpreset" level="system" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -276,14 +276,14 @@ </cd:arguments> </cd:command> - <cd:command name="definelayerpreset" variant="name" file="pack-lyr.mkiv"> + <cd:command name="definelayerpreset" variant="name" level="system" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelselayerdata" file="pack-lyr.mkiv"> + <cd:command name="doifelselayerdata" level="system" category="background 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" file="pack-lyr.mkiv"> + <cd:command name="doiflayerdataelse" level="system" category="background conditional" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -299,11 +299,11 @@ </cd:arguments> </cd:command> - <cd:command name="layerwidth" file="pack-lyr.mkiv"/> + <cd:command name="layerwidth" level="system" category="background" file="pack-lyr.mkiv"/> - <cd:command name="layerheight" file="pack-lyr.mkiv"/> + <cd:command name="layerheight" level="system" category="background" file="pack-lyr.mkiv"/> - <cd:command name="setMPlayer" file="pack-lyr.mkiv"> + <cd:command name="setMPlayer" level="document" category="background 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" file="pack-lyr.mkiv"> + <cd:command name="getMPlayer" level="document" category="background 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-layout.xml b/tex/context/interface/mkiv/i-layout.xml index f3e42515e..19b233988 100644 --- a/tex/context/interface/mkiv/i-layout.xml +++ b/tex/context/interface/mkiv/i-layout.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelayout" file="page-lay.mkiv"> + <cd:command name="definelayout" level="style" category="layout" file="page-lay.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="setuplayout" file="page-lay.mkiv"> + <cd:command name="setuplayout" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -211,7 +211,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayout" variant="name" file="page-lay.mkiv"> + <cd:command name="setuplayout" variant="name" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -220,7 +220,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayoutdefined" file="page-lay.mkiv"> + <cd:command name="doifelselayoutdefined" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -228,7 +228,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayoutdefinedelse" file="page-lay.mkiv"> + <cd:command name="doiflayoutdefinedelse" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -236,7 +236,7 @@ </cd:arguments> </cd:command> - <cd:command name="adaptlayout" file="page-lay.mkiv"> + <cd:command name="adaptlayout" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-list-optional"/> <cd:assignments list="yes"> @@ -251,27 +251,27 @@ </cd:arguments> </cd:command> - <cd:command name="layout" type="environment" file="page-lay.mkiv"> + <cd:command name="layout" type="environment" level="document" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseoddpage" file="page-lay.mkiv"> + <cd:command name="doifelseoddpage" level="system" category="layout 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" file="page-lay.mkiv"> + <cd:command name="doifoddpageelse" level="system" category="layout 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" file="page-lay.mkiv"> + <cd:command name="doifbothsidesoverruled" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -279,7 +279,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifbothsides" file="page-lay.mkiv"> + <cd:command name="doifbothsides" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -287,14 +287,14 @@ </cd:arguments> </cd:command> - <cd:command name="rightorleftpageaction" file="page-lay.mkiv"> + <cd:command name="rightorleftpageaction" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="showprint" file="page-run.mkiv"> + <cd:command name="showprint" level="document" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setuppapersize"/> @@ -308,7 +308,7 @@ </cd:arguments> </cd:command> - <cd:command name="showframe" file="page-run.mkiv"> + <cd:command name="showframe" level="document" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="top"/> @@ -327,7 +327,7 @@ </cd:arguments> </cd:command> - <cd:command name="showsetups" file="page-run.mkiv"> + <cd:command name="showsetups" level="document" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="pt" default="yes"/> @@ -345,7 +345,7 @@ </cd:arguments> </cd:command> - <cd:command name="showlayout" file="page-run.mkiv"> + <cd:command name="showlayout" level="document" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="pt" default="yes"/> @@ -363,8 +363,22 @@ </cd:arguments> </cd:command> - <cd:command name="showmargins" file="page-run.mkiv"/> + <cd:command name="showmargins" level="document" category="layout" file="page-run.mkiv"/> - <cd:command name="spread" type="environment" file="page-spr.mkiv"/> + <cd:command name="spread" type="environment" level="document" category="layout" file="page-spr.mkiv"/> -</cd:interface> + <cd:command name="doifelsetopofpage" level="system" category="layout conditional" file="page-lay.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-lay.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 diff --git a/tex/context/interface/mkiv/i-linenumber.xml b/tex/context/interface/mkiv/i-linenumber.xml index 1c7ca2f75..3dc562e68 100644 --- a/tex/context/interface/mkiv/i-linenumber.xml +++ b/tex/context/interface/mkiv/i-linenumber.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelinenumbering" file="page-lin.mkvi"> + <cd:command name="definelinenumbering" level="style" category="structure" file="page-lin.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="setuplinenumbering" file="page-lin.mkvi"> + <cd:command name="setuplinenumbering" level="style" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -89,7 +89,7 @@ </cd:arguments> </cd:command> - <cd:command name="linenumbering" type="environment" file="page-lin.mkvi"> + <cd:command name="linenumbering" type="environment" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -112,7 +112,7 @@ </cd:arguments> </cd:command> - <cd:command name="linenumbering" type="environment" variant="argument" file="page-lin.mkvi"> + <cd:command name="linenumbering" type="environment" variant="argument" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords optional="yes"> @@ -122,25 +122,25 @@ </cd:arguments> </cd:command> - <cd:command name="someline" file="page-lin.mkvi"> + <cd:command name="someline" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="startline" file="page-lin.mkvi"> + <cd:command name="startline" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="stopline" file="page-lin.mkvi"> + <cd:command name="stopline" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesamelinereference" file="page-lin.mkvi"> + <cd:command name="doifelsesamelinereference" level="system" category="structure 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" file="page-lin.mkvi"> + <cd:command name="doifsamelinereferenceelse" level="system" category="structure conditional" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -156,17 +156,17 @@ </cd:arguments> </cd:command> - <cd:command name="inline" file="page-lin.mkvi"> + <cd:command name="inline" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="argument-text-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="inlinerange" file="page-lin.mkvi"> + <cd:command name="inlinerange" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lines.xml b/tex/context/interface/mkiv/i-lines.xml index 32c3c6b70..500786276 100644 --- a/tex/context/interface/mkiv/i-lines.xml +++ b/tex/context/interface/mkiv/i-lines.xml @@ -4,33 +4,33 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="noflines" file="supp-box.mkiv"/> + <cd:command name="noflines" level="system" file="supp-box.mkiv"/> - <cd:command name="getnoflines" file="supp-box.mkiv"> + <cd:command name="getnoflines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getroundednoflines" file="supp-box.mkiv"> + <cd:command name="getroundednoflines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getrawnoflines" file="supp-box.mkiv"> + <cd:command name="getrawnoflines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="determinenoflines" file="supp-box.mkiv"> + <cd:command name="determinenoflines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definelines" file="spac-lin.mkiv"> + <cd:command name="definelines" level="style" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -40,7 +40,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplines" file="spac-lin.mkiv"> + <cd:command name="setuplines" level="style" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="lines" type="environment" generated="yes" variant="instance" file="spac-lin.mkiv"> + <cd:command name="lines" type="environment" generated="yes" variant="instance" level="document" file="spac-lin.mkiv"> <cd:sequence> <cd:instance value="lines"/> </cd:sequence> @@ -104,7 +104,7 @@ <!-- - <cd:command name="lines" type="environment" file="spac-lin.mkiv"> + <cd:command name="lines" type="environment" level="document" file="spac-lin.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplines"/> @@ -114,10 +114,10 @@ --> - <cd:command name="emptylines" file="spac-lin.mkiv"> + <cd:command name="emptylines" level="document" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linetable.xml b/tex/context/interface/mkiv/i-linetable.xml index 9b4cae16a..a515f40fd 100644 --- a/tex/context/interface/mkiv/i-linetable.xml +++ b/tex/context/interface/mkiv/i-linetable.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuplinetable" file="tabl-ltb.mkiv"> + <cd:command name="setuplinetable" level="style" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="r"/> @@ -98,7 +98,7 @@ </cd:arguments> </cd:command> - <cd:command name="linetablecell" type="environment" file="tabl-ltb.mkiv"> + <cd:command name="linetablecell" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> @@ -106,19 +106,19 @@ </cd:arguments> </cd:command> - <cd:command name="linetable" type="environment" file="tabl-ltb.mkiv"/> + <cd:command name="linetable" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"/> - <cd:command name="linetablehead" type="environment" file="tabl-ltb.mkiv"/> + <cd:command name="linetablehead" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"/> - <cd:command name="linetablebody" type="environment" file="tabl-ltb.mkiv"/> + <cd:command name="linetablebody" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"/> - <cd:command name="processlinetablebuffer" file="tabl-ltb.mkiv"> + <cd:command name="processlinetablebuffer" level="document" category="tables buffer" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="processlinetablefile" file="tabl-ltb.mkiv"> + <cd:command name="processlinetablefile" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> @@ -126,7 +126,7 @@ <!-- - <cd:command name="BC" scope="linetable" file="tabl-ltb.mkiv"> + <cd:command name="BC" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> @@ -136,21 +136,21 @@ </cd:arguments> </cd:command> - <cd:command name="BR" scope="linetable" file="tabl-ltb.mkiv"> + <cd:command name="BR" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="ER"/> </cd:arguments> </cd:command> - <cd:command name="BH" scope="linetable" file="tabl-ltb.mkiv"> + <cd:command name="BH" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="EH"/> </cd:arguments> </cd:command> - <cd:command name="NC" scope="linetable" file="tabl-ltb.mkiv"> + <cd:command name="NC" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> @@ -158,8 +158,8 @@ </cd:arguments> </cd:command> - <cd:command name="NR" scope="linetable" file="tabl-ltb.mkiv"/> + <cd:command name="NR" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"/> --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linewidth.xml b/tex/context/interface/mkiv/i-linewidth.xml index 65a967954..6d9043a1f 100644 --- a/tex/context/interface/mkiv/i-linewidth.xml +++ b/tex/context/interface/mkiv/i-linewidth.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuplinewidth" file="pack-rul.mkiv"> + <cd:command name="setuplinewidth" level="style" category="layout" file="pack-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="small"/> @@ -15,6 +15,6 @@ </cd:arguments> </cd:command> - <cd:command name="linewidth" file="pack-rul.mkiv"/> + <cd:command name="linewidth" level="style" category="layout" file="pack-rul.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-list.xml b/tex/context/interface/mkiv/i-list.xml index 7e0def052..8d4863dd2 100644 --- a/tex/context/interface/mkiv/i-list.xml +++ b/tex/context/interface/mkiv/i-list.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelist" file="strc-lst.mkvi"> + <cd:command name="definelist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-list-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplist" file="strc-lst.mkvi"> + <cd:command name="setuplist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list-optional"/> <cd:assignments list="yes"> @@ -296,7 +296,7 @@ <!-- - <cd:command name="setuplists" file="strc-lst.mkvi"> + <cd:command name="setuplists" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list-optional"/> <cd:assignments list="yes"> @@ -307,7 +307,7 @@ --> - <cd:command name="doifelselist" file="strc-lst.mkvi"> + <cd:command name="doifelselist" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-list"/> <cd:resolve name="argument-true"/> @@ -315,7 +315,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflistelse" file="strc-lst.mkvi"> + <cd:command name="doiflistelse" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-list"/> <cd:resolve name="argument-true"/> @@ -323,7 +323,7 @@ </cd:arguments> </cd:command> - <cd:command name="writebetweenlist" file="strc-lst.mkvi"> + <cd:command name="writebetweenlist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -333,7 +333,7 @@ </cd:arguments> </cd:command> - <cd:command name="writedatatolist" file="strc-lst.mkvi"> + <cd:command name="writedatatolist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -343,7 +343,7 @@ </cd:arguments> </cd:command> - <cd:command name="writetolist" file="strc-lst.mkvi"> + <cd:command name="writetolist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -354,7 +354,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelist" file="strc-lst.mkvi"> + <cd:command name="placelist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list"/> <cd:assignments list="yes" optional="yes"> @@ -363,7 +363,7 @@ </cd:arguments> </cd:command> - <cd:command name="placerawlist" file="strc-lst.mkvi"> + <cd:command name="placerawlist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -372,7 +372,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelist" file="strc-lst.mkvi"> + <cd:command name="completelist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -381,7 +381,7 @@ </cd:arguments> </cd:command> - <cd:command name="definecombinedlist" file="strc-lst.mkvi"> + <cd:command name="definecombinedlist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-list-list"/> @@ -391,7 +391,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcombinedlist" file="strc-lst.mkvi"> + <cd:command name="setupcombinedlist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes"> @@ -400,7 +400,7 @@ </cd:arguments> </cd:command> - <cd:command name="placecombinedlist" file="strc-lst.mkvi"> + <cd:command name="placecombinedlist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -409,7 +409,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcombinedlist" generated="yes" variant="instance" file="strc-lst.mkvi"> + <cd:command name="setupcombinedlist" generated="yes" variant="instance" level="style" category="structure" file="strc-lst.mkvi"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="combinedlist"/> @@ -424,7 +424,7 @@ </cd:instances> </cd:command> - <cd:command name="placecombinedlist" generated="yes" variant="instance" file="strc-lst.mkvi"> + <cd:command name="placecombinedlist" generated="yes" variant="instance" level="document" category="structure" file="strc-lst.mkvi"> <cd:sequence> <cd:string value="place"/> <cd:instance value="combinedlist"/> @@ -439,7 +439,7 @@ </cd:instances> </cd:command> - <cd:command name="completecombinedlist" generated="yes" variant="instance" file="strc-lst.mkvi"> + <cd:command name="completecombinedlist" generated="yes" variant="instance" level="document" category="structure" file="strc-lst.mkvi"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="combinedlist"/> @@ -456,7 +456,7 @@ <!-- - <cd:command name="setupcontent" file="strc-lst.mkvi"> + <cd:command name="setupcontent" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuplist"/> @@ -464,7 +464,7 @@ </cd:arguments> </cd:command> - <cd:command name="placecontent" file="strc-lst.mkvi"> + <cd:command name="placecontent" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -472,7 +472,7 @@ </cd:arguments> </cd:command> - <cd:command name="completecontent" file="strc-lst.mkvi"> + <cd:command name="completecontent" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -482,47 +482,47 @@ --> - <cd:command name="structurelistuservariable" file="strc-lst.mkvi"> + <cd:command name="structurelistuservariable" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="rawstructurelistuservariable" file="strc-lst.mkvi"> + <cd:command name="rawstructurelistuservariable" level="system" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="doifelsestructurelisthaspage" file="strc-lst.mkvi"> + <cd:command name="doifelsestructurelisthaspage" level="system" category="structure 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" file="strc-lst.mkvi"> + <cd:command name="doifstructurelisthaspageelse" level="system" category="structure 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" file="strc-lst.mkvi"> + <cd:command name="doifelsestructurelisthasnumber" level="system" category="structure 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" file="strc-lst.mkvi"> + <cd:command name="doifstructurelisthasnumberelse" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="definelistextra" file="strc-lst.mkvi"> + <cd:command name="definelistextra" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -532,7 +532,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplistextra" file="strc-lst.mkvi"> + <cd:command name="setuplistextra" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -546,7 +546,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelistalternative" file="strc-lst.mkvi"> + <cd:command name="definelistalternative" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -556,7 +556,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplistalternative" file="strc-lst.mkvi"> + <cd:command name="setuplistalternative" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -588,7 +588,7 @@ </cd:arguments> </cd:command> - <cd:command name="determinelistcharacteristics" file="strc-lst.mkvi"> + <cd:command name="determinelistcharacteristics" level="system" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list"/> <cd:assignments list="yes" optional="yes"> @@ -597,21 +597,21 @@ </cd:arguments> </cd:command> - <cd:command name="currentlistentrynumber" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrynumber" level="style" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrytitle" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrytitle" level="style" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrytitlerendered" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrytitlerendered" level="style" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrypagenumber" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrypagenumber" level="style" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistsymbol" file="strc-lst.mkvi"/> + <cd:command name="currentlistsymbol" level="system" category="structure" file="strc-lst.mkvi"/> - <cd:command name="listlength" file="strc-lst.mkvi"/> + <cd:command name="listlength" level="system" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrywrapper" type="environment" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrywrapper" type="environment" level="system" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentryreferenceattribute" file="strc-lst.mkvi"> + <cd:command name="currentlistentryreferenceattribute" level="system" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="number"/> @@ -622,9 +622,9 @@ </cd:arguments> </cd:command> - <cd:command name="currentlistentrydestinationattribute" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrydestinationattribute" level="system" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrylimitedtext" file="strc-lst.mkvi"> + <cd:command name="currentlistentrylimitedtext" level="system" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-logo.xml b/tex/context/interface/mkiv/i-logo.xml index e3327400a..8f8186a83 100644 --- a/tex/context/interface/mkiv/i-logo.xml +++ b/tex/context/interface/mkiv/i-logo.xml @@ -4,102 +4,102 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="TeX" file="cont-log.mkiv"/> + <cd:command name="TeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="ConTeXt" file="cont-log.mkiv"/> + <cd:command name="ConTeXt" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PPCHTeX" file="cont-log.mkiv"/> + <cd:command name="PPCHTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PRAGMA" file="cont-log.mkiv"/> + <cd:command name="PRAGMA" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LaTeX" file="cont-log.mkiv"/> + <cd:command name="LaTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="TaBlE" file="cont-log.mkiv"/> + <cd:command name="TaBlE" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PiCTeX" file="cont-log.mkiv"/> + <cd:command name="PiCTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="AmSTeX" file="cont-log.mkiv"/> + <cd:command name="AmSTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LamSTeX" file="cont-log.mkiv"/> + <cd:command name="LamSTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="Context" file="cont-log.mkiv"/> + <cd:command name="Context" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MetaFont" file="cont-log.mkiv"/> + <cd:command name="MetaFont" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MetaPost" file="cont-log.mkiv"/> + <cd:command name="MetaPost" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MetaFun" file="cont-log.mkiv"/> + <cd:command name="MetaFun" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="eTeX" file="cont-log.mkiv"/> + <cd:command name="eTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="pdfTeX" file="cont-log.mkiv"/> + <cd:command name="pdfTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="pdfeTeX" file="cont-log.mkiv"/> + <cd:command name="pdfeTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="Lua" file="cont-log.mkiv"/> + <cd:command name="Lua" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="luaTeX" file="cont-log.mkiv"/> + <cd:command name="luaTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="luajitTeX" file="cont-log.mkiv"/> + <cd:command name="luajitTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="metaTeX" file="cont-log.mkiv"/> + <cd:command name="metaTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="XeTeX" file="cont-log.mkiv"/> + <cd:command name="XeTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LuaTeX" file="cont-log.mkiv"/> + <cd:command name="LuaTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LuajitTeX" file="cont-log.mkiv"/> + <cd:command name="LuajitTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKII" file="cont-log.mkiv"/> + <cd:command name="MKII" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKIV" file="cont-log.mkiv"/> + <cd:command name="MKIV" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKVI" file="cont-log.mkiv"/> + <cd:command name="MKVI" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKIX" file="cont-log.mkiv"/> + <cd:command name="MKIX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKXI" file="cont-log.mkiv"/> + <cd:command name="MKXI" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MPII" file="cont-log.mkiv"/> + <cd:command name="MPII" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MPIV" file="cont-log.mkiv"/> + <cd:command name="MPIV" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MPVI" file="cont-log.mkiv"/> + <cd:command name="MPVI" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="METAFONT" file="cont-log.mkiv"/> + <cd:command name="METAFONT" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="METAPOST" file="cont-log.mkiv"/> + <cd:command name="METAPOST" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PPCHTEX" file="cont-log.mkiv"/> + <cd:command name="PPCHTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="CONTEXT" file="cont-log.mkiv"/> + <cd:command name="CONTEXT" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="METAFUN" file="cont-log.mkiv"/> + <cd:command name="METAFUN" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="TEX" file="cont-log.mkiv"/> + <cd:command name="TEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LATEX" file="cont-log.mkiv"/> + <cd:command name="LATEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PICTEX" file="cont-log.mkiv"/> + <cd:command name="PICTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="TABLE" file="cont-log.mkiv"/> + <cd:command name="TABLE" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="AMSTEX" file="cont-log.mkiv"/> + <cd:command name="AMSTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LAMSTEX" file="cont-log.mkiv"/> + <cd:command name="LAMSTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="INRSTEX" file="cont-log.mkiv"/> + <cd:command name="INRSTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="ETEX" file="cont-log.mkiv"/> + <cd:command name="ETEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PDFTEX" file="cont-log.mkiv"/> + <cd:command name="PDFTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PDFETEX" file="cont-log.mkiv"/> + <cd:command name="PDFETEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LUATEX" file="cont-log.mkiv"/> + <cd:command name="LUATEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LUAJITTEX" file="cont-log.mkiv"/> + <cd:command name="LUAJITTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="XETEX" file="cont-log.mkiv"/> + <cd:command name="XETEX" level="document" category="symbols" file="cont-log.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lohi.xml b/tex/context/interface/mkiv/i-lohi.xml index 1fe891b2c..c174a9f54 100644 --- a/tex/context/interface/mkiv/i-lohi.xml +++ b/tex/context/interface/mkiv/i-lohi.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelow" file="typo-scr.mkiv"> + <cd:command name="definelow" level="style" category="fonts" file="typo-scr.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="setuplow" file="typo-scr.mkiv"> + <cd:command name="setuplow" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="low" generated="yes" variant="instance" file="typo-scr.mkiv"> + <cd:command name="low" generated="yes" variant="instance" level="document" category="fonts" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="low"/> </cd:sequence> @@ -46,13 +46,13 @@ </cd:instances> </cd:command> - <cd:command name="low" file="typo-scr.mkiv"> + <cd:command name="low" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definehigh" file="typo-scr.mkiv"> + <cd:command name="definehigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphigh" file="typo-scr.mkiv"> + <cd:command name="setuphigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="high" generated="yes" variant="instance" file="typo-scr.mkiv"> + <cd:command name="high" generated="yes" variant="instance" level="document" category="fonts" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="high"/> </cd:sequence> @@ -94,13 +94,13 @@ </cd:instances> </cd:command> - <cd:command name="high" file="typo-scr.mkiv"> + <cd:command name="high" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definelowhigh" file="typo-scr.mkiv"> + <cd:command name="definelowhigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -110,7 +110,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplowhigh" file="typo-scr.mkiv"> + <cd:command name="setuplowhigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -133,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowhigh" generated="yes" variant="instance" file="typo-scr.mkiv"> + <cd:command name="lowhigh" generated="yes" variant="instance" level="document" category="fonts" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="lowhigh"/> </cd:sequence> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="lohi" file="typo-scr.mkiv"> + <cd:command name="lohi" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -158,7 +158,7 @@ </cd:arguments> </cd:command> - <cd:command name="hilo" file="typo-scr.mkiv"> + <cd:command name="hilo" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -169,7 +169,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelowmidhigh" file="typo-scr.mkiv"> + <cd:command name="definelowmidhigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -179,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplowmidhigh" file="typo-scr.mkiv"> + <cd:command name="setuplowmidhigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -199,7 +199,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowmidhigh" generated="yes" variant="instance" file="typo-scr.mkiv"> + <cd:command name="lowmidhigh" generated="yes" variant="instance" level="document" category="fonts" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="lowmidhigh"/> </cd:sequence> @@ -210,7 +210,7 @@ </cd:arguments> </cd:command> - <cd:command name="lomihi" file="typo-scr.mkiv"> + <cd:command name="lomihi" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -218,7 +218,7 @@ </cd:arguments> </cd:command> - <cd:command name="himilo" file="typo-scr.mkiv"> + <cd:command name="himilo" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -226,4 +226,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lua.xml b/tex/context/interface/mkiv/i-lua.xml index ef970609b..c7f114251 100644 --- a/tex/context/interface/mkiv/i-lua.xml +++ b/tex/context/interface/mkiv/i-lua.xml @@ -4,190 +4,190 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="taggedctxcommand" file="back-exp.mkiv"> + <cd:command name="taggedctxcommand" level="system" category="lua" file="back-exp.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luafunction" file="cldf-ini.mkiv"> + <cd:command name="luafunction" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="cldprocessfile" file="cldf-ini.mkiv"> + <cd:command name="cldprocessfile" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="cldloadfile" file="cldf-ini.mkiv"> + <cd:command name="cldloadfile" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="cldcontext" file="cldf-ini.mkiv"> + <cd:command name="cldcontext" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="cldcommand" file="cldf-ini.mkiv"> + <cd:command name="cldcommand" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxdirectlua" file="luat-cod.mkiv"> + <cd:command name="ctxdirectlua" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlatelua" file="luat-cod.mkiv"> + <cd:command name="ctxlatelua" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxsprint" file="luat-cod.mkiv"> + <cd:command name="ctxsprint" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxcommand" file="luat-cod.mkiv"> + <cd:command name="ctxcommand" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxdirectcommand" file="luat-cod.mkiv"> + <cd:command name="ctxdirectcommand" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlatecommand" file="luat-cod.mkiv"> + <cd:command name="ctxlatecommand" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxreport" file="luat-cod.mkiv"> + <cd:command name="ctxreport" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlua" file="luat-cod.mkiv"> + <cd:command name="ctxlua" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luacode" file="luat-cod.mkiv"> + <cd:command name="luacode" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="lateluacode" file="luat-cod.mkiv"> + <cd:command name="lateluacode" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="directluacode" file="luat-cod.mkiv"> + <cd:command name="directluacode" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luaversion" file="luat-cod.mkiv"/> + <cd:command name="luaversion" level="system" category="lua" file="luat-cod.mkiv"/> - <cd:command name="registerctxluafile" file="luat-cod.mkiv"> + <cd:command name="registerctxluafile" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="ctxloadluafile" file="luat-cod.mkiv"> + <cd:command name="ctxloadluafile" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="lua" type="environment" file="luat-ini.mkiv"/> + <cd:command name="lua" type="environment" level="system" category="lua" file="luat-ini.mkiv"/> - <cd:command name="luacode" type="environment" file="luat-ini.mkiv"/> + <cd:command name="luacode" type="environment" level="system" category="lua" file="luat-ini.mkiv"/> - <cd:command name="luamajorversion" file="luat-ini.mkiv"/> + <cd:command name="luamajorversion" level="system" category="lua" file="luat-ini.mkiv"/> - <cd:command name="luaminorversion" file="luat-ini.mkiv"/> + <cd:command name="luaminorversion" level="system" category="lua" file="luat-ini.mkiv"/> - <cd:command name="luaexpanded" file="luat-ini.mkiv"> + <cd:command name="luaexpanded" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luaparameterset" type="environment" file="luat-ini.mkiv"> + <cd:command name="luaparameterset" type="environment" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="luaparameterset" file="luat-ini.mkiv"> + <cd:command name="luaparameterset" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="luaconditional" file="luat-ini.mkiv"> + <cd:command name="luaconditional" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ctxluacode" file="luat-ini.mkiv"> + <cd:command name="ctxluacode" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunctiondefinition" type="environment" file="luat-ini.mkiv"> + <cd:command name="ctxfunctiondefinition" type="environment" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunctiondefinition" generated="yes" variant="example" file="luat-ini.mkiv"> + <cd:command name="ctxfunctiondefinition" generated="yes" variant="example" level="system" category="lua" file="luat-ini.mkiv"> <cd:sequence> <cd:variable value="ctxfunctiondefinition"/> </cd:sequence> </cd:command> - <cd:command name="ctxfunction" type="environment" file="luat-ini.mkiv"> + <cd:command name="ctxfunction" type="environment" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunction" file="luat-ini.mkiv"> + <cd:command name="ctxfunction" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunction" generated="yes" variant="example" file="luat-ini.mkiv"> + <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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-makeup.xml b/tex/context/interface/mkiv/i-makeup.xml index 8831a8b0b..dc2bd9ad4 100644 --- a/tex/context/interface/mkiv/i-makeup.xml +++ b/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" file="page-mak.mkvi"> + <cd:command name="definemakeup" level="style" category="structure 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" file="page-mak.mkvi"> + <cd:command name="setupmakeup" level="style" category="structure layout" file="page-mak.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -104,7 +104,7 @@ <cd:constant type="empty" default="yes"/> </cd:parameter> <cd:parameter name="style"> - <cd:inherit name="value-style"/> + <cd:resolve name="value-style"/> </cd:parameter> <cd:parameter name="color"> <cd:constant type="cd:color"/> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="makeup" type="environment" file="page-mak.mkvi"> + <cd:command name="makeup" type="environment" level="document" category="structure 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" file="page-mak.mkvi"> + <cd:command name="makeup" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-mak.mkvi"> <cd:sequence> <cd:instance value="makeup"/> <cd:string value="makeup"/> @@ -139,7 +139,7 @@ <!-- - <cd:command name="standardmakeup" type="environment" file="page-mak.mkvi"> + <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"/> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="textmakeup" type="environment" file="page-mak.mkvi"> + <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"/> @@ -155,7 +155,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagemakeup" type="environment" file="page-mak.mkvi"> + <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"/> @@ -163,7 +163,7 @@ </cd:arguments> </cd:command> - <cd:command name="middlemakeup" type="environment" file="page-mak.mkvi"> + <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"/> @@ -173,4 +173,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marginblock.xml b/tex/context/interface/mkiv/i-marginblock.xml index f40bf112a..0d0e3c2b4 100644 --- a/tex/context/interface/mkiv/i-marginblock.xml +++ b/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" file="page-mbk.mkvi"> + <cd:command name="definemarginblock" level="style" category="structure 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" file="page-mbk.mkvi"> + <cd:command name="setupmarginblock" level="style" category="structure 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" file="page-mbk.mkvi"> + <cd:command name="setupmarginblocks" level="style" category="structure 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" file="page-mbk.mkvi"> + <cd:command name="marginblock" type="environment" level="document" category="structure layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-margindata.xml b/tex/context/interface/mkiv/i-margindata.xml index a54362fec..a157aaf9c 100644 --- a/tex/context/interface/mkiv/i-margindata.xml +++ b/tex/context/interface/mkiv/i-margindata.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemargindata" file="typo-mar.mkiv"> + <cd:command name="definemargindata" level="style" category="structure" file="typo-mar.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="setupmargindata" file="typo-mar.mkiv"> + <cd:command name="setupmargindata" level="style" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -107,7 +107,7 @@ <!-- - <cd:command name="definemarginframed" file="typo-mar.mkiv"> + <cd:command name="definemarginframed" level="system" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -119,7 +119,7 @@ --> - <cd:command name="setupmarginframed" file="typo-mar.mkiv"> + <cd:command name="setupmarginframed" level="style" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -128,7 +128,7 @@ </cd:arguments> </cd:command> - <cd:command name="margindata" generated="yes" variant="instance" file="typo-mar.mkiv"> + <cd:command name="margindata" generated="yes" variant="instance" level="document" category="structure" file="typo-mar.mkiv"> <cd:sequence> <cd:instance value="margindata"/> </cd:sequence> @@ -149,7 +149,7 @@ </cd:instances> </cd:command> - <cd:command name="margindata" file="typo-mar.mkiv"> + <cd:command name="margindata" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -167,7 +167,7 @@ <!-- - <cd:command name="inleftmargin" file="typo-mar.mkiv"> + <cd:command name="inleftmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -179,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="inrightmargin" file="typo-mar.mkiv"> + <cd:command name="inrightmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -191,7 +191,7 @@ </cd:arguments> </cd:command> - <cd:command name="inoutermargin" file="typo-mar.mkiv"> + <cd:command name="inoutermargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -203,7 +203,7 @@ </cd:arguments> </cd:command> - <cd:command name="ininnermargin" file="typo-mar.mkiv"> + <cd:command name="ininnermargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -215,7 +215,7 @@ </cd:arguments> </cd:command> - <cd:command name="inleftedge" file="typo-mar.mkiv"> + <cd:command name="inleftedge" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -227,7 +227,7 @@ </cd:arguments> </cd:command> - <cd:command name="inrightedge" file="typo-mar.mkiv"> + <cd:command name="inrightedge" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -239,7 +239,7 @@ </cd:arguments> </cd:command> - <cd:command name="ininneredge" file="typo-mar.mkiv"> + <cd:command name="ininneredge" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -251,7 +251,7 @@ </cd:arguments> </cd:command> - <cd:command name="inouteredge" file="typo-mar.mkiv"> + <cd:command name="inouteredge" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -263,7 +263,7 @@ </cd:arguments> </cd:command> - <cd:command name="atleftmargin" file="typo-mar.mkiv"> + <cd:command name="atleftmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -275,7 +275,7 @@ </cd:arguments> </cd:command> - <cd:command name="atrightmargin" file="typo-mar.mkiv"> + <cd:command name="atrightmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -287,7 +287,7 @@ </cd:arguments> </cd:command> - <cd:command name="inleft" file="typo-mar.mkiv"> + <cd:command name="inleft" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -302,7 +302,7 @@ </cd:arguments> </cd:command> - <cd:command name="inright" file="typo-mar.mkiv"> + <cd:command name="inright" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -317,7 +317,7 @@ </cd:arguments> </cd:command> - <cd:command name="ininner" file="typo-mar.mkiv"> + <cd:command name="ininner" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -332,7 +332,7 @@ </cd:arguments> </cd:command> - <cd:command name="inouter" file="typo-mar.mkiv"> + <cd:command name="inouter" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -347,7 +347,7 @@ </cd:arguments> </cd:command> - <cd:command name="inmargin" file="typo-mar.mkiv"> + <cd:command name="inmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -362,7 +362,7 @@ </cd:arguments> </cd:command> - <cd:command name="inother" file="typo-mar.mkiv"> + <cd:command name="inother" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -377,7 +377,7 @@ </cd:arguments> </cd:command> - <cd:command name="margintext" file="typo-mar.mkiv"> + <cd:command name="margintext" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -389,7 +389,7 @@ </cd:arguments> </cd:command> - <cd:command name="marginword" file="typo-mar.mkiv"> + <cd:command name="marginword" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -401,7 +401,7 @@ </cd:arguments> </cd:command> - <cd:command name="margintitle" file="typo-mar.mkiv"> + <cd:command name="margintitle" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -413,7 +413,7 @@ </cd:arguments> </cd:command> - <cd:command name="inothermargin" file="typo-mar.mkiv"> + <cd:command name="inothermargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -430,4 +430,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marker.xml b/tex/context/interface/mkiv/i-marker.xml index fe491650e..2db8a9de1 100644 --- a/tex/context/interface/mkiv/i-marker.xml +++ b/tex/context/interface/mkiv/i-marker.xml @@ -4,30 +4,30 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemarker" file="attr-mkr.mkiv"> + <cd:command name="definemarker" level="system" category="attribute" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setmarker" file="attr-mkr.mkiv"> + <cd:command name="setmarker" level="system" category="attribute" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="resetmarker" file="attr-mkr.mkiv"> + <cd:command name="resetmarker" level="system" category="attribute" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="boxmarker" file="attr-mkr.mkiv"> + <cd:command name="boxmarker" level="system" category="attribute" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marking.xml b/tex/context/interface/mkiv/i-marking.xml index 644f0ac5b..914922cf2 100644 --- a/tex/context/interface/mkiv/i-marking.xml +++ b/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" file="strc-mar.mkiv"> + <cd:command name="definemarking" level="style" 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" file="strc-mar.mkiv"> + <cd:command name="setupmarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark-list-optional"/> <cd:assignments list="yes"> @@ -36,27 +36,27 @@ </cd:arguments> </cd:command> - <cd:command name="relatemarking" file="strc-mar.mkiv"> + <cd:command name="relatemarking" level="system" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="setmarking" file="strc-mar.mkiv"> + <cd:command name="setmarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="resetmarking" file="strc-mar.mkiv"> + <cd:command name="resetmarking" level="system" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="synchronizemarking" file="strc-mar.mkiv"> + <cd:command name="synchronizemarking" level="system" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="keyword-number"/> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsemarking" file="strc-mar.mkiv"> + <cd:command name="doifelsemarking" level="system" category="conditional" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="argument-mark"/> <cd:resolve name="argument-true"/> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmarkingelse" file="strc-mar.mkiv"> + <cd:command name="doifmarkingelse" level="system" category="conditional" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="argument-mark"/> <cd:resolve name="argument-true"/> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="getmarking" file="strc-mar.mkiv"> + <cd:command name="getmarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchonemark" file="strc-mar.mkiv"> + <cd:command name="fetchonemark" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> @@ -104,19 +104,19 @@ </cd:arguments> </cd:command> - <cd:command name="fetchtwomarks" file="strc-mar.mkiv"> + <cd:command name="fetchtwomarks" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="fetchallmarks" file="strc-mar.mkiv"> + <cd:command name="fetchallmarks" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="fetchmark" file="strc-mar.mkiv"> + <cd:command name="fetchmark" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> @@ -125,7 +125,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchmarking" file="strc-mar.mkiv"> + <cd:command name="fetchmarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> @@ -138,7 +138,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchonemarking" file="strc-mar.mkiv"> + <cd:command name="fetchonemarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> @@ -151,7 +151,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchtwomarkings" file="strc-mar.mkiv"> + <cd:command name="fetchtwomarkings" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> @@ -161,7 +161,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchallmarkings" file="strc-mar.mkiv"> + <cd:command name="fetchallmarkings" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> @@ -171,4 +171,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-math.xml b/tex/context/interface/mkiv/i-math.xml index 58890d6ea..af9d87cb8 100644 --- a/tex/context/interface/mkiv/i-math.xml +++ b/tex/context/interface/mkiv/i-math.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathematics" category="mathematics" file="math-ini.mkiv"> + <cd:command name="definemathematics" level="style" category="mathematics" file="math-ini.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="setupmathematics" category="mathematics" file="math-ini.mkiv"> + <cd:command name="setupmathematics" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -63,10 +63,14 @@ <cd:constant type="none"/> <cd:constant type="reset"/> </cd:parameter> - <cd:parameter name="autopunctuation"> + <cd:parameter name="autopunctuation" list="yes"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> <cd:constant type="all"/> + <cd:constant type="comma"/> + <cd:constant type="yes,semicolon"/> + <cd:constant type="comma,semicolon"/> + <cd:constant type="all,semicolon"/> </cd:parameter> <cd:parameter name="setups"> <cd:constant type="cd:name"/> @@ -102,39 +106,42 @@ <cd:constant type="ams"/> <cd:constant type="ctx" default="yes"/> </cd:parameter> + <cd:parameter name="ampersand"> + <cd:constant type="normal"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="inlineordisplaymath" category="mathematics" file="math-ini.mkiv"> + <cd:command name="inlineordisplaymath" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mathematics" category="mathematics" file="math-ini.mkiv"> + <cd:command name="mathematics" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="math" category="mathematics" file="math-ini.mkiv"> + <cd:command name="math" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="m" category="mathematics" file="math-ini.mkiv"> + <cd:command name="m" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definemathcommand" category="mathematics" file="math-ini.mkiv"> + <cd:command name="definemathcommand" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -164,7 +171,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathcommand" generated="yes" variant="example" file="math-ini.mkiv"> + <cd:command name="mathcommand" generated="yes" variant="example" level="document" category="mathematics" file="math-ini.mkiv"> <cd:sequence> <cd:variable value="mathcommand"/> </cd:sequence> @@ -174,63 +181,67 @@ </cd:arguments> </cd:command> - <cd:command name="mathcommand" file="math-ini.mkiv"> - <cd:arguments> - <cd:resolve name="argument-name"/> - </cd:arguments> - </cd:command> + <!-- + + <cd:command name="mathcommand" level="document" category="mathematics" file="math-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + --> - <cd:command name="mathop" file="math-ini.mkiv"> + <cd:command name="mathop" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mbox" file="math-ini.mkiv"> + <cd:command name="mbox" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mtext" file="math-ini.mkiv"> + <cd:command name="mtext" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mathfunction" category="mathematics" file="math-ini.mkiv"> + <cd:command name="mathfunction" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mfunction" category="mathematics" file="math-ini.mkiv"> + <cd:command name="mfunction" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mfunctionlabeltext" file="math-ini.mkiv"> + <cd:command name="mfunctionlabeltext" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="stackrel" file="math-ini.mkiv"> + <cd:command name="stackrel" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="apply" file="math-ini.mkiv"> + <cd:command name="apply" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definemathstyle" file="math-ini.mkiv"> + <cd:command name="definemathstyle" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -239,7 +250,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathstyle" file="math-ini.mkiv"> + <cd:command name="setupmathstyle" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-mathstyle"/> @@ -248,7 +259,7 @@ </cd:arguments> </cd:command> - <cd:command name="setmathstyle" file="math-ini.mkiv"> + <cd:command name="setmathstyle" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:resolve name="value-mathstyle"/> @@ -257,7 +268,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathstyle" type="environment" file="math-ini.mkiv"> + <cd:command name="mathstyle" type="environment" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-mathstyle"/> @@ -266,218 +277,226 @@ </cd:arguments> </cd:command> - <cd:command name="mathstyle" type="environment" begin="push" end="pop" file="math-ini.mkiv"/> + <cd:command name="mathstyle" type="environment" begin="push" end="pop" level="system" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="usemathstyleparameter" file="math-ini.mkiv"> + <cd:command name="usemathstyleparameter" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="usemathstyleparameter" type="environment" file="math-ini.mkiv"> + <cd:command name="usemathstyleparameter" type="environment" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="mathtext" file="math-ini.mkiv"> + <cd:command name="mathtext" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtexttf" file="math-ini.mkiv"> + <cd:command name="mathtexttf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextit" file="math-ini.mkiv"> + <cd:command name="mathtextit" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextsl" file="math-ini.mkiv"> + <cd:command name="mathtextsl" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbf" file="math-ini.mkiv"> + <cd:command name="mathtextbf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbi" file="math-ini.mkiv"> + <cd:command name="mathtextbi" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbs" file="math-ini.mkiv"> + <cd:command name="mathtextbs" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathword" file="math-ini.mkiv"> + <cd:command name="mathword" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordtf" file="math-ini.mkiv"> + <cd:command name="mathwordtf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordit" file="math-ini.mkiv"> + <cd:command name="mathwordit" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordsl" file="math-ini.mkiv"> + <cd:command name="mathwordsl" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbf" file="math-ini.mkiv"> + <cd:command name="mathwordbf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbi" file="math-ini.mkiv"> + <cd:command name="mathwordbi" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbs" file="math-ini.mkiv"> + <cd:command name="mathwordbs" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathrm" file="math-ini.mkiv"/> + <cd:command name="mathrm" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathss" file="math-ini.mkiv"/> + <cd:command name="mathss" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathtt" file="math-ini.mkiv"/> + <cd:command name="mathtt" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathtf" file="math-ini.mkiv"/> + <cd:command name="mathtf" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathsl" file="math-ini.mkiv"/> + <cd:command name="mathsl" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathit" file="math-ini.mkiv"/> + <cd:command name="mathit" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathbf" file="math-ini.mkiv"/> + <cd:command name="mathbf" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathbi" file="math-ini.mkiv"/> + <cd:command name="mathbi" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathbs" file="math-ini.mkiv"/> + <cd:command name="mathbs" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathitalic" file="math-ini.mkiv"/> + <cd:command name="mathitalic" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathupright" file="math-ini.mkiv"/> + <cd:command name="mathupright" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathdefault" file="math-ini.mkiv"/> + <cd:command name="mathdefault" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathscript" file="math-ini.mkiv"/> + <cd:command name="mathscript" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathfraktur" file="math-ini.mkiv"/> + <cd:command name="mathfraktur" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathblackboard" file="math-ini.mkiv"/> + <cd:command name="mathblackboard" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="displaymath" file="supp-mat.mkiv"> + <cd:command name="displaymath" level="style" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="inlinemath" file="supp-mat.mkiv"> + <cd:command name="inlinemath" level="style" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="textmath" file="supp-mat.mkiv"> + <cd:command name="textmath" level="style" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="imath" type="environment" file="supp-mat.mkiv"/> + <cd:command name="imath" type="environment" level="system" category="mathematics" file="supp-mat.mkiv"/> - <cd:command name="dmath" type="environment" file="supp-mat.mkiv"/> + <cd:command name="dmath" type="environment" level="system" category="mathematics" file="supp-mat.mkiv"/> - <cd:command name="mathmode" type="environment" file="supp-mat.mkiv"/> + <cd:command name="mathmode" type="environment" level="system" category="mathematics" file="supp-mat.mkiv"/> - <cd:command name="nonmathematics" file="supp-mat.mkiv"> + <cd:command name="nonmathematics" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="displaymathematics" file="supp-mat.mkiv"> + <cd:command name="displaymathematics" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="inlinemathematics" file="supp-mat.mkiv"> + <cd:command name="inlinemathematics" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="automathematics" file="supp-mat.mkiv"> + <cd:command name="automathematics" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="cramped" file="supp-mat.mkiv"> + <cd:command name="cramped" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="crampedllap" file="supp-mat.mkiv"> + <cd:command name="crampedllap" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="crampedrlap" file="supp-mat.mkiv"> + <cd:command name="crampedrlap" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="crampedclap" file="supp-mat.mkiv"> + <cd:command name="crampedclap" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> + <cd:command name="autointegral" level="system" category="mathematics" file="math-del.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-mathalignment.xml b/tex/context/interface/mkiv/i-mathalignment.xml index 5caa1348c..325b288c7 100644 --- a/tex/context/interface/mkiv/i-mathalignment.xml +++ b/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" file="math-ali.mkiv"> + <cd:command name="definemathalignment" level="style" category="mathematics 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" file="math-ali.mkiv"> + <cd:command name="setupmathalignment" level="style" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -27,17 +27,33 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="number"> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="separator"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="align"> <cd:constant type="left"/> <cd:constant type="middle"/> <cd:constant type="right"/> <cd:constant type="normal" default="yes"/> </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="top"/> + <cd:constant type="center"/> + <cd:constant type="bottom"/> + <cd:constant type="normal" default="yes"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:constant type="math" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" file="math-ali.mkiv"> + <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" level="document" category="mathematics alignment" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathalignment"/> </cd:sequence> @@ -53,7 +69,7 @@ <!-- - <cd:command name="mathalignment" type="environment" file="math-ali.mkiv"> + <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"/> @@ -61,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="align" type="environment" file="math-ali.mkiv"> + <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"/> @@ -71,4 +87,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathcases.xml b/tex/context/interface/mkiv/i-mathcases.xml index 8a27c4413..837f2b782 100644 --- a/tex/context/interface/mkiv/i-mathcases.xml +++ b/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" file="math-ali.mkiv"> + <cd:command name="definemathcases" level="style" category="mathematics 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" file="math-ali.mkiv"> + <cd:command name="setupmathcases" level="style" category="mathematics 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" file="math-ali.mkiv"> + <cd:command name="mathcases" type="environment" generated="yes" variant="instance" level="document" category="mathematics alignment" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathcases"/> </cd:sequence> @@ -57,7 +57,7 @@ <!-- - <cd:command name="mathcases" type="environment" file="math-ali.mkiv"> + <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"/> @@ -65,7 +65,7 @@ </cd:arguments> </cd:command> - <cd:command name="cases" type="environment" file="math-ali.mkiv"> + <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"/> @@ -75,4 +75,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathfence.xml b/tex/context/interface/mkiv/i-mathfence.xml index 9676e2a37..76151fae4 100644 --- a/tex/context/interface/mkiv/i-mathfence.xml +++ b/tex/context/interface/mkiv/i-mathfence.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathfence" file="math-fen.mkiv"> + <cd:command name="definemathfence" level="style" category="mathematics" file="math-fen.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="setupmathfence" file="math-fen.mkiv"> + <cd:command name="setupmathfence" level="style" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -40,16 +40,22 @@ <cd:parameter name="state"> <cd:constant type="auto"/> </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="auto"/> + </cd:parameter> <cd:parameter name="factor"> - <cd:constant type="auto" default="yes"/> <cd:constant type="none"/> - <cd:constant type="number"/> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="mathclass"> + <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="fence" generated="yes" variant="example" file="math-fen.mkiv"> + <cd:command name="fence" generated="yes" variant="example" level="document" category="mathematics" file="math-fen.mkiv"> <cd:sequence> <cd:variable value="fence"/> </cd:sequence> @@ -58,147 +64,147 @@ </cd:arguments> </cd:command> - <cd:command name="fenced" file="math-fen.mkiv"> + <cd:command name="fenced" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fence" file="math-fen.mkiv"/> + <cd:command name="fence" level="document" category="mathematics" file="math-fen.mkiv"/> - <cd:command name="left" file="math-fen.mkiv"> + <cd:command name="left" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="middle" file="math-fen.mkiv"> + <cd:command name="middle" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="right" file="math-fen.mkiv"> + <cd:command name="right" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="big" file="math-fen.mkiv"> + <cd:command name="big" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Big" file="math-fen.mkiv"> + <cd:command name="Big" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigg" file="math-fen.mkiv"> + <cd:command name="bigg" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigg" file="math-fen.mkiv"> + <cd:command name="Bigg" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigl" file="math-fen.mkiv"> + <cd:command name="bigl" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigm" file="math-fen.mkiv"> + <cd:command name="bigm" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigr" file="math-fen.mkiv"> + <cd:command name="bigr" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigl" file="math-fen.mkiv"> + <cd:command name="Bigl" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigm" file="math-fen.mkiv"> + <cd:command name="Bigm" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigr" file="math-fen.mkiv"> + <cd:command name="Bigr" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggl" file="math-fen.mkiv"> + <cd:command name="biggl" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggm" file="math-fen.mkiv"> + <cd:command name="biggm" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggr" file="math-fen.mkiv"> + <cd:command name="biggr" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggl" file="math-fen.mkiv"> + <cd:command name="Biggl" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggm" file="math-fen.mkiv"> + <cd:command name="Biggm" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggr" file="math-fen.mkiv"> + <cd:command name="Biggr" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="lfence" file="math-fen.mkiv"> + <cd:command name="lfence" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="mfence" file="math-fen.mkiv"> + <cd:command name="mfence" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="rfence" file="math-fen.mkiv"> + <cd:command name="rfence" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="checkedfences" type="environment" file="math-fen.mkiv"/> + <cd:command name="checkedfences" type="environment" level="style" category="mathematics" file="math-fen.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml index 50f99205a..bd1452cdc 100644 --- a/tex/context/interface/mkiv/i-mathmatrix.xml +++ b/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" file="math-ali.mkiv"> + <cd:command name="definemathmatrix" level="style" category="mathematics 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" file="math-ali.mkiv"> + <cd:command name="setupmathmatrix" level="style" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -41,6 +41,9 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="simplecommand"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="location"> <cd:constant type="top"/> <cd:constant type="bottom"/> @@ -53,7 +56,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" file="math-ali.mkiv"> + <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" level="document" category="mathematics tables" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathmatrix"/> </cd:sequence> @@ -69,7 +72,7 @@ <!-- - <cd:command name="mathmatrix" type="environment" file="math-ali.mkiv"> + <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"/> @@ -77,7 +80,7 @@ </cd:arguments> </cd:command> - <cd:command name="matrix" type="environment" file="math-ali.mkiv"> + <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"/> @@ -87,7 +90,7 @@ --> - <cd:command name="matrices" type="environment" file="math-ali.mkiv"> + <cd:command name="matrices" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> @@ -95,28 +98,44 @@ </cd:arguments> </cd:command> - <cd:command name="intertext" type="environment" file="math-ali.mkiv"/> + <cd:command name="intertext" type="environment" level="document" category="mathematics" file="math-ali.mkiv"/> - <cd:command name="intertext" file="math-ali.mkiv"> + <cd:command name="intertext" level="document" category="mathematics" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="substack" type="environment" file="math-ali.mkiv"/> + <cd:command name="substack" type="environment" level="document" category="mathematics" file="math-ali.mkiv"/> - <cd:command name="overset" file="math-ali.mkiv"> + <cd:command name="overset" level="document" category="mathematics" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="underset" file="math-ali.mkiv"> + <cd:command name="underset" level="document" category="mathematics" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> + <cd:command name="bordermatrix" level="document" category="mathematics 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: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="bbordermatrix" type="environment" level="document" category="mathematics tables" file="math-pln.mkiv"/> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-mathornament.xml b/tex/context/interface/mkiv/i-mathornament.xml index cfa7b0d18..70100b8e4 100644 --- a/tex/context/interface/mkiv/i-mathornament.xml +++ b/tex/context/interface/mkiv/i-mathornament.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathornament" file="math-rad.mkvi"> + <cd:command name="definemathornament" level="style" category="mathematics" file="math-rad.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="setupmathornament" file="math-rad.mkvi"> + <cd:command name="setupmathornament" level="style" category="mathematics" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathornament" generated="yes" variant="example" file="math-rad.mkvi"> + <cd:command name="mathornament" generated="yes" variant="example" level="document" category="mathematics" file="math-rad.mkvi"> <cd:sequence> <cd:variable value="mathornament"/> </cd:sequence> @@ -43,4 +43,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathradical.xml b/tex/context/interface/mkiv/i-mathradical.xml index e3ab9a6aa..a7ba93b75 100644 --- a/tex/context/interface/mkiv/i-mathradical.xml +++ b/tex/context/interface/mkiv/i-mathradical.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathradical" file="math-rad.mkvi"> + <cd:command name="definemathradical" level="style" category="mathematics" file="math-rad.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="setupmathradical" file="math-rad.mkvi"> + <cd:command name="setupmathradical" level="style" category="mathematics" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathradical" generated="yes" variant="example" file="math-rad.mkvi"> + <cd:command name="mathradical" generated="yes" variant="example" level="document" category="mathematics" file="math-rad.mkvi"> <cd:sequence> <cd:variable value="mathradical"/> </cd:sequence> @@ -46,11 +46,11 @@ </cd:arguments> </cd:command> - <cd:command name="sqrt" file="math-rad.mkvi"> + <cd:command name="sqrt" level="document" category="mathematics" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-text-optional"/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathstackers.xml b/tex/context/interface/mkiv/i-mathstackers.xml index ef8d9d5e3..561936b9c 100644 --- a/tex/context/interface/mkiv/i-mathstackers.xml +++ b/tex/context/interface/mkiv/i-mathstackers.xml @@ -4,7 +4,9 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathstackers" file="math-stc.mkvi"> + <!-- todo definemathdelimuter, was overloading define mathextensible --> + + <cd:command name="definemathstackers" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathstackers" file="math-stc.mkvi"> + <cd:command name="setupmathstackers" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -107,7 +109,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemathextensible" file="math-sty.mkvi"> + <cd:command name="definemathextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reverse"/> @@ -120,23 +122,28 @@ </cd:arguments> </cd:command> - <cd:command name="mathextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathextensible" generated="yes" variant="instance" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> - <cd:variable value="mathextensible"/> + <cd:instance value="mathextensible"/> </cd:sequence> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> + <!-- + <cd:keywords optional="yes"> + <cd:constant type="reverse"/> + <cd:constant type="mathematics"/> + <cd:constant type="text"/> + <cd:constant type="chemistry"/> + </cd:keywords> + --> <cd:resolve name="argument-text-optional"/> <cd:resolve name="argument-text-optional"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathextensible"/> + </cd:instances> </cd:command> - - <cd:command name="definemathoverextensible" file="math-sty.mkvi"> + + <cd:command name="definemathoverextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -147,7 +154,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathoverextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathoverextensible" generated="yes" variant="example" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathoverextensible"/> </cd:sequence> @@ -156,1613 +163,1042 @@ </cd:arguments> </cd:command> - <cd:command name="definemathunderextensible" file="math-sty.mkvi"> + <cd:command name="definemathover" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="bottom"/> + <cd:keywords> + <cd:constant type="top"/> <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="mathunderextensible" generated="yes" variant="example" file="math-stc.mkvi"> - <cd:sequence> - <cd:variable value="mathunderextensible"/> - </cd:sequence> + <cd:command name="mathover" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="top"/> + <cd:constant type="vfenced"/> + </cd:keywords> + <cd:resolve name="argument-number"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="definemathdoubleextensible" file="math-sty.mkvi"> + <cd:command name="definemathunderextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="both"/> + <cd:constant type="bottom"/> <cd:constant type="vfenced"/> </cd:keywords> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> - <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="mathdoubleextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathunderextensible" generated="yes" variant="example" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> - <cd:variable value="mathdoubleextensible"/> + <cd:variable value="mathunderextensible"/> </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="definemathovertextextensible" file="math-sty.mkvi"> + <cd:command name="definemathunder" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="bothtext"/> + <cd:keywords> + <cd:constant type="bottom"/> + <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="mathovertextextensible" generated="yes" variant="example" file="math-stc.mkvi"> - <cd:sequence> - <cd:variable value="mathovertextextensible"/> - </cd:sequence> + <cd:command name="mathunder" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> + <cd:keywords optional="yes"> + <cd:constant type="bottom"/> + <cd:constant type="vfenced"/> + </cd:keywords> + <cd:resolve name="argument-number"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="definemathundertextextensible" file="math-sty.mkvi"> + <cd:command name="definemathdoubleextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="bothtext"/> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> </cd:keywords> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="mathundertextextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathdoubleextensible" generated="yes" variant="instance" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> - <cd:variable value="mathundertextextensible"/> + <cd:instance value="mathdoubleextensible"/> </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathdoubleextensible"/> + </cd:instances> </cd:command> - <cd:command name="definemathtriplet" file="math-sty.mkvi"> + <cd:command name="definemathdouble" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-optional"/> + <cd:keywords> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> + </cd:keywords> <cd:resolve name="keyword-name"/> - <cd:resolve name="keyword-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mathtriplet" generated="yes" variant="example" file="math-stc.mkvi"> - <cd:sequence> - <cd:variable value="mathtriplet"/> - </cd:sequence> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mathtriplet" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrel" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xequal" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xLeftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xRightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xLeftrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtwoheadleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtwoheadrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xmapsto" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xhookleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xhookrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightoverleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftrightharpoons" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightleftharpoons" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtriplerel" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrel" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mequal" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mLeftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mRightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mLeftrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtwoheadleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtwoheadrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mmapsto" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mhookleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mhookrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightoverleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftrightharpoons" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightleftharpoons" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtriplerel" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftarrowfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightarrowfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftrightarrowfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="etwoheadrightarrowfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftharpoondownfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftharpoonupfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightharpoondownfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightharpoonupfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbarfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbarfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbracefill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbracefill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverparentfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderparentfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbracketfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbracketfill" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trel" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tequal" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tmapsto" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tLeftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tRightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tLeftrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttwoheadleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttwoheadrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="thookleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="thookrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightoverleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftrightharpoons" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightleftharpoons" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttriplerel" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="cleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="crightarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="crightoverleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="undertwoheadleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="undertwoheadrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbar" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbrace" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underparent" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbracket" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overtwoheadleftarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overtwoheadrightarrow" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightharpoondown" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightharpoonup" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbar" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbrace" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overparent" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbracket" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebar" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebrace" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doubleparent" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebracket" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbarunderbar" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbraceunderbrace" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overparentunderparent" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbracketunderbracket" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> + <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="overbartext" file="math-stc.mkvi"> + <cd:command name="mathdouble" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> + </cd:keywords> + <cd:resolve name="argument-number"/> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="overbracetext" file="math-stc.mkvi"> + <cd:command name="definemathovertextextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:keywords optional="yes"> + <cd:constant type="bothtext"/> + </cd:keywords> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="overparenttext" file="math-stc.mkvi"> + <cd:command name="mathovertextextensible" generated="yes" variant="instance" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:sequence> + <cd:instance value="mathovertextextensible"/> + </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathovertextextensible"/> + </cd:instances> </cd:command> - <cd:command name="overbrackettext" file="math-stc.mkvi"> + <cd:command name="definemathundertextextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:keywords optional="yes"> + <cd:constant type="bothtext"/> + </cd:keywords> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="underbartext" file="math-stc.mkvi"> + <cd:command name="mathundertextextensible" generated="yes" variant="instance" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:sequence> + <cd:instance value="mathundertextextensible"/> + </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathundertextextensible"/> + </cd:instances> </cd:command> - <cd:command name="underbracetext" file="math-stc.mkvi"> + <cd:command name="definemathtriplet" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-text-optional"/> </cd:arguments> </cd:command> - <cd:command name="underparenttext" file="math-stc.mkvi"> + <cd:command name="mathtriplet" generated="yes" variant="example" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:sequence> + <cd:variable value="mathtriplet"/> + </cd:sequence> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> - <cd:command name="underbrackettext" file="math-stc.mkvi"> + <cd:command name="mathtriplet" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> - <cd:command name="singlebond" file="math-stc.mkvi"/> - - <cd:command name="doublebond" file="math-stc.mkvi"/> - - <cd:command name="triplebond" file="math-stc.mkvi"/> - - <cd:command name="definemathunstacked" file="math-stc.mkvi"> + <!-- + + <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"/> + + <cd:command name="triplebond" level="document" category="mathematics" file="math-stc.mkvi"/> + + <cd:command name="definemathunstacked" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="wide"/> @@ -1772,18 +1208,18 @@ </cd:arguments> </cd:command> - <cd:command name="mathunstacked" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathunstacked" generated="yes" variant="example" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathunstacked"/> </cd:sequence> </cd:command> - <cd:command name="And" file="math-stc.mkvi"/> + <cd:command name="And" level="document" category="mathematics" file="math-stc.mkvi"/> - <cd:command name="impliedby" file="math-stc.mkvi"/> + <cd:command name="impliedby" level="document" category="mathematics" file="math-stc.mkvi"/> - <cd:command name="implies" file="math-stc.mkvi"/> + <cd:command name="implies" level="document" category="mathematics" file="math-stc.mkvi"/> - <cd:command name="iff" file="math-stc.mkvi"/> + <cd:command name="iff" level="document" category="mathematics" file="math-stc.mkvi"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-metapost.xml b/tex/context/interface/mkiv/i-metapost.xml index 00250f787..1c8fd2d0b 100644 --- a/tex/context/interface/mkiv/i-metapost.xml +++ b/tex/context/interface/mkiv/i-metapost.xml @@ -4,21 +4,21 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="MPdefinitions" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPdefinitions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPextensions" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPextensions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPinitializations" type="environment" file="meta-ini.mkiv"/> + <cd:command name="MPinitializations" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"/> - <cd:command name="MPinclusions" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPinclusions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="MPinclusions" file="meta-ini.mkiv"> + <cd:command name="MPinclusions" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineMPinstance" file="meta-ini.mkiv"> + <cd:command name="defineMPinstance" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -47,7 +47,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupMPinstance" file="meta-ini.mkiv"> + <cd:command name="setupMPinstance" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -83,19 +83,19 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPinstance" file="meta-ini.mkiv"> + <cd:command name="resetMPinstance" level="system" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="processMPfigurefile" file="meta-ini.mkiv"> + <cd:command name="processMPfigurefile" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="MPdrawing" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPdrawing" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="-"/> @@ -103,85 +103,85 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPdrawing" file="meta-ini.mkiv"/> + <cd:command name="resetMPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"/> - <cd:command name="getMPdrawing" file="meta-ini.mkiv"/> + <cd:command name="getMPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"/> - <cd:command name="MPdrawing" type="environment" begin="push" end="pop" 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" file="meta-ini.mkiv"> + <cd:command name="MPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPclip" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPclip" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPfontsizehskip" file="meta-ini.mkiv"> + <cd:command name="MPfontsizehskip" level="system" category="graphics metapost fonts" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="setupMPvariables" file="meta-ini.mkiv"> + <cd:command name="setupMPvariables" level="style" 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" file="meta-ini.mkiv"> + <cd:command name="setMPvariables" level="style" 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" file="meta-ini.mkiv"> + <cd:command name="setMPvariable" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="MPrawvar" file="meta-ini.mkiv"> + <cd:command name="MPrawvar" level="system" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="MPvariable" file="meta-ini.mkiv"> + <cd:command name="MPvariable" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="MPvar" file="meta-ini.mkiv"> + <cd:command name="MPvar" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="useMPvariables" file="meta-ini.mkiv"> + <cd:command name="useMPvariables" level="style" 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" file="meta-ini.mkiv"> + <cd:command name="uniqueMPgraphic" type="environment" level="style" category="graphics 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" file="meta-ini.mkiv"> + <cd:command name="uniqueMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -192,14 +192,14 @@ </cd:arguments> </cd:command> - <cd:command name="useMPgraphic" type="environment" file="meta-ini.mkiv"> + <cd:command name="useMPgraphic" type="environment" level="style" category="graphics 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" file="meta-ini.mkiv"> + <cd:command name="useMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -210,14 +210,14 @@ </cd:arguments> </cd:command> - <cd:command name="usableMPgraphic" type="environment" file="meta-ini.mkiv"> + <cd:command name="usableMPgraphic" type="environment" level="style" category="graphics 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" file="meta-ini.mkiv"> + <cd:command name="reuseMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -228,14 +228,14 @@ </cd:arguments> </cd:command> - <cd:command name="reusableMPgraphic" type="environment" file="meta-ini.mkiv"> + <cd:command name="reusableMPgraphic" type="environment" level="style" category="graphics 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" file="meta-ini.mkiv"> + <cd:command name="reusableMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -246,14 +246,14 @@ </cd:arguments> </cd:command> - <cd:command name="uniqueMPpagegraphic" type="environment" file="meta-ini.mkiv"> + <cd:command name="uniqueMPpagegraphic" type="environment" level="style" category="graphics 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" file="meta-ini.mkiv"> + <cd:command name="uniqueMPpagegraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -264,19 +264,19 @@ </cd:arguments> </cd:command> - <cd:command name="processMPbuffer" file="meta-ini.mkiv"> + <cd:command name="processMPbuffer" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="runMPbuffer" file="meta-ini.mkiv"> + <cd:command name="runMPbuffer" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPenvironment" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPenvironment" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -286,72 +286,72 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPenvironment" file="meta-ini.mkiv"/> + <cd:command name="resetMPenvironment" level="style" category="graphics" file="meta-ini.mkiv"/> - <cd:command name="useMPenvironmentbuffer" file="meta-ini.mkiv"> + <cd:command name="useMPenvironmentbuffer" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="MPcode" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPcode" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPcode" file="meta-ini.mkiv"> + <cd:command name="MPcode" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPrun" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPrun" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="useMPrun" file="meta-ini.mkiv"> + <cd:command name="useMPrun" level="document" category="graphics 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" file="meta-ini.mkiv"> + <cd:command name="useMPlibrary" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setMPtext" file="meta-ini.mkiv"> + <cd:command name="setMPtext" level="style" category="graphics 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" file="meta-ini.mkiv"> + <cd:command name="MPtext" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPstring" file="meta-ini.mkiv"> + <cd:command name="MPstring" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPbetex" file="meta-ini.mkiv"> + <cd:command name="MPbetex" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseMPgraphic" file="meta-ini.mkiv"> + <cd:command name="doifelseMPgraphic" level="style" category="graphics metapost conditional" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -359,7 +359,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifMPgraphicelse" file="meta-ini.mkiv"> + <cd:command name="doifMPgraphicelse" level="style" category="graphics metapost conditional" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -367,20 +367,20 @@ </cd:arguments> </cd:command> - <cd:command name="staticMPfigure" type="environment" file="meta-ini.mkiv"> + <cd:command name="staticMPfigure" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="staticMPgraphic" type="environment" file="meta-ini.mkiv"> + <cd:command name="staticMPgraphic" type="environment" level="style" category="graphics 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" file="meta-ini.mkiv"> + <cd:command name="usestaticMPfigure" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupscale"/> @@ -389,7 +389,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupMPgraphics" file="meta-ini.mkiv"> + <cd:command name="setupMPgraphics" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -403,4 +403,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mixedcolumns.xml b/tex/context/interface/mkiv/i-mixedcolumns.xml index 6d0142536..4e1ab9625 100644 --- a/tex/context/interface/mkiv/i-mixedcolumns.xml +++ b/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" file="page-mix.mkiv"> + <cd:command name="definemixedcolumns" level="style" category="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" file="page-mix.mkiv"> + <cd:command name="setupmixedcolumns" level="style" category="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" file="page-mix.mkiv"> + <cd:command name="mixedcolumns" type="environment" level="document" category="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" file="page-mix.mkiv"> + <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-mix.mkiv"> <cd:sequence> <cd:instance value="mixedcolumns"/> </cd:sequence> @@ -121,7 +121,7 @@ <!-- - <cd:command name="boxedcolumns" type="environment" file="page-mix.mkiv"> + <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"/> @@ -131,4 +131,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-modes.xml b/tex/context/interface/mkiv/i-modes.xml index 0a0abc7c7..8b35da6f8 100644 --- a/tex/context/interface/mkiv/i-modes.xml +++ b/tex/context/interface/mkiv/i-modes.xml @@ -4,79 +4,79 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="newmode" file="core-env.mkiv"> + <cd:command name="newmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setmode" file="core-env.mkiv"> + <cd:command name="setmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetmode" file="core-env.mkiv"> + <cd:command name="resetmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="newsystemmode" file="core-env.mkiv"> + <cd:command name="newsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setsystemmode" file="core-env.mkiv"> + <cd:command name="setsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsystemmode" file="core-env.mkiv"> + <cd:command name="resetsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="preventmode" file="core-env.mkiv"> + <cd:command name="preventmode" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="enablemode" file="core-env.mkiv"> + <cd:command name="enablemode" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disablemode" file="core-env.mkiv"> + <cd:command name="disablemode" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="globalpreventmode" file="core-env.mkiv"> + <cd:command name="globalpreventmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="globalenablemode" file="core-env.mkiv"> + <cd:command name="globalenablemode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="globaldisablemode" file="core-env.mkiv"> + <cd:command name="globaldisablemode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="definemode" file="core-env.mkiv"> + <cd:command name="definemode" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:keywords optional="yes"> @@ -87,13 +87,13 @@ </cd:arguments> </cd:command> - <cd:command name="booleanmodevalue" file="core-env.mkiv"> + <cd:command name="booleanmodevalue" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemode" file="core-env.mkiv"> + <cd:command name="doifelsemode" level="style" category="structure 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" file="core-env.mkiv"> + <cd:command name="doifmodeelse" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -109,33 +109,33 @@ </cd:arguments> </cd:command> - <cd:command name="doifmode" file="core-env.mkiv"> + <cd:command name="doifmode" level="style" category="structure 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" file="core-env.mkiv"> + <cd:command name="doifnotmode" level="style" category="structure 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="mode" type="environment" file="core-env.mkiv"> + <cd:command name="mode" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="notmode" type="environment" file="core-env.mkiv"> + <cd:command name="notmode" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelseallmodes" file="core-env.mkiv"> + <cd:command name="doifelseallmodes" level="style" category="structure 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" file="core-env.mkiv"> + <cd:command name="doifallmodeselse" level="style" category="structure 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" file="core-env.mkiv"> + <cd:command name="doifallmodes" level="style" category="structure 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" file="core-env.mkiv"> + <cd:command name="doifnotallmodes" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -167,19 +167,19 @@ </cd:arguments> </cd:command> - <cd:command name="allmodes" type="environment" file="core-env.mkiv"> + <cd:command name="allmodes" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="notallmodes" type="environment" file="core-env.mkiv"> + <cd:command name="notallmodes" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="modeset" type="environment" file="core-env.mkiv"> + <cd:command name="modeset" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -189,28 +189,28 @@ </cd:arguments> </cd:command> - <cd:command name="pushmode" file="core-env.mkiv"> + <cd:command name="pushmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="popmode" file="core-env.mkiv"> + <cd:command name="popmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="pushsystemmode" file="core-env.mkiv"> + <cd:command name="pushsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="popsystemmode" file="core-env.mkiv"> + <cd:command name="popsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-modules.xml b/tex/context/interface/mkiv/i-modules.xml index d8eda7fba..03ed005e2 100644 --- a/tex/context/interface/mkiv/i-modules.xml +++ b/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" file="file-mod.mkvi"> + <cd:command name="usemodule" level="style" file="file-mod.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -24,7 +24,7 @@ <!-- - <cd:command name="usemodules" file="file-mod.mkvi"> + <cd:command name="usemodules" level="style" file="file-mod.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -44,7 +44,7 @@ --> - <cd:command name="usetexmodule" file="file-mod.mkvi"> + <cd:command name="usetexmodule" level="style" 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" file="file-mod.mkvi"> + <cd:command name="module" type="environment" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="module" type="environment" variant="string" file="file-mod.mkvi"> + <cd:command name="module" type="environment" variant="string" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="setupmodule" file="file-mod.mkvi"> + <cd:command name="setupmodule" level="system" 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" file="file-mod.mkvi"> + <cd:command name="moduleparameter" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="currentmoduleparameter" file="file-mod.mkvi"> + <cd:command name="currentmoduleparameter" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="moduletestsection" type="environment" file="file-mod.mkvi"/> + <cd:command name="moduletestsection" type="environment" level="system" file="file-mod.mkvi"/> - <cd:command name="fetchruntinecommand" file="file-mod.mkvi"> + <cd:command name="fetchruntinecommand" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="luaenvironment" file="file-mod.mkvi"> + <cd:command name="luaenvironment" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useluamodule" file="file-mod.mkvi"> + <cd:command name="useluamodule" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-narrow.xml b/tex/context/interface/mkiv/i-narrow.xml index 25e40fd08..5133b6302 100644 --- a/tex/context/interface/mkiv/i-narrow.xml +++ b/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" file="spac-hor.mkiv"> + <cd:command name="definenarrower" level="style" category="whitespace 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" file="spac-hor.mkiv"> + <cd:command name="setupnarrower" level="style" category="whitespace 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" file="spac-hor.mkiv"> + <cd:command name="narrower" type="environment" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="left" prefix="cd:sign" method="none"/> @@ -56,11 +56,12 @@ <cd:constant type="middle" prefix="cd:number" method="factor"/> <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> + <cd:constant type="reverse"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="narrower" type="environment" generated="yes" variant="example" file="spac-hor.mkiv"> + <cd:command name="narrower" type="environment" generated="yes" variant="example" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:sequence> <cd:variable value="narrower"/> </cd:sequence> @@ -73,11 +74,12 @@ <cd:constant type="middle" prefix="cd:number" method="factor"/> <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> - </cd:keywords> + <cd:constant type="reverse"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -86,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" variant="name" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" variant="name" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords list="yes" optional="yes"> @@ -97,11 +99,12 @@ <cd:constant type="middle" prefix="cd:number" method="factor"/> <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> - </cd:keywords> + <cd:constant type="reverse"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" variant="assignment" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" variant="assignment" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnarrower"/> @@ -114,7 +117,8 @@ <cd:constant type="middle" prefix="cd:number" method="factor"/> <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> - </cd:keywords> + <cd:constant type="reverse"/> + </cd:keywords> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-naturaltable.xml b/tex/context/interface/mkiv/i-naturaltable.xml index e18be1b79..ac9ea9383 100644 --- a/tex/context/interface/mkiv/i-naturaltable.xml +++ b/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" file="tabl-ntb.mkiv"> + <cd:command name="setupTABLE" level="style" category="tables" file="tabl-ntb.mkiv"> <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" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -131,7 +131,7 @@ </cd:arguments> </cd:command> - <cd:command name="TD" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TD" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -160,7 +160,7 @@ </cd:arguments> </cd:command> - <cd:command name="TR" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TR" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -168,7 +168,7 @@ </cd:arguments> </cd:command> - <cd:command name="TC" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TC" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -176,7 +176,7 @@ </cd:arguments> </cd:command> - <cd:command name="TX" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TX" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -184,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="TY" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TY" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -192,7 +192,7 @@ </cd:arguments> </cd:command> - <cd:command name="TH" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TH" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -200,7 +200,7 @@ </cd:arguments> </cd:command> - <cd:command name="TN" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TN" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -208,7 +208,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEhead" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -216,7 +216,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEnext" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -224,7 +224,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEbody" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -232,7 +232,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEfoot" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -240,7 +240,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineTABLEsetup" file="tabl-ntb.mkiv"> + <cd:command name="defineTABLEsetup" level="style" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -249,19 +249,19 @@ </cd:arguments> </cd:command> - <cd:command name="TDs" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TDs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TRs" type="environment" begin="b" end="e" file="tabl-ntb.mkiv"> + <cd:command name="TRs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TABLE" type="environment" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -269,7 +269,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEhead" type="environment" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -277,7 +277,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEnext" type="environment" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -285,7 +285,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEbody" type="environment" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -293,7 +293,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEfoot" type="environment" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -301,4 +301,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml index a7ecb5401..9bcf43d5b 100644 --- a/tex/context/interface/mkiv/i-note.xml +++ b/tex/context/interface/mkiv/i-note.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="definenotation" file="strc-not.mkvi"> + <cd:command name="definenotation" level="system" category="structure 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" file="strc-not.mkvi"> + <cd:command name="setupnotation" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -138,6 +138,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </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:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -183,7 +189,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnotations" file="strc-not.mkvi"> + <cd:command name="setupnotations" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -192,7 +198,7 @@ </cd:arguments> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -204,7 +210,7 @@ </cd:instances> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="instance" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -216,7 +222,7 @@ </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="instance" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -229,7 +235,7 @@ </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="instance:assignment" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -241,7 +247,7 @@ </cd:instances> </cd:command> - <cd:command name="definenote" file="strc-not.mkvi"> + <cd:command name="definenote" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -251,7 +257,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnote" file="strc-not.mkvi"> + <cd:command name="setupnote" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -381,12 +387,20 @@ <cd:parameter name="anchor"> <cd:constant type="next"/> </cd:parameter> + <!-- begin root only --> + <cd:parameter name="spacebefore"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <!-- end root only --> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupnotes" file="strc-not.mkvi"> + <cd:command name="setupnotes" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -395,7 +409,7 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" file="strc-not.mkvi"> + <cd:command name="setnote" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -403,14 +417,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" variant="assignment" file="strc-not.mkvi"> + <cd:command name="setnote" variant="assignment" level="document" category="structure 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" file="strc-not.mkvi"> + <cd:command name="setnotetext" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -418,14 +432,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnotetext" variant="assignment" file="strc-not.mkvi"> + <cd:command name="setnotetext" variant="assignment" level="document" category="structure 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" file="strc-not.mkvi"> + <cd:command name="placenotes" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:assignments list="yes" optional="yes"> @@ -434,13 +448,13 @@ </cd:arguments> </cd:command> - <cd:command name="localnotes" type="environment" file="strc-not.mkvi"> + <cd:command name="localnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="placelocalnotes" file="strc-not.mkvi"> + <cd:command name="placelocalnotes" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -449,11 +463,11 @@ </cd:arguments> </cd:command> - <cd:command name="postponenotes" file="strc-not.mkvi"/> + <cd:command name="postponenotes" level="style" category="structure notes" file="strc-not.mkvi"/> - <cd:command name="flushnotes" file="strc-not.mkvi"/> + <cd:command name="flushnotes" level="style" category="structure notes" file="strc-not.mkvi"/> - <cd:command name="doifelsenoteonsamepage" file="strc-not.mkvi"> + <cd:command name="doifelsenoteonsamepage" level="system" category="structure notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -461,7 +475,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnoteonsamepageelse" file="strc-not.mkvi"> + <cd:command name="doifnoteonsamepageelse" level="system" category="structure notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -469,21 +483,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotescollected" file="strc-not.mkvi"> + <cd:command name="doifnotescollected" level="system" category="structure 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" file="strc-not.mkvi"> + <cd:command name="notesymbol" level="system" category="structure 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" file="strc-not.mkvi"> + <cd:command name="note" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-reference"/> @@ -492,26 +506,26 @@ <!-- - <cd:command name="footnote" type="environment" variant="assignment" file="strc-not.mkvi"> + <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" file="strc-not.mkvi"> + <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" file="strc-not.mkvi"> + <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" file="strc-not.mkvi"> + <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> @@ -519,20 +533,20 @@ --> - <cd:command name="footnotetext" file="strc-not.mkvi"> + <cd:command name="footnotetext" 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="footnotetext" variant="assignment" file="strc-not.mkvi"> + <cd:command name="footnotetext" 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="placefootnotes" file="strc-not.mkvi"> + <cd:command name="placefootnotes" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> @@ -540,9 +554,9 @@ </cd:arguments> </cd:command> - <cd:command name="localfootnotes" type="environment" file="strc-not.mkvi"/> + <cd:command name="localfootnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi"/> - <cd:command name="placelocalfootnotes" file="strc-not.mkvi"> + <cd:command name="placelocalfootnotes" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> @@ -552,26 +566,26 @@ <!-- - <cd:command name="endnote" type="environment" variant="assignment" file="strc-not.mkvi"> + <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" file="strc-not.mkvi"> + <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" file="strc-not.mkvi"> + <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" file="strc-not.mkvi"> + <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> @@ -579,7 +593,7 @@ --> - <cd:command name="definelinenote" file="strc-lnt.mkvi"> + <cd:command name="definelinenote" level="style" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -589,7 +603,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinenote" file="strc-lnt.mkvi"> + <cd:command name="setuplinenote" level="style" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -613,7 +627,7 @@ </cd:arguments> </cd:command> - <cd:command name="linenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> + <cd:command name="linenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:instance value="linenote"/> </cd:sequence> @@ -625,7 +639,7 @@ </cd:instances> </cd:command> - <cd:command name="startlinenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> + <cd:command name="startlinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="start"/> <cd:instance value="linenote"/> @@ -639,7 +653,7 @@ </cd:instances> </cd:command> - <cd:command name="stoplinenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> + <cd:command name="stoplinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="stop"/> <cd:instance value="linenote"/> @@ -652,14 +666,14 @@ </cd:instances> </cd:command> - <cd:command name="fromlinenote" file="strc-lnt.mkvi"> + <cd:command name="fromlinenote" 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="tolinenote" file="strc-lnt.mkvi"> + <cd:command name="tolinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> @@ -667,20 +681,20 @@ <!-- - <cd:command name="linenote" file="strc-lnt.mkvi"> + <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" file="strc-lnt.mkvi"> + <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" file="strc-lnt.mkvi"> + <cd:command name="stoplinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> @@ -688,4 +702,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-object.xml b/tex/context/interface/mkiv/i-object.xml index 6e105b377..2083c3572 100644 --- a/tex/context/interface/mkiv/i-object.xml +++ b/tex/context/interface/mkiv/i-object.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="ifinobject" file="pack-obj.mkiv"> + <cd:command name="ifinobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -13,15 +13,15 @@ </cd:arguments> </cd:command> - <cd:command name="objectmargin" file="pack-obj.mkiv"/> + <cd:command name="objectmargin" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="objectwidth" file="pack-obj.mkiv"/> + <cd:command name="objectwidth" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="objectheight" file="pack-obj.mkiv"/> + <cd:command name="objectheight" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="objectdepth" file="pack-obj.mkiv"/> + <cd:command name="objectdepth" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="setreferencedobject" file="pack-obj.mkiv"> + <cd:command name="setreferencedobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="settightreferencedobject" file="pack-obj.mkiv"> + <cd:command name="settightreferencedobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="setunreferencedobject" file="pack-obj.mkiv"> + <cd:command name="setunreferencedobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="settightunreferencedobject" file="pack-obj.mkiv"> + <cd:command name="settightunreferencedobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -57,7 +57,7 @@ </cd:arguments> </cd:command> - <cd:command name="setobject" file="pack-obj.mkiv"> + <cd:command name="setobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="settightobject" file="pack-obj.mkiv"> + <cd:command name="settightobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -75,25 +75,25 @@ </cd:arguments> </cd:command> - <cd:command name="getobject" file="pack-obj.mkiv"> + <cd:command name="getobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getobjectdimensions" file="pack-obj.mkiv"> + <cd:command name="getobjectdimensions" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defaultobjectreference" file="pack-obj.mkiv"/> + <cd:command name="defaultobjectreference" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="defaultobjectpage" file="pack-obj.mkiv"/> + <cd:command name="defaultobjectpage" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="doifelseobjectfound" file="pack-obj.mkiv"> + <cd:command name="doifelseobjectfound" level="system" category="pdf 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" file="pack-obj.mkiv"> + <cd:command name="doifobjectfoundelse" level="system" category="pdf 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" file="pack-obj.mkiv"> + <cd:command name="doifelseobjectreferencefound" level="system" category="pdf 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" file="pack-obj.mkiv"> + <cd:command name="doifobjectreferencefoundelse" level="system" category="pdf 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-offset.xml b/tex/context/interface/mkiv/i-offset.xml index fc759673d..15a162b1a 100644 --- a/tex/context/interface/mkiv/i-offset.xml +++ b/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" file="pack-box.mkiv"> + <cd:command name="setupoffsetbox" level="style" category="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" file="pack-box.mkiv"> + <cd:command name="setupoffset" level="style" category="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" file="pack-box.mkiv"> + <cd:command name="offsetbox" level="system" category="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" file="pack-box.mkiv"> + <cd:command name="offset" level="document" category="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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-opposite.xml b/tex/context/interface/mkiv/i-opposite.xml index 497b6d502..3ed22559f 100644 --- a/tex/context/interface/mkiv/i-opposite.xml +++ b/tex/context/interface/mkiv/i-opposite.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupoppositeplacing" file="page-fac.mkiv"> + <cd:command name="setupoppositeplacing" level="style" category="layout" file="page-fac.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -24,6 +24,6 @@ </cd:arguments> </cd:command> - <cd:command name="opposite" type="environment" file="page-fac.mkiv"/> + <cd:command name="opposite" type="environment" level="document" category="layout" file="page-fac.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-ornament.xml b/tex/context/interface/mkiv/i-ornament.xml index f4ae43a6d..847fda4e6 100644 --- a/tex/context/interface/mkiv/i-ornament.xml +++ b/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" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="collector" level="document" category="background 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" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="layer" level="document" category="background 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" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="direct" level="document" category="background 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" file="pack-box.mkiv"> + <cd:command name="defineornament" variant="collector" level="style" category="background 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" file="pack-box.mkiv"> + <cd:command name="defineornament" variant="layer" level="style" category="background 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" file="pack-box.mkiv"> + <cd:command name="ornament" generated="yes" variant="example" level="document" category="background fonts colors" file="pack-box.mkiv"> <cd:sequence> <cd:variable value="ornament"/> </cd:sequence> @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-output.xml b/tex/context/interface/mkiv/i-output.xml index bf719ca6a..28b5b3799 100644 --- a/tex/context/interface/mkiv/i-output.xml +++ b/tex/context/interface/mkiv/i-output.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineoutputroutine" file="page-otr.mkvi"> + <cd:command name="defineoutputroutine" level="system" category="layout" file="page-otr.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="setupoutputroutine" file="page-otr.mkvi"> + <cd:command name="setupoutputroutine" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -25,25 +25,25 @@ </cd:arguments> </cd:command> - <cd:command name="setupoutputroutine" variant="name" file="page-otr.mkvi"> + <cd:command name="setupoutputroutine" variant="name" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="defineoutputroutinecommand" file="page-otr.mkvi"> + <cd:command name="defineoutputroutinecommand" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-key-list"/> </cd:arguments> </cd:command> - <cd:command name="traceoutputroutines" file="page-otr.mkvi"/> + <cd:command name="traceoutputroutines" level="system" category="layout" file="page-otr.mkvi"/> - <cd:command name="installoutputroutine" file="page-otr.mkvi"> + <cd:command name="installoutputroutine" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-overlay.xml b/tex/context/interface/mkiv/i-overlay.xml index 91e9f4873..40d0bda93 100644 --- a/tex/context/interface/mkiv/i-overlay.xml +++ b/tex/context/interface/mkiv/i-overlay.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineoverlay" file="pack-lyr.mkiv"> + <cd:command name="defineoverlay" level="style" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name-optional"/> @@ -12,21 +12,21 @@ </cd:arguments> </cd:command> - <cd:command name="overlaycolor" file="pack-rul.mkiv"/> + <cd:command name="overlaycolor" level="system" category="background colors" file="pack-rul.mkiv"/> - <cd:command name="overlaylinecolor" file="pack-rul.mkiv"/> + <cd:command name="overlaylinecolor" level="system" category="background colors" file="pack-rul.mkiv"/> - <cd:command name="overlaywidth" file="pack-rul.mkiv"/> + <cd:command name="overlaywidth" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="overlayheight" file="pack-rul.mkiv"/> + <cd:command name="overlayheight" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="overlaydepth" file="pack-rul.mkiv"/> + <cd:command name="overlaydepth" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="overlayoffset" file="pack-rul.mkiv"/> + <cd:command name="overlayoffset" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="overlaylinewidth" file="pack-rul.mkiv"/> + <cd:command name="overlaylinewidth" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="doifelseoverlay" file="pack-rul.mkiv"> + <cd:command name="doifelseoverlay" level="system" category="background 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" file="pack-rul.mkiv"> + <cd:command name="doifoverlayelse" level="system" category="background 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagebreak.xml b/tex/context/interface/mkiv/i-pagebreak.xml index 917e4a718..9972800ec 100644 --- a/tex/context/interface/mkiv/i-pagebreak.xml +++ b/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" file="page-brk.mkiv"> + <cd:command name="definepagebreak" level="style" 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" file="page-brk.mkiv"> + <cd:command name="pagebreak" level="document" 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" file="page-brk.mkiv"> + <cd:command name="page" level="document" 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" file="page-brk.mkiv"> + <cd:command name="definecolumnbreak" level="style" 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" file="page-brk.mkiv"> + <cd:command name="columnbreak" level="document" 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" file="page-brk.mkiv"> + <cd:command name="column" level="document" 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" file="page-brk.mkiv"> + <cd:command name="definepagechecker" level="style" 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" file="page-brk.mkiv"> + <cd:command name="setuppagechecker" level="style" 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" file="page-brk.mkiv"> + <cd:command name="checkpage" level="document" 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" file="page-brk.mkiv"> + <cd:command name="testpage" level="document" 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" file="page-brk.mkiv"> + <cd:command name="testpageonly" level="system" 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" file="page-brk.mkiv"> + <cd:command name="testpagesync" level="system" 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" file="page-brk.mkiv"> + <cd:command name="testcolumn" level="document" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagecomment.xml b/tex/context/interface/mkiv/i-pagecomment.xml index 26678a4a0..75b9056a8 100644 --- a/tex/context/interface/mkiv/i-pagecomment.xml +++ b/tex/context/interface/mkiv/i-pagecomment.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuppagecomment" file="page-com.mkiv"> + <cd:command name="setuppagecomment" level="style" category="pdf" file="page-com.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -35,6 +35,6 @@ </cd:arguments> </cd:command> - <cd:command name="pagecomment" type="environment" file="page-com.mkiv"/> + <cd:command name="pagecomment" type="environment" level="document" category="pdf" file="page-com.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagefigure.xml b/tex/context/interface/mkiv/i-pagefigure.xml index 5f776e835..0e8af435f 100644 --- a/tex/context/interface/mkiv/i-pagefigure.xml +++ b/tex/context/interface/mkiv/i-pagefigure.xml @@ -4,22 +4,32 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pagefigure" file="page-app.mkiv"> + <cd:command name="pagefigure" level="document" category="graphics" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupexternalfigure"/> + <cd:parameter name="offset"> + <cd:constant type="default"/> + <cd:constant type="overlay"/> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="pagefigure" type="environment" file="page-app.mkiv"> + <cd:command name="pagefigure" type="environment" level="document" category="graphics" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupexternalfigure"/> + <cd:parameter name="offset"> + <cd:constant type="default"/> + <cd:constant type="overlay"/> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml index 21f906a0c..8e53ef8fc 100644 --- a/tex/context/interface/mkiv/i-pagegrid.xml +++ b/tex/context/interface/mkiv/i-pagegrid.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagegrid" file="page-cst.mkiv"> + <cd:command name="definepagegrid" level="style" category="layout" file="page-cst.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="setuppagegrid" file="page-cst.mkiv"> + <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" generated="yes" variant="example" file="page-cst.mkiv"> + <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> <cd:sequence> <cd:variable value="pagegrid"/> </cd:sequence> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" file="page-cst.mkiv"> + <cd:command name="pagegrid" type="environment" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpagegrid" file="page-cst.mkiv"> + <cd:command name="setpagegrid" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="c"> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepagegridspan" file="page-cst.mkiv"> + <cd:command name="definepagegridspan" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridspan" file="page-cst.mkiv"> + <cd:command name="setuppagegridspan" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -129,7 +129,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagegridspan" type="environment" file="page-cst.mkiv"> + <cd:command name="pagegridspan" type="environment" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -138,13 +138,13 @@ </cd:arguments> </cd:command> - <cd:command name="pagegridspanwidth" file="page-cst.mkiv"> + <cd:command name="pagegridspanwidth" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="definepagegridarea" file="page-cst.mkiv"> + <cd:command name="definepagegridarea" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -154,7 +154,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridarea" file="page-cst.mkiv"> + <cd:command name="setuppagegridarea" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -192,14 +192,14 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridareatext" file="page-cst.mkiv"> + <cd:command name="setuppagegridareatext" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setuppagegridlines" file="page-cst.mkiv"> + <cd:command name="setuppagegridlines" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -208,7 +208,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridstart" file="page-cst.mkiv"> + <cd:command name="setuppagegridstart" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -217,4 +217,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageinjection.xml b/tex/context/interface/mkiv/i-pageinjection.xml index c069dbc8b..f2ded298e 100644 --- a/tex/context/interface/mkiv/i-pageinjection.xml +++ b/tex/context/interface/mkiv/i-pageinjection.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepageinjection" file="page-inj.mkvi"> + <cd:command name="definepageinjection" level="style" category="structure" file="page-inj.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="setuppageinjection" file="page-inj.mkvi"> + <cd:command name="setuppageinjection" level="style" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -49,14 +49,14 @@ </cd:arguments> </cd:command> - <cd:command name="pageinjection" file="page-inj.mkvi"> + <cd:command name="pageinjection" level="document" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="pageinjection" variant="assignment" file="page-inj.mkvi"> + <cd:command name="pageinjection" variant="assignment" level="document" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppageinjection"/> @@ -65,7 +65,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepageinjectionalternative" file="page-inj.mkvi"> + <cd:command name="definepageinjectionalternative" level="style" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppageinjectionalternative" file="page-inj.mkvi"> + <cd:command name="setuppageinjectionalternative" level="style" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -86,4 +86,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagelayout.xml b/tex/context/interface/mkiv/i-pagelayout.xml index dd4bc27f5..3aadda0ff 100644 --- a/tex/context/interface/mkiv/i-pagelayout.xml +++ b/tex/context/interface/mkiv/i-pagelayout.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pagearea" file="page-plg.mkiv"> + <cd:command name="pagearea" level="style" category="layout" file="page-plg.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagelayout" type="environment" file="page-plg.mkiv"> + <cd:command name="pagelayout" type="environment" level="style" category="layout" file="page-plg.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="page"/> @@ -38,4 +38,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagemarks.xml b/tex/context/interface/mkiv/i-pagemarks.xml new file mode 100644 index 000000000..036f518b9 --- /dev/null +++ b/tex/context/interface/mkiv/i-pagemarks.xml @@ -0,0 +1,24 @@ +<?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="markpage" level="style" file="page-lay.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:number" prefix="cd:sign" method="none"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="doifelsemarkedpage" level="style" category="conditional" file="page-lay.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagenumber.xml b/tex/context/interface/mkiv/i-pagenumber.xml index d17df9425..4c262db4b 100644 --- a/tex/context/interface/mkiv/i-pagenumber.xml +++ b/tex/context/interface/mkiv/i-pagenumber.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuprealpagenumber" file="strc-pag.mkiv"> + <cd:command name="setuprealpagenumber" level="system" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupuserpagenumber" file="strc-pag.mkiv"> + <cd:command name="setupuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="viewerprefix"> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsubpagenumber" file="strc-pag.mkiv"> + <cd:command name="setupsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagenumber" file="strc-pag.mkiv"> + <cd:command name="setuppagenumber" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupuserpagenumber"/> @@ -48,17 +48,17 @@ <!-- - <cd:command name="resetrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="resetrealpagenumber" level="system" file="strc-pag.mkiv"/> --> - <cd:command name="resetuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="resetuserpagenumber" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="resetsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="resetsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="resetpagenumber" file="strc-pag.mkiv"/> + <cd:command name="resetpagenumber" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="setuppagenumbering" file="strc-pag.mkiv"> + <cd:command name="setuppagenumbering" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -111,74 +111,74 @@ </cd:arguments> </cd:command> - <cd:command name="firstrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="firstrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="firstuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="firstsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="lastrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="lastuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="lastsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="prevrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="prevuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="prevsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="nextrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="nextuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="nextsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstrealpage" file="strc-pag.mkiv"/> + <cd:command name="firstrealpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstuserpage" file="strc-pag.mkiv"/> + <cd:command name="firstuserpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstsubpage" file="strc-pag.mkiv"/> + <cd:command name="firstsubpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevrealpage" file="strc-pag.mkiv"/> + <cd:command name="prevrealpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevuserpage" file="strc-pag.mkiv"/> + <cd:command name="prevuserpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevsubpage" file="strc-pag.mkiv"/> + <cd:command name="prevsubpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextrealpage" file="strc-pag.mkiv"/> + <cd:command name="nextrealpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextuserpage" file="strc-pag.mkiv"/> + <cd:command name="nextuserpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextsubpage" file="strc-pag.mkiv"/> + <cd:command name="nextsubpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastrealpage" file="strc-pag.mkiv"/> + <cd:command name="lastrealpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastuserpage" file="strc-pag.mkiv"/> + <cd:command name="lastuserpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastsubpage" file="strc-pag.mkiv"/> + <cd:command name="lastsubpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="realpagenumber" file="strc-pag.mkiv"/> + <cd:command name="realpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="userpagenumber" file="strc-pag.mkiv"/> + <cd:command name="userpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="subpagenumber" file="strc-pag.mkiv"/> + <cd:command name="subpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="pagenumber" file="strc-pag.mkiv"/> + <cd:command name="pagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prefixedpagenumber" file="strc-pag.mkiv"/> + <cd:command name="prefixedpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="incrementpagenumber" file="strc-pag.mkiv"/> + <cd:command name="incrementpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="incrementsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="incrementsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="decrementpagenumber" file="strc-pag.mkiv"/> + <cd:command name="decrementpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="decrementsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="decrementsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="completepagenumber" file="strc-pag.mkiv"/> + <cd:command name="completepagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="placepagenumber" file="strc-pag.mkiv"/> + <cd:command name="placepagenumber" level="style" category="counter" file="strc-pag.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageselection.xml b/tex/context/interface/mkiv/i-pageselection.xml index 99d55bb8a..082f53b6d 100644 --- a/tex/context/interface/mkiv/i-pageselection.xml +++ b/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" file="page-sel.mkvi"> + <cd:command name="insertpages" level="document" 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" file="page-sel.mkvi"> + <cd:command name="filterpages" level="document" 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" file="page-sel.mkvi"> + <cd:command name="copypages" level="document" 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" file="page-sel.mkvi"> + <cd:command name="combinepages" level="document" 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" file="page-sel.mkvi"> + <cd:command name="slicepages" level="document" 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageshift.xml b/tex/context/interface/mkiv/i-pageshift.xml index 630a5af6c..01e014a28 100644 --- a/tex/context/interface/mkiv/i-pageshift.xml +++ b/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" file="page-imp.mkiv"> + <cd:command name="definepageshift" level="style" 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" file="page-imp.mkiv"> + <cd:command name="setuppageshift" level="style" 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagestate.xml b/tex/context/interface/mkiv/i-pagestate.xml index 82396d000..941068399 100644 --- a/tex/context/interface/mkiv/i-pagestate.xml +++ b/tex/context/interface/mkiv/i-pagestate.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagestate" file="core-dat.mkiv"> + <cd:command name="definepagestate" level="system" file="core-dat.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="setuppagestate" file="core-dat.mkiv"> + <cd:command name="setuppagestate" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -26,7 +26,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpagestate" file="core-dat.mkiv"> + <cd:command name="setpagestate" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagestaterealpage" file="core-dat.mkiv"> + <cd:command name="pagestaterealpage" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpagestaterealpageno" file="core-dat.mkiv"> + <cd:command name="setpagestaterealpageno" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -56,4 +56,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pairedbox.xml b/tex/context/interface/mkiv/i-pairedbox.xml index bbab966ba..a5a0b9b5f 100644 --- a/tex/context/interface/mkiv/i-pairedbox.xml +++ b/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" file="pack-com.mkiv"> + <cd:command name="definepairedbox" level="style" 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" file="pack-com.mkiv"> + <cd:command name="setuppairedbox" level="style" 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" file="pack-com.mkiv"> + <cd:command name="placepairedbox" level="document" 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" file="pack-com.mkiv"> + <cd:command name="placepairedbox" type="environment" level="document" 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" file="pack-com.mkiv"> + <cd:command name="setuppairedbox" generated="yes" variant="instance" level="style" 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" file="pack-com.mkiv"> + <cd:command name="placepairedbox" generated="yes" variant="instance" level="document" 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" file="pack-com.mkiv"> + <cd:command name="placepairedbox" type="environment" generated="yes" variant="instance" level="document" file="pack-com.mkiv"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -139,7 +139,7 @@ <!-- - <cd:command name="setuplegend" file="pack-com.mkiv"> + <cd:command name="setuplegend" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppairedbox"/> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelegend" file="pack-com.mkiv"> + <cd:command name="placelegend" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppairedbox"/> @@ -157,7 +157,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelegend" type="environment" file="pack-com.mkiv"> + <cd:command name="placelegend" type="environment" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppairedbox"/> @@ -167,18 +167,18 @@ --> - <cd:command name="placeontopofeachother" file="pack-com.mkiv"> + <cd:command name="placeontopofeachother" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="placesidebyside" file="pack-com.mkiv"> + <cd:command name="placesidebyside" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-papersize.xml b/tex/context/interface/mkiv/i-papersize.xml index dab5e03bd..8156235bd 100644 --- a/tex/context/interface/mkiv/i-papersize.xml +++ b/tex/context/interface/mkiv/i-papersize.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="definelayouttarget" file="page-lay.mkiv"> + <cd:command name="definelayouttarget" level="system" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -16,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayouttarget" file="page-lay.mkiv"> + <cd:command name="setuplayouttarget" level="system" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -102,7 +102,7 @@ --> - <cd:command name="definepapersize" file="page-lay.mkiv"> + <cd:command name="definepapersize" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -137,7 +137,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepapersize" variant="name" file="page-lay.mkiv"> + <cd:command name="definepapersize" variant="name" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -149,7 +149,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppapersize" variant="name" file="page-lay.mkiv"> + <cd:command name="setuppapersize" variant="name" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -178,7 +178,7 @@ <!-- - <cd:command name="setuppapersize" file="page-lay.mkiv"> + <cd:command name="setuppapersize" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -187,7 +187,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppaper" file="page-lay.mkiv"> + <cd:command name="setuppaper" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuplayouttarget"/> @@ -197,7 +197,7 @@ --> - <cd:command name="setuppapersize" file="page-lay.mkiv"> + <cd:command name="setuppapersize" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -281,7 +281,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppaper" file="page-lay.mkiv"> + <cd:command name="setuppaper" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppapersize"/> @@ -289,7 +289,7 @@ </cd:arguments> </cd:command> - <cd:command name="adaptpapersize" file="page-lay.mkiv"> + <cd:command name="adaptpapersize" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setuppapersize"/> @@ -300,4 +300,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraph.xml b/tex/context/interface/mkiv/i-paragraph.xml index 8a88f72fc..b253f404b 100644 --- a/tex/context/interface/mkiv/i-paragraph.xml +++ b/tex/context/interface/mkiv/i-paragraph.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineparagraph" file="strc-tag.mkiv"> + <cd:command name="defineparagraph" level="style" category="structure" file="strc-tag.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="setupparagraph" file="strc-tag.mkiv"> + <cd:command name="setupparagraph" level="style" category="structure" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="paragraph" type="environment" file="strc-tag.mkiv"> + <cd:command name="paragraph" type="environment" level="document" category="structure" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -43,7 +43,7 @@ </cd:arguments> </cd:command> - <cd:command name="par" type="environment" file="strc-tag.mkiv"> + <cd:command name="par" type="environment" level="document" category="structure" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -52,9 +52,9 @@ </cd:arguments> </cd:command> - <cd:command name="par" type="environment" begin="b" end ="e" file="strc-tag.mkiv"/> + <cd:command name="par" type="environment" begin="b" end ="e" level="document" category="structure" file="strc-tag.mkiv"/> - <cd:command name="setupparagraphintro" file="spac-par.mkiv"> + <cd:command name="setupparagraphintro" level="style" category="structure" file="spac-par.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="reset"/> @@ -68,4 +68,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraphnumber.xml b/tex/context/interface/mkiv/i-paragraphnumber.xml index f3588f87c..6d35f11a0 100644 --- a/tex/context/interface/mkiv/i-paragraphnumber.xml +++ b/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" file="page-par.mkiv"> + <cd:command name="setupparagraphnumbering" level="style" category="structure 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraphs.xml b/tex/context/interface/mkiv/i-paragraphs.xml index 99092f668..0d8ae3d2e 100644 --- a/tex/context/interface/mkiv/i-paragraphs.xml +++ b/tex/context/interface/mkiv/i-paragraphs.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineparagraphs" file="tabl-mis.mkiv"> + <cd:command name="defineparagraphs" level="style" category="tables" file="tabl-mis.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="setupparagraphs" file="tabl-mis.mkiv"> + <cd:command name="setupparagraphs" level="style" category="tables" file="tabl-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords list="yes" optional="yes"> @@ -76,7 +76,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupparagraphs" variant="assignment" file="tabl-mis.mkiv"> + <cd:command name="setupparagraphs" variant="assignment" level="style" category="tables" file="tabl-mis.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number" prefix="cd:name" method="range"/> @@ -136,33 +136,33 @@ </cd:arguments> </cd:command> - <cd:command name="paragraphs" type="environment" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" type="environment" level="document" category="tables" file="tabl-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="nextparagraphs" file="tabl-mis.mkiv"/> + <cd:command name="nextparagraphs" level="document" category="tables" file="tabl-mis.mkiv"/> - <cd:command name="paragraphs" type="environment" generated="yes" variant="example" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-mis.mkiv"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="paragraphs" generated="yes" variant="example" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" generated="yes" variant="example" level="document" category="tables" file="tabl-mis.mkiv"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="nextparagraphs" generated="yes" variant="example" file="tabl-mis.mkiv"> + <cd:command name="nextparagraphs" generated="yes" variant="example" level="document" category="tables" file="tabl-mis.mkiv"> <cd:sequence> <cd:string value="next"/> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="paragraphscell" type="environment" file="tabl-mis.mkiv"/> + <cd:command name="paragraphscell" type="environment" level="document" category="tables" file="tabl-mis.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-parallel.xml b/tex/context/interface/mkiv/i-parallel.xml index ed1c50c86..3f7154c9f 100644 --- a/tex/context/interface/mkiv/i-parallel.xml +++ b/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" file="buff-par.mkvi"> + <cd:command name="defineparallel" level="style" 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" file="buff-par.mkvi"> + <cd:command name="setupparallel" level="style" 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" file="buff-par.mkvi"> + <cd:command name="placeparallel" level="document" 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" file="buff-par.mkvi"> + <cd:command name="doifelseparallel" level="style" category="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" file="buff-par.mkvi"> + <cd:command name="doifparallelelse" level="style" category="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" file="buff-par.mkvi"> + <cd:command name="resetparallel" level="style" 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" file="buff-par.mkvi"> + <cd:command name="parallel" type="environment" generated="yes" variant="example" level="document" file="buff-par.mkvi"> <cd:sequence> <cd:variable value="parallel"/> </cd:sequence> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-parbuilder.xml b/tex/context/interface/mkiv/i-parbuilder.xml index b7bf37417..95621fce0 100644 --- a/tex/context/interface/mkiv/i-parbuilder.xml +++ b/tex/context/interface/mkiv/i-parbuilder.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineparbuilder" file="typo-bld.mkiv"> + <cd:command name="defineparbuilder" level="system" category="layout" file="typo-bld.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="parbuilder" type="environment" file="typo-bld.mkiv"> + <cd:command name="parbuilder" type="environment" level="system" category="layout" file="typo-bld.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="setmainparbuilder" file="typo-bld.mkiv"> + <cd:command name="setmainparbuilder" level="system" category="layout" file="typo-bld.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -32,4 +32,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pdf.xml b/tex/context/interface/mkiv/i-pdf.xml index 5b4eab2c3..fc83777a1 100644 --- a/tex/context/interface/mkiv/i-pdf.xml +++ b/tex/context/interface/mkiv/i-pdf.xml @@ -4,119 +4,119 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pdfbackendsetcatalog" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetcatalog" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetinfo" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetinfo" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetname" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetname" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpageattribute" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpageattribute" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpagesattribute" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpagesattribute" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpageresource" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpageresource" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetextgstate" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetextgstate" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetcolorspace" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetcolorspace" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpattern" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpattern" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetshade" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetshade" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendcurrentresources" file="back-pdf.mkiv"/> + <cd:command name="pdfbackendcurrentresources" level="system" category="pdf" file="back-pdf.mkiv"/> - <cd:command name="pdfcolor" file="back-pdf.mkiv"> + <cd:command name="pdfcolor" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="PDFcolor" file="back-pdf.mkiv"> + <cd:command name="PDFcolor" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="TransparencyHack" file="back-pdf.mkiv"/> + <cd:command name="TransparencyHack" level="system" category="pdf" file="back-pdf.mkiv"/> - <cd:command name="lastpredefinedsymbol" file="pack-obj.mkiv"/> + <cd:command name="lastpredefinedsymbol" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="predefinesymbol" file="pack-obj.mkiv"> + <cd:command name="predefinesymbol" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendactualtext" file="back-pdf.mkiv"> + <cd:command name="pdfbackendactualtext" level="style" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfactualtext" file="back-pdf.mkiv"> + <cd:command name="pdfactualtext" level="document" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="negative" type="environment" file="attr-neg.mkiv"/> + <cd:command name="negative" type="environment" level="document" category="pdf" file="attr-neg.mkiv"/> - <cd:command name="positive" type="environment" file="attr-neg.mkiv"/> + <cd:command name="positive" type="environment" level="document" category="pdf" file="attr-neg.mkiv"/> - <cd:command name="setuppagetransitions" file="scrn-pag.mkvi"> + <cd:command name="setuppagetransitions" level="style" category="pdf" file="scrn-pag.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="reset" default="yes"/> @@ -128,4 +128,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-penalty.xml b/tex/context/interface/mkiv/i-penalty.xml index ee241b9ff..d69c196f9 100644 --- a/tex/context/interface/mkiv/i-penalty.xml +++ b/tex/context/interface/mkiv/i-penalty.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="resetpenalties" file="spac-ver.mkiv"> + <cd:command name="resetpenalties" level="system" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="setpenalties" file="spac-ver.mkiv"> + <cd:command name="setpenalties" level="system" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> @@ -18,12 +18,12 @@ </cd:arguments> </cd:command> - <cd:command name="keeplinestogether" file="spac-ver.mkiv"> + <cd:command name="keeplinestogether" level="system" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="setdefaultpenalties" file="spac-ver.mkiv"/> + <cd:command name="setdefaultpenalties" level="system" category="layout" file="spac-ver.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-periods.xml b/tex/context/interface/mkiv/i-periods.xml index 9114ae550..5cded3b1c 100644 --- a/tex/context/interface/mkiv/i-periods.xml +++ b/tex/context/interface/mkiv/i-periods.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupperiods" file="enco-ini.mkiv"> + <cd:command name="setupperiods" level="style" category="symbols" file="enco-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -24,13 +24,13 @@ </cd:arguments> </cd:command> - <cd:command name="periods" file="enco-ini.mkiv"> + <cd:command name="periods" level="document" category="symbols" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="periods" variant="assignment" file="enco-ini.mkiv"> + <cd:command name="periods" variant="assignment" level="document" category="symbols" file="enco-ini.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupperiods"/> @@ -38,6 +38,6 @@ </cd:arguments> </cd:command> - <cd:command name="unknown" file="enco-ini.mkiv"/> + <cd:command name="unknown" level="document" category="symbols" file="enco-ini.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-phantom.xml b/tex/context/interface/mkiv/i-phantom.xml index e3f92b810..8458be67b 100644 --- a/tex/context/interface/mkiv/i-phantom.xml +++ b/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" file="supp-box.mkiv"> + <cd:command name="phantom" level="style" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hphantom" file="supp-box.mkiv"> + <cd:command name="hphantom" level="style" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vphantom" file="supp-box.mkiv"> + <cd:command name="vphantom" level="style" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="phantombox" file="pack-box.mkiv"> + <cd:command name="phantombox" level="style" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -38,4 +38,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-placement.xml b/tex/context/interface/mkiv/i-placement.xml index 958ffaa6f..665d9aeb8 100644 --- a/tex/context/interface/mkiv/i-placement.xml +++ b/tex/context/interface/mkiv/i-placement.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineplacement" file="pack-mis.mkiv"> + <cd:command name="defineplacement" level="style" category="layout" file="pack-mis.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="setupplacement" file="pack-mis.mkiv"> + <cd:command name="setupplacement" level="style" category="layout" file="pack-mis.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="placement" file="pack-mis.mkiv"> + <cd:command name="placement" level="style" category="layout" file="pack-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -60,7 +60,7 @@ </cd:arguments> </cd:command> - <cd:command name="placement" generated="yes" variant="example" file="pack-mis.mkiv"> + <cd:command name="placement" generated="yes" variant="example" level="style" category="layout" file="pack-mis.mkiv"> <cd:sequence> <cd:variable value="placement"/> </cd:sequence> @@ -72,4 +72,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-position.xml b/tex/context/interface/mkiv/i-position.xml index e43ee58ef..b9f4b3780 100644 --- a/tex/context/interface/mkiv/i-position.xml +++ b/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" file="anch-pgr.mkiv"> + <cd:command name="doifpositionaction" level="system" category="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" file="anch-pgr.mkiv"> + <cd:command name="doifelsepositionaction" level="system" category="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" file="anch-pgr.mkiv"> + <cd:command name="doifpositionactionelse" level="system" category="conditional" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -28,45 +28,45 @@ </cd:arguments> </cd:command> - <cd:command name="dopositionaction" file="anch-pgr.mkiv"> + <cd:command name="dopositionaction" level="system" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="positionoverlay" file="anch-pgr.mkiv"> + <cd:command name="positionoverlay" level="system" category="background" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPoverlayanchor" file="anch-pgr.mkiv"> + <cd:command name="MPoverlayanchor" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="positionregionoverlay" file="anch-pgr.mkiv"> + <cd:command name="positionregionoverlay" level="system" category="background" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="positionoverlay" type="environment" file="anch-pgr.mkiv"> + <cd:command name="positionoverlay" type="environment" level="system" category="background" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPpositiongraphic" type="environment" file="anch-pgr.mkiv"> + <cd:command name="MPpositiongraphic" type="environment" level="system" category="background 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" file="anch-pgr.mkiv"> + <cd:command name="MPpositiongraphic" level="system" category="background 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" file="anch-pgr.mkiv"> + <cd:command name="MPpositionmethod" type="environment" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setMPpositiongraphic" file="anch-pgr.mkiv"> + <cd:command name="setMPpositiongraphic" level="system" category="background 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" file="anch-pgr.mkiv"> + <cd:command name="setMPpositiongraphicrange" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -108,190 +108,190 @@ </cd:arguments> </cd:command> - <cd:command name="MPgetposboxes" file="anch-pgr.mkiv"> + <cd:command name="MPgetposboxes" level="system" category="background 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" file="anch-pgr.mkiv"> + <cd:command name="MPgetmultipars" level="system" category="background 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" file="anch-pgr.mkiv"> + <cd:command name="MPgetmultishape" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPp" file="anch-pos.mkiv"> + <cd:command name="MPp" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPr" file="anch-pos.mkiv"> + <cd:command name="MPr" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPc" file="anch-pos.mkiv"> + <cd:command name="MPc" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPn" file="anch-pos.mkiv"> + <cd:command name="MPn" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPx" file="anch-pos.mkiv"> + <cd:command name="MPx" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPy" file="anch-pos.mkiv"> + <cd:command name="MPy" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPw" file="anch-pos.mkiv"> + <cd:command name="MPw" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPh" file="anch-pos.mkiv"> + <cd:command name="MPh" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPd" file="anch-pos.mkiv"> + <cd:command name="MPd" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPwhd" file="anch-pos.mkiv"> + <cd:command name="MPwhd" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPxy" file="anch-pos.mkiv"> + <cd:command name="MPxy" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPll" file="anch-pos.mkiv"> + <cd:command name="MPll" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPlr" file="anch-pos.mkiv"> + <cd:command name="MPlr" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPur" file="anch-pos.mkiv"> + <cd:command name="MPur" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPul" file="anch-pos.mkiv"> + <cd:command name="MPul" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPpos" file="anch-pos.mkiv"> + <cd:command name="MPpos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPls" file="anch-pos.mkiv"> + <cd:command name="MPls" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPrs" file="anch-pos.mkiv"> + <cd:command name="MPrs" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPpardata" file="anch-pos.mkiv"> + <cd:command name="MPpardata" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPxywhd" file="anch-pos.mkiv"> + <cd:command name="MPxywhd" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPposset" file="anch-pos.mkiv"> + <cd:command name="MPposset" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPpage" file="anch-pos.mkiv"> + <cd:command name="MPpage" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPregion" file="anch-pos.mkiv"> + <cd:command name="MPregion" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPcolumn" file="anch-pos.mkiv"> + <cd:command name="MPcolumn" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPanchor" file="anch-pos.mkiv"> + <cd:command name="MPanchor" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPleftskip" file="anch-pos.mkiv"> + <cd:command name="MPleftskip" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPrightskip" file="anch-pos.mkiv"> + <cd:command name="MPrightskip" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPplus" file="anch-pos.mkiv"> + <cd:command name="MPplus" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -299,7 +299,7 @@ </cd:arguments> </cd:command> - <cd:command name="MPv" file="anch-pos.mkiv"> + <cd:command name="MPv" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -307,33 +307,33 @@ </cd:arguments> </cd:command> - <cd:command name="MPrest" file="anch-pos.mkiv"> + <cd:command name="MPrest" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPvv" file="anch-pos.mkiv"> + <cd:command name="MPvv" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setpositiononly" file="anch-pos.mkiv"> + <cd:command name="setpositiononly" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setposition" file="anch-pos.mkiv"> + <cd:command name="setposition" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setpositiondata" file="anch-pos.mkiv"> + <cd:command name="setpositiondata" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> @@ -342,7 +342,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpositionbox" file="anch-pos.mkiv"> + <cd:command name="setpositionbox" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> @@ -350,13 +350,13 @@ </cd:arguments> </cd:command> - <cd:command name="setpositionstrut" file="anch-pos.mkiv"> + <cd:command name="setpositionstrut" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setpositiondataplus" file="anch-pos.mkiv"> + <cd:command name="setpositiondataplus" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> @@ -368,7 +368,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpositionplus" file="anch-pos.mkiv"> + <cd:command name="setpositionplus" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces" list="yes"> @@ -379,14 +379,14 @@ </cd:arguments> </cd:command> - <cd:command name="copyposition" file="anch-pos.mkiv"> + <cd:command name="copyposition" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifposition" file="anch-pos.mkiv"> + <cd:command name="doifposition" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifelseposition" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifpositionelse" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifelsepositiononpage" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifpositiononpageelse" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -428,46 +428,46 @@ </cd:arguments> </cd:command> - <cd:command name="xypos" file="anch-pos.mkiv"> + <cd:command name="xypos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="hpos" file="anch-pos.mkiv"> + <cd:command name="hpos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vpos" file="anch-pos.mkiv"> + <cd:command name="vpos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bpos" file="anch-pos.mkiv"> + <cd:command name="bpos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="epos" file="anch-pos.mkiv"> + <cd:command name="epos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="tracepositions" file="anch-pos.mkiv"/> + <cd:command name="tracepositions" level="system" file="anch-pos.mkiv"/> - <cd:command name="enableparpositions" file="anch-pos.mkiv"/> + <cd:command name="enableparpositions" level="system" file="anch-pos.mkiv"/> - <cd:command name="disableparpositions" file="anch-pos.mkiv"/> + <cd:command name="disableparpositions" level="system" file="anch-pos.mkiv"/> - <cd:command name="doifelseoverlapping" file="anch-pos.mkiv"> + <cd:command name="doifelseoverlapping" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifoverlappingelse" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsonsamepage" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifpositionsonsamepageelse" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsonthispage" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifpositionsonthispageelse" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsused" level="system" category="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" file="anch-pos.mkiv"> + <cd:command name="doifpositionsusedelse" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-positionbar.xml b/tex/context/interface/mkiv/i-positionbar.xml index 481540691..286466bef 100644 --- a/tex/context/interface/mkiv/i-positionbar.xml +++ b/tex/context/interface/mkiv/i-positionbar.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuppositionbar" file="pack-bar.mkiv"> + <cd:command name="setuppositionbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="horizontalpositionbar" file="pack-bar.mkiv"> + <cd:command name="horizontalpositionbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="verticalpositionbar" file="pack-bar.mkiv"> + <cd:command name="verticalpositionbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="horizontalgrowingbar" file="pack-bar.mkiv"> + <cd:command name="horizontalgrowingbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="verticalgrowingbar" file="pack-bar.mkiv"> + <cd:command name="verticalgrowingbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -70,4 +70,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-positioning.xml b/tex/context/interface/mkiv/i-positioning.xml index 98898c7cc..9d873fd46 100644 --- a/tex/context/interface/mkiv/i-positioning.xml +++ b/tex/context/interface/mkiv/i-positioning.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepositioning" file="pack-pos.mkiv"> + <cd:command name="definepositioning" level="style" category="graphics" file="pack-pos.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="setuppositioning" file="pack-pos.mkiv"> + <cd:command name="setuppositioning" level="style" category="graphics" file="pack-pos.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -76,7 +76,7 @@ </cd:arguments> </cd:command> - <cd:command name="positioning" type="environment" file="pack-pos.mkiv"> + <cd:command name="positioning" type="environment" level="document" category="graphics" file="pack-pos.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -85,7 +85,7 @@ </cd:arguments> </cd:command> - <cd:command name="position" file="pack-pos.mkiv"> + <cd:command name="position" level="document" category="graphics" file="pack-pos.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppositioning"/> @@ -95,4 +95,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-postponing.xml b/tex/context/interface/mkiv/i-postponing.xml index 619a77552..0d4c98d7a 100644 --- a/tex/context/interface/mkiv/i-postponing.xml +++ b/tex/context/interface/mkiv/i-postponing.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="postponing" type="environment" file="page-pst.mkiv"> + <cd:command name="postponing" type="environment" level="document" category="structure" file="page-pst.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number" prefix="cd:sign" method="none"/> @@ -12,4 +12,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-processor.xml b/tex/context/interface/mkiv/i-processor.xml index 0c313c77a..7e23c6631 100644 --- a/tex/context/interface/mkiv/i-processor.xml +++ b/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" file="typo-prc.mkvi"> + <cd:command name="defineprocessor" level="style" category="fonts 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" file="typo-prc.mkvi"> + <cd:command name="setupprocessor" level="style" category="fonts 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" file="typo-prc.mkvi"> + <cd:command name="applyprocessor" level="system" category="fonts colors" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-profile.xml b/tex/context/interface/mkiv/i-profile.xml index a3fe7ea6e..acc486cb7 100644 --- a/tex/context/interface/mkiv/i-profile.xml +++ b/tex/context/interface/mkiv/i-profile.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineprofile" file="spac-prf.mkvi"> + <cd:command name="defineprofile" level="style" category="pdf" file="spac-prf.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="setupprofile" file="spac-prf.mkvi"> + <cd:command name="setupprofile" level="style" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="setprofile" file="spac-prf.mkvi"> + <cd:command name="setprofile" level="system" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="none"/> @@ -56,15 +56,15 @@ </cd:arguments> </cd:command> - <cd:command name="resetprofile" file="spac-prf.mkvi"/> + <cd:command name="resetprofile" level="system" category="pdf" file="spac-prf.mkvi"/> - <cd:command name="useprofileparameter" file="spac-prf.mkvi"> + <cd:command name="useprofileparameter" level="system" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="profiledbox" file="spac-prf.mkvi"> + <cd:command name="profiledbox" level="system" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="none"/> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="profilegivenbox" file="spac-prf.mkvi"> + <cd:command name="profilegivenbox" level="system" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="none"/> @@ -97,4 +97,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-publication.xml b/tex/context/interface/mkiv/i-publication.xml index 83cb6c2c8..b6280047a 100644 --- a/tex/context/interface/mkiv/i-publication.xml +++ b/tex/context/interface/mkiv/i-publication.xml @@ -4,25 +4,25 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="btxrenderingdefinitions" type="environment" file="publ-ini.mkiv"> + <cd:command name="btxrenderingdefinitions" type="environment" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="loadbtxdefinitionfile" file="publ-ini.mkiv"> + <cd:command name="loadbtxdefinitionfile" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadbtxreplacementfile" file="publ-ini.mkiv"> + <cd:command name="loadbtxreplacementfile" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="definebtx" file="publ-ini.mkiv"> + <cd:command name="definebtx" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtx" file="publ-ini.mkiv"> + <cd:command name="setupbtx" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -77,6 +77,9 @@ <cd:parameter name="interaction"> <cd:constant type="start" default="yes"/> <cd:constant type="stop"/> + <cd:constant type="number"/> + <cd:constant type="text"/> + <cd:constant type="page"/> <cd:constant type="all"/> </cd:parameter> <cd:parameter name="alternative"> @@ -114,19 +117,19 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtx" variant="name" file="publ-ini.mkiv"> + <cd:command name="setupbtx" variant="name" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usingbtxspecification" type="environment" file="publ-ini.mkiv"> + <cd:command name="usingbtxspecification" type="environment" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definebtxdataset" file="publ-ini.mkiv"> + <cd:command name="definebtxdataset" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -136,7 +139,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxdataset" file="publ-ini.mkiv"> + <cd:command name="setupbtxdataset" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -147,7 +150,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebtxregister" file="publ-ini.mkiv"> + <cd:command name="definebtxregister" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -157,7 +160,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxregister" file="publ-ini.mkiv"> + <cd:command name="setupbtxregister" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -194,7 +197,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebtxrendering" file="publ-ini.mkiv"> + <cd:command name="definebtxrendering" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -204,7 +207,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxrendering" file="publ-ini.mkiv"> + <cd:command name="setupbtxrendering" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -226,6 +229,9 @@ <cd:constant type="all"/> <cd:constant type="none"/> </cd:parameter> + <cd:parameter name="filter"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="specification"> <cd:constant type="cd:name"/> </cd:parameter> @@ -293,7 +299,7 @@ </cd:arguments> </cd:command> - <cd:command name="usebtxdataset" file="publ-ini.mkiv"> + <cd:command name="usebtxdataset" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-file"/> @@ -305,7 +311,7 @@ </cd:arguments> </cd:command> - <cd:command name="publication" type="environment" file="publ-ini.mkiv"> + <cd:command name="publication" type="environment" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -325,7 +331,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxlist" file="publ-ini.mkiv"> + <cd:command name="setupbtxlist" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -334,7 +340,7 @@ </cd:arguments> </cd:command> - <cd:command name="completebtxrendering" file="publ-ini.mkiv"> + <cd:command name="completebtxrendering" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -343,7 +349,7 @@ </cd:arguments> </cd:command> - <cd:command name="placebtxrendering" file="publ-ini.mkiv"> + <cd:command name="placebtxrendering" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -352,7 +358,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofpublications" file="publ-ini.mkiv"> + <cd:command name="completelistofpublications" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -361,7 +367,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofpublications" file="publ-ini.mkiv"> + <cd:command name="placelistofpublications" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -370,319 +376,331 @@ </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="userdata" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="alternative" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" variant="direct" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="direct" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxlistcitation" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxlistcitation" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" variant="userdata" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxlistcitation" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" variant="alternative" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxtextcitation" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxtextcitation" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" variant="userdata" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxtextcitation" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" variant="alternative" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxalwayscitation" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxalwayscitation" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" variant="userdata" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxalwayscitation" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" variant="alternative" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="bthiddencitation" file="publ-ini.mkiv"> + <cd:command name="btxhiddencitation" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcitation" file="publ-ini.mkiv"> + <cd:command name="listcitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcitation" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="listcitation" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="listcitation" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="listcitation" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcite" file="publ-ini.mkiv"> + <cd:command name="listcite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcite" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="listcite" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="listcite" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="listcite" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="textcitation" file="publ-ini.mkiv"> + <cd:command name="textcitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="textcitation" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="textcitation" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="textcitation" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="textcitation" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="textcite" file="publ-ini.mkiv"> + <cd:command name="textcite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="textcite" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="textcite" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="textcite" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="textcite" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="alwayscitation" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="alwayscitation" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="alwayscitation" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="alwayscite" file="publ-ini.mkiv"> + <cd:command name="alwayscite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="alwayscite" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="alwayscite" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="alwayscite" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="alwayscite" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="hiddencitation" file="publ-ini.mkiv"> + <cd:command name="hiddencitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="hiddencite" file="publ-ini.mkiv"> + <cd:command name="hiddencite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="citation" file="publ-ini.mkiv"> + <cd:command name="citation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="citation" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="citation" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="citation" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="citation" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="citation" variant="direct" file="publ-ini.mkiv"> + <cd:command name="citation" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="cite" file="publ-ini.mkiv"> + <cd:command name="cite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="cite" variant="userdata" file="publ-ini.mkiv"> + <cd:command name="cite" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="cite" variant="alternative" file="publ-ini.mkiv"> + <cd:command name="cite" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="cite" variant="direct" file="publ-ini.mkiv"> + <cd:command name="cite" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-reference"/> + </cd:arguments> + </cd:command> + + <cd:command name="nocitation" level="document" category="bibliography" file="publ-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-reference"/> + </cd:arguments> + </cd:command> + + <cd:command name="nocitation" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocitation" file="publ-ini.mkiv"> + <cd:command name="usecitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocitation" variant="direct" file="publ-ini.mkiv"> + <cd:command name="usecitation" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocite" file="publ-ini.mkiv"> + <cd:command name="nocite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocite" variant="direct" file="publ-ini.mkiv"> + <cd:command name="nocite" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="savebtxdataset" file="publ-ini.mkiv"> + <cd:command name="savebtxdataset" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-file-optional"/> @@ -717,67 +735,67 @@ </cd:arguments> </cd:command> - <cd:command name="placecitation" file="publ-ini.mkiv"> + <cd:command name="placecitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="usebtxdefinitions" file="publ-ini.mkiv"> + <cd:command name="usebtxdefinitions" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxfield" file="publ-ini.mkiv"> + <cd:command name="btxfield" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxdetail" file="publ-ini.mkiv"> + <cd:command name="btxdetail" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxflush" file="publ-ini.mkiv"> + <cd:command name="btxflush" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxdirect" file="publ-ini.mkiv"> + <cd:command name="btxdirect" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfieldname" file="publ-ini.mkiv"> + <cd:command name="btxfieldname" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfieldtype" file="publ-ini.mkiv"> + <cd:command name="btxfieldtype" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfoundname" file="publ-ini.mkiv"> + <cd:command name="btxfoundname" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfoundtype" file="publ-ini.mkiv"> + <cd:command name="btxfoundtype" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxauthorfield" file="publ-ini.mkiv"> + <cd:command name="btxauthorfield" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="initials"/> @@ -789,7 +807,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelse" file="publ-ini.mkiv"> + <cd:command name="btxdoifelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -797,27 +815,27 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoif" file="publ-ini.mkiv"> + <cd:command name="btxdoif" level="system" category="bibliography 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" file="publ-ini.mkiv"> + <cd:command name="btxdoifnot" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="btxsetup" file="publ-ini.mkiv"> + <cd:command name="btxsetup" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifelsesameaspreviouschecked" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsesameaspreviouschecked" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -829,7 +847,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsesameasprevious" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsesameasprevious" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -837,7 +855,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsecombiinlist" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsecombiinlist" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -846,7 +864,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifsameaspreviouscheckedelse" file="publ-ini.mkiv"> + <cd:command name="btxdoifsameaspreviouscheckedelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -858,7 +876,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifsameaspreviouselse" file="publ-ini.mkiv"> + <cd:command name="btxdoifsameaspreviouselse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -866,7 +884,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifcombiinlistelse" file="publ-ini.mkiv"> + <cd:command name="btxdoifcombiinlistelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -875,13 +893,13 @@ </cd:arguments> </cd:command> - <cd:command name="currentbtxuservariable" file="publ-ini.mkiv"> + <cd:command name="currentbtxuservariable" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifelseuservariable" file="publ-ini.mkiv"> + <cd:command name="btxdoifelseuservariable" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -889,7 +907,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifuservariableelse" file="publ-ini.mkiv"> + <cd:command name="btxdoifuservariableelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -897,14 +915,14 @@ </cd:arguments> </cd:command> - <cd:command name="btxremapauthor" file="publ-ini.mkiv"> + <cd:command name="btxremapauthor" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthor" file="publ-ini.mkiv"> + <cd:command name="btxflushauthor" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="num"/> @@ -917,39 +935,39 @@ </cd:arguments> </cd:command> - <cd:command name="btxflushsuffix" file="publ-ini.mkiv"/> + <cd:command name="btxflushsuffix" level="system" category="bibliography" file="publ-ini.mkiv"/> - <cd:command name="btxflushauthorname" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorname" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthornormal" file="publ-ini.mkiv"> + <cd:command name="btxflushauthornormal" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthornormalshort" file="publ-ini.mkiv"> + <cd:command name="btxflushauthornormalshort" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthorinverted" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorinverted" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthorinvertedshort" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorinvertedshort" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxsingularplural" file="publ-ini.mkiv"> + <cd:command name="btxsingularplural" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -961,7 +979,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxsingularorplural" file="publ-ini.mkiv"> + <cd:command name="btxsingularorplural" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -973,7 +991,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxoneorrange" file="publ-ini.mkiv"> + <cd:command name="btxoneorrange" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -984,7 +1002,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxfirstofrange" file="publ-ini.mkiv"> + <cd:command name="btxfirstofrange" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -993,38 +1011,38 @@ </cd:arguments> </cd:command> - <cd:command name="btxloadjournalist" file="publ-ini.mkiv"> + <cd:command name="btxloadjournalist" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxsavejournalist" file="publ-ini.mkiv"> + <cd:command name="btxsavejournalist" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxaddjournal" file="publ-ini.mkiv"> + <cd:command name="btxaddjournal" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="btxexpandedjournal" file="publ-ini.mkiv"> + <cd:command name="btxexpandedjournal" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="btxabbreviatedjournal" file="publ-ini.mkiv"> + <cd:command name="btxabbreviatedjournal" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetfields" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetfields" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1040,13 +1058,13 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetfields" variant="argument" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetfields" variant="argument" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetcompleteness" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetcompleteness" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1062,13 +1080,13 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetcompleteness" variant="argument" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetcompleteness" variant="argument" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetauthors" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetauthors" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1084,19 +1102,19 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetauthors" variant="argument" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetauthors" variant="argument" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxhashedauthors" file="publ-tra.mkiv"> + <cd:command name="showbtxhashedauthors" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxfields" file="publ-tra.mkiv"> + <cd:command name="showbtxfields" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="rotation"> @@ -1109,16 +1127,16 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxfields" variant="argument" file="publ-tra.mkiv"> + <cd:command name="showbtxfields" variant="argument" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxtables" file="publ-tra.mkiv"> + <cd:command name="showbtxtables" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-random.xml b/tex/context/interface/mkiv/i-random.xml index 54dc66c5f..a1a17f669 100644 --- a/tex/context/interface/mkiv/i-random.xml +++ b/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" file="supp-ran.mkiv"> + <cd:command name="getrandomcount" level="system" 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" file="supp-ran.mkiv"> + <cd:command name="getrandomdimen" level="system" 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" file="supp-ran.mkiv"> + <cd:command name="getrandomnumber" level="system" 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" file="supp-ran.mkiv"> + <cd:command name="getrandomfloat" level="system" 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" file="supp-ran.mkiv"> + <cd:command name="setrandomseed" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="getrandomseed" file="supp-ran.mkiv"> + <cd:command name="getrandomseed" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="randomseed" type="environment" begin="push" end="pop" file="supp-ran.mkiv"/> + <cd:command name="randomseed" type="environment" begin="push" end="pop" level="system" file="supp-ran.mkiv"/> - <cd:command name="reuserandomseed" file="supp-ran.mkiv"/> + <cd:command name="reuserandomseed" level="system" file="supp-ran.mkiv"/> - <cd:command name="randomnumber" file="supp-ran.mkiv"> + <cd:command name="randomnumber" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="mprandomnumber" file="supp-ran.mkiv"/> + <cd:command name="mprandomnumber" level="system" file="supp-ran.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex daf6f6248..14862cbb6 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/context/interface/mkiv/i-references.xml b/tex/context/interface/mkiv/i-references.xml index e7a713796..1e3e3466d 100644 --- a/tex/context/interface/mkiv/i-references.xml +++ b/tex/context/interface/mkiv/i-references.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupreferencing" file="strc-ref.mkvi"> + <cd:command name="setupreferencing" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -53,40 +53,40 @@ </cd:arguments> </cd:command> - <cd:command name="textreference" file="strc-ref.mkvi"> + <cd:command name="textreference" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pagereference" file="strc-ref.mkvi"> + <cd:command name="pagereference" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> </cd:arguments> </cd:command> - <cd:command name="reference" file="strc-ref.mkvi"> + <cd:command name="reference" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setreference" file="strc-ref.mkvi"> + <cd:command name="setreference" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="usereferenceparameter" file="strc-ref.mkvi"> + <cd:command name="usereferenceparameter" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="boxreference" file="strc-ref.mkvi"> + <cd:command name="boxreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:csname/> @@ -94,21 +94,21 @@ </cd:arguments> </cd:command> - <cd:command name="hboxreference" file="strc-ref.mkvi"> + <cd:command name="hboxreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vboxreference" file="strc-ref.mkvi"> + <cd:command name="vboxreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="contentreference" file="strc-ref.mkvi"> + <cd:command name="contentreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:assignments list="yes" optional="yes"> @@ -118,27 +118,27 @@ </cd:arguments> </cd:command> - <cd:command name="definereference" file="strc-ref.mkvi"> + <cd:command name="definereference" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list"/> </cd:arguments> </cd:command> - <cd:command name="resetreference" file="strc-ref.mkvi"> + <cd:command name="resetreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setpagereference" file="strc-ref.mkvi"> + <cd:command name="setpagereference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-reference-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsereferencefound" file="strc-ref.mkvi"> + <cd:command name="doifelsereferencefound" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -146,7 +146,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifreferencefoundelse" file="strc-ref.mkvi"> + <cd:command name="doifreferencefoundelse" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -154,7 +154,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupreferenceprefix" file="strc-ref.mkvi"> + <cd:command name="setupreferenceprefix" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords> <cd:resolve name="value-referenceprefix"/> @@ -162,7 +162,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupglobalreferenceprefix" file="strc-ref.mkvi"> + <cd:command name="setupglobalreferenceprefix" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords> <cd:resolve name="value-referenceprefix"/> @@ -170,7 +170,7 @@ </cd:arguments> </cd:command> - <cd:command name="referenceprefix" type="environment" begin="push" end="pop" file="strc-ref.mkvi"> + <cd:command name="referenceprefix" type="environment" begin="push" end="pop" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-referenceprefix"/> @@ -178,7 +178,7 @@ </cd:arguments> </cd:command> - <cd:command name="referenceprefix" type="environment" begin="globalpush" end="globalpop" file="strc-ref.mkvi"> + <cd:command name="referenceprefix" type="environment" begin="globalpush" end="globalpop" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-referenceprefix"/> @@ -186,9 +186,9 @@ </cd:arguments> </cd:command> - <cd:command name="referenceprefix" file="strc-ref.mkvi"/> + <cd:command name="referenceprefix" level="system" category="references" file="strc-ref.mkvi"/> - <cd:command name="in" file="strc-ref.mkvi"> + <cd:command name="in" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text-optional"/> <cd:resolve name="argument-text-optional"/> @@ -196,7 +196,7 @@ </cd:arguments> </cd:command> - <cd:command name="at" file="strc-ref.mkvi"> + <cd:command name="at" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text-optional"/> <cd:resolve name="argument-text-optional"/> @@ -204,25 +204,25 @@ </cd:arguments> </cd:command> - <cd:command name="about" file="strc-ref.mkvi"> + <cd:command name="about" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="from" file="strc-ref.mkvi"> + <cd:command name="from" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="over" file="strc-ref.mkvi"> + <cd:command name="over" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="filterreference" file="strc-ref.mkvi"> + <cd:command name="filterreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-referencetype"/> @@ -230,7 +230,7 @@ </cd:arguments> </cd:command> - <cd:command name="getreferenceentry" file="strc-ref.mkvi"> + <cd:command name="getreferenceentry" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-referencetype"/> @@ -238,7 +238,7 @@ </cd:arguments> </cd:command> - <cd:command name="getreference" file="strc-ref.mkvi"> + <cd:command name="getreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords> <cd:resolve name="value-referencetype"/> @@ -247,7 +247,7 @@ </cd:arguments> </cd:command> - <cd:command name="ref" file="strc-ref.mkvi"> + <cd:command name="ref" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords> <cd:resolve name="value-referencetype"/> @@ -256,7 +256,7 @@ </cd:arguments> </cd:command> - <cd:command name="somewhere" file="strc-ref.mkvi"> + <cd:command name="somewhere" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -264,7 +264,7 @@ </cd:arguments> </cd:command> - <cd:command name="docheckedpagestate" file="strc-ref.mkvi"> + <cd:command name="docheckedpagestate" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-command"/> @@ -276,7 +276,7 @@ </cd:arguments> </cd:command> - <cd:command name="someplace" file="strc-ref.mkvi"> + <cd:command name="someplace" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -287,19 +287,19 @@ </cd:arguments> </cd:command> - <cd:command name="atpage" file="strc-ref.mkvi"> + <cd:command name="atpage" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="symbolreference" file="strc-ref.mkvi"> + <cd:command name="symbolreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="definereferenceformat" file="strc-ref.mkvi"> + <cd:command name="definereferenceformat" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -309,7 +309,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupreferenceformat" file="strc-ref.mkvi"> + <cd:command name="setupreferenceformat" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -346,7 +346,7 @@ </cd:arguments> </cd:command> - <cd:command name="referenceformat" generated="yes" variant="example" file="strc-ref.mkvi"> + <cd:command name="referenceformat" generated="yes" variant="example" level="document" category="references" file="strc-ref.mkvi"> <cd:sequence> <cd:variable value="referenceformat"/> </cd:sequence> @@ -357,27 +357,27 @@ </cd:arguments> </cd:command> - <cd:command name="goto" file="strc-ref.mkvi"> + <cd:command name="goto" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:content/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="goto" type="environment" file="strc-ref.mkvi"> + <cd:command name="goto" type="environment" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="gotobox" file="strc-ref.mkvi"> + <cd:command name="gotobox" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:content/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="useurl" file="strc-ref.mkvi"> + <cd:command name="useurl" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-url"/> @@ -386,7 +386,7 @@ </cd:arguments> </cd:command> - <cd:command name="useURL" file="strc-ref.mkvi"> + <cd:command name="useURL" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-url"/> @@ -395,7 +395,7 @@ </cd:arguments> </cd:command> - <cd:command name="usefile" file="strc-ref.mkvi"> + <cd:command name="usefile" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -403,7 +403,7 @@ </cd:arguments> </cd:command> - <cd:command name="useexternaldocument" file="strc-ref.mkvi"> + <cd:command name="useexternaldocument" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -411,7 +411,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseurldefined" file="strc-ref.mkvi"> + <cd:command name="doifelseurldefined" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -419,7 +419,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifurldefinedelse" file="strc-ref.mkvi"> + <cd:command name="doifurldefinedelse" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -427,7 +427,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefiledefined" file="strc-ref.mkvi"> + <cd:command name="doifelsefiledefined" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -435,7 +435,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffiledefinedelse" file="strc-ref.mkvi"> + <cd:command name="doiffiledefinedelse" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -443,7 +443,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupurl" file="strc-ref.mkvi"> + <cd:command name="setupurl" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -456,13 +456,13 @@ </cd:arguments> </cd:command> - <cd:command name="url" file="strc-ref.mkvi"> + <cd:command name="url" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="defineprogram" file="strc-ref.mkvi"> + <cd:command name="defineprogram" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> @@ -470,7 +470,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupprograms" file="strc-ref.mkvi"> + <cd:command name="setupprograms" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -483,27 +483,27 @@ </cd:arguments> </cd:command> - <cd:command name="program" file="strc-ref.mkvi"> + <cd:command name="program" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definepage" file="strc-ref.mkvi"> + <cd:command name="definepage" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="gotopage" file="strc-ref.mkvi"> + <cd:command name="gotopage" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="setupreferencestructureprefix" file="strc-ref.mkvi"> + <cd:command name="setupreferencestructureprefix" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -563,4 +563,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-regime.xml b/tex/context/interface/mkiv/i-regime.xml index cd0374023..e126abb65 100644 --- a/tex/context/interface/mkiv/i-regime.xml +++ b/tex/context/interface/mkiv/i-regime.xml @@ -4,11 +4,11 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="currentregime" file="regi-ini.mkiv"/> + <cd:command name="currentregime" level="system" category="language" file="regi-ini.mkiv"/> - <cd:command name="disableregime" file="regi-ini.mkiv"/> + <cd:command name="disableregime" level="system" category="language" file="regi-ini.mkiv"/> - <cd:command name="enableregime" file="regi-ini.mkiv"> + <cd:command name="enableregime" level="style" category="language" file="regi-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cp1250"/> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="regime" type="environment" file="regi-ini.mkiv"> + <cd:command name="regime" type="environment" level="system" category="language" file="regi-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:inherit name="enableregime"/> @@ -85,4 +85,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml index e13b009ea..4d8010559 100644 --- a/tex/context/interface/mkiv/i-register.xml +++ b/tex/context/interface/mkiv/i-register.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineregister" file="strc-reg.mkiv"> + <cd:command name="defineregister" level="style" category="structure" file="strc-reg.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="setupregister" variant="argument" file="strc-reg.mkiv"> + <cd:command name="setupregister" variant="argument" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-number-list-optional"/> @@ -47,6 +47,7 @@ <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> <cd:constant type="all"/> + <cd:constant type="packed"/> </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> @@ -178,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregister" file="strc-reg.mkiv"> + <cd:command name="setupregister" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -344,7 +345,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregisters" variant="argument" file="strc-reg.mkiv"> + <cd:command name="setupregisters" variant="argument" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-number-list-optional"/> @@ -354,7 +355,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregisters" file="strc-reg.mkiv"> + <cd:command name="setupregisters" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -366,7 +367,7 @@ </cd:arguments> </cd:command> - <cd:command name="register" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="register" generated="yes" variant="instance" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -382,7 +383,7 @@ </cd:instances> </cd:command> - <cd:command name="register" generated="yes" variant="instance:ownnumber" file="strc-reg.mkiv"> + <cd:command name="register" generated="yes" variant="instance:ownnumber" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -399,7 +400,7 @@ </cd:instances> </cd:command> - <cd:command name="seeregister" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="seeregister" generated="yes" variant="instance" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="see"/> <cd:instance value="register"/> @@ -420,7 +421,7 @@ </cd:instances> </cd:command> - <cd:command name="placeregister" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="placeregister" generated="yes" variant="instance" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="place"/> <cd:instance value="register"/> @@ -435,7 +436,7 @@ </cd:instances> </cd:command> - <cd:command name="completeregister" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="completeregister" generated="yes" variant="instance" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="register"/> @@ -450,7 +451,7 @@ </cd:instances> </cd:command> - <cd:command name="setupregister" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="setupregister" generated="yes" variant="instance" level="style" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="register"/> @@ -468,7 +469,7 @@ <!-- - <cd:command name="index" file="strc-reg.mkiv"> + <cd:command name="index" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -478,7 +479,7 @@ </cd:arguments> </cd:command> - <cd:command name="index" variant="ownnumber" file="strc-reg.mkiv"> + <cd:command name="index" variant="ownnumber" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -489,7 +490,7 @@ </cd:arguments> </cd:command> - <cd:command name="seeindex" file="strc-reg.mkiv"> + <cd:command name="seeindex" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -503,7 +504,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeindex" file="strc-reg.mkiv"> + <cd:command name="placeindex" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupregister"/> @@ -511,7 +512,7 @@ </cd:arguments> </cd:command> - <cd:command name="completeindex" file="strc-reg.mkiv"> + <cd:command name="completeindex" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupregister"/> @@ -519,7 +520,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupindex" file="strc-reg.mkiv"> + <cd:command name="setupindex" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-list-optional"/> <cd:assignments list="yes"> @@ -530,7 +531,7 @@ --> - <cd:command name="startregister" file="strc-reg.mkiv"> + <cd:command name="startregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -545,14 +546,14 @@ </cd:arguments> </cd:command> - <cd:command name="stopregister" file="strc-reg.mkiv"> + <cd:command name="stopregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setregisterentry" file="strc-reg.mkiv"> + <cd:command name="setregisterentry" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-registerdata-list"/> @@ -560,7 +561,7 @@ </cd:arguments> </cd:command> - <cd:command name="finishregisterentry" file="strc-reg.mkiv"> + <cd:command name="finishregisterentry" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -583,7 +584,7 @@ </cd:arguments> </cd:command> - <cd:command name="setstructurepageregister" file="strc-reg.mkiv"> + <cd:command name="setstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-registerdata-list"/> @@ -591,7 +592,7 @@ </cd:arguments> </cd:command> - <cd:command name="startstructurepageregister" file="strc-reg.mkiv"> + <cd:command name="startstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -600,14 +601,14 @@ </cd:arguments> </cd:command> - <cd:command name="stopstructurepageregister" file="strc-reg.mkiv"> + <cd:command name="stopstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="determineregistercharacteristics" file="strc-reg.mkiv"> + <cd:command name="determineregistercharacteristics" level="system" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -637,9 +638,9 @@ </cd:arguments> </cd:command> - <cd:command name="utilityregisterlength" file="strc-reg.mkiv"/> + <cd:command name="utilityregisterlength" level="system" category="structure" file="strc-reg.mkiv"/> - <cd:command name="placeregister" file="strc-reg.mkiv"> + <cd:command name="placeregister" level="document" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -648,7 +649,7 @@ </cd:arguments> </cd:command> - <cd:command name="completeregister" file="strc-reg.mkiv"> + <cd:command name="completeregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -657,10 +658,10 @@ </cd:arguments> </cd:command> - <cd:command name="currentregisterpageuserdata" file="strc-reg.mkiv"> + <cd:command name="currentregisterpageuserdata" level="system" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-renderingwindow.xml b/tex/context/interface/mkiv/i-renderingwindow.xml index 219fda285..525415c70 100644 --- a/tex/context/interface/mkiv/i-renderingwindow.xml +++ b/tex/context/interface/mkiv/i-renderingwindow.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="useexternalrendering" file="scrn-wid.mkvi"> + <cd:command name="useexternalrendering" level="system" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -16,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="setinternalrendering" file="scrn-wid.mkvi"> + <cd:command name="setinternalrendering" level="system" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="definerenderingwindow" file="scrn-wid.mkvi"> + <cd:command name="definerenderingwindow" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuprenderingwindow" file="scrn-wid.mkvi"> + <cd:command name="setuprenderingwindow" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -52,11 +52,11 @@ </cd:arguments> </cd:command> - <cd:command name="placerenderingwindow" file="scrn-wid.mkvi"> + <cd:command name="placerenderingwindow" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-replacement.xml b/tex/context/interface/mkiv/i-replacement.xml index 95b6272e7..1cee232db 100644 --- a/tex/context/interface/mkiv/i-replacement.xml +++ b/tex/context/interface/mkiv/i-replacement.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="replaceword" file="lang-rep.mkiv"> + <cd:command name="replaceword" level="style" category="language" file="lang-rep.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="setreplacement" file="lang-rep.mkiv"> + <cd:command name="setreplacement" level="style" category="language" file="lang-rep.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -21,6 +21,6 @@ </cd:arguments> </cd:command> - <cd:command name="resetreplacement" file="lang-rep.mkiv"/> + <cd:command name="resetreplacement" level="style" category="language" file="lang-rep.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-rotatation.xml b/tex/context/interface/mkiv/i-rotatation.xml index 3e8eb6699..7bfb9b2de 100644 --- a/tex/context/interface/mkiv/i-rotatation.xml +++ b/tex/context/interface/mkiv/i-rotatation.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="mirror" file="grph-trf.mkiv"> + <cd:command name="mirror" level="document" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuprotate" file="grph-trf.mkiv"> + <cd:command name="setuprotate" level="style" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="rotate" file="grph-trf.mkiv"> + <cd:command name="rotate" level="document" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuprotate"/> @@ -43,7 +43,7 @@ </cd:arguments> </cd:command> - <cd:command name="dorotatebox" file="grph-trf.mkiv"> + <cd:command name="dorotatebox" level="system" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:csname/> @@ -51,4 +51,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-ruby.xml b/tex/context/interface/mkiv/i-ruby.xml index 698e4f24f..10bcff22e 100644 --- a/tex/context/interface/mkiv/i-ruby.xml +++ b/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" file="typo-rub.mkiv"> + <cd:command name="defineruby" level="style" category="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" file="typo-rub.mkiv"> + <cd:command name="setupruby" level="style" category="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="ruby" file="typo-rub.mkiv"> + <cd:command name="ruby" level="document" category="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -67,10 +67,10 @@ </cd:arguments> </cd:command> - <cd:command name="ruby" type="environment" file="typo-rub.mkiv"> + <cd:command name="ruby" type="environment" level="document" category="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-scale.xml b/tex/context/interface/mkiv/i-scale.xml index 135d6fba8..3d26ed76f 100644 --- a/tex/context/interface/mkiv/i-scale.xml +++ b/tex/context/interface/mkiv/i-scale.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definescale" file="grph-trf.mkiv"> + <cd:command name="definescale" level="style" category="graphics" file="grph-trf.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="setupscale" file="grph-trf.mkiv"> + <cd:command name="setupscale" level="style" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -93,7 +93,7 @@ </cd:arguments> </cd:command> - <cd:command name="scale" file="grph-trf.mkiv"> + <cd:command name="scale" level="document" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -103,14 +103,14 @@ </cd:arguments> </cd:command> - <cd:command name="fastscale" file="grph-trf.mkiv"> + <cd:command name="fastscale" level="system" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fastsxsy" file="grph-trf.mkiv"> + <cd:command name="fastsxsy" level="system" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -118,4 +118,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-scite.xml b/tex/context/interface/mkiv/i-scite.xml index e62bc9067..f04e575e0 100644 --- a/tex/context/interface/mkiv/i-scite.xml +++ b/tex/context/interface/mkiv/i-scite.xml @@ -4,19 +4,26 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="scite" type="environment" file="m-scite.mkiv"> + <cd:command name="scite" type="environment" level="document" category="verbatim" file="m-scite.mkiv"> <cd:arguments> <cd:resolve name="keyword-scite-optional"/> </cd:arguments> </cd:command> - <cd:command name="scitefile" file="m-scite.mkiv"> + <cd:command name="scitefile" level="document" category="verbatim" file="m-scite.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="scitebuffer" file="m-scite.mkiv"> + <cd:command name="scitebuffer" level="document" category="verbatim" file="m-scite.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-scite-optional"/> + <cd:resolve name="keyword-buffer"/> + </cd:arguments> + </cd:command> + + <cd:command name="sciteinlinebuffer" level="document" category="verbatim" file="m-scite.mkiv"> <cd:arguments> <cd:resolve name="keyword-scite-optional"/> <cd:resolve name="keyword-buffer"/> diff --git a/tex/context/interface/mkiv/i-script.xml b/tex/context/interface/mkiv/i-script.xml index 10ae6a79e..9af017492 100644 --- a/tex/context/interface/mkiv/i-script.xml +++ b/tex/context/interface/mkiv/i-script.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definescript" file="scrp-ini.mkvi"> + <cd:command name="definescript" level="style" category="language" file="scrp-ini.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="setupscript" file="scrp-ini.mkvi"> + <cd:command name="setupscript" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupscripts" file="scrp-ini.mkvi"> + <cd:command name="setupscripts" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="setscript" file="scrp-ini.mkvi"> + <cd:command name="setscript" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -59,9 +59,9 @@ </cd:arguments> </cd:command> - <cd:command name="resetscript" file="scrp-ini.mkvi"/> + <cd:command name="resetscript" level="system" category="language" file="scrp-ini.mkvi"/> - <cd:command name="script" type="environment" file="scrp-ini.mkvi"> + <cd:command name="script" type="environment" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="script" generated="yes" varianet="instance" file="scrp-ini.mkvi"> + <cd:command name="script" generated="yes" variant="instance" level="document" category="language" file="scrp-ini.mkvi"> <cd:sequence> <cd:instance value="script"/> </cd:sequence> @@ -86,20 +86,20 @@ <!-- - <cd:command name="hangul" file="scrp-ini.mkvi"/> + <cd:command name="hangul" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="hanzi" file="scrp-ini.mkvi"/> + <cd:command name="hanzi" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="nihongo" file="scrp-ini.mkvi"/> + <cd:command name="nihongo" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="ethiopic" file="scrp-ini.mkvi"/> + <cd:command name="ethiopic" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="thai" file="scrp-ini.mkvi"/> + <cd:command name="thai" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="latin" file="scrp-ini.mkvi"/> + <cd:command name="latin" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="test" file="scrp-ini.mkvi"/> + <cd:command name="test" level="document" category="language" file="scrp-ini.mkvi"/> --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-section.xml b/tex/context/interface/mkiv/i-section.xml index bcdc836af..f3cf13d3e 100644 --- a/tex/context/interface/mkiv/i-section.xml +++ b/tex/context/interface/mkiv/i-section.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehead" file="strc-sec.mkiv"> + <cd:command name="definehead" level="style" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-section-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphead" file="strc-sec.mkiv"> + <cd:command name="setuphead" level="style" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section-list-optional"/> <cd:assignments list="yes"> @@ -112,6 +112,7 @@ <cd:constant type="no"/> <cd:constant type="hidden"/> <cd:constant type="empty"/> + <cd:constant type="section"/> </cd:parameter> <cd:parameter name="number"> <cd:constant type="yes" default="yes"/> @@ -200,10 +201,6 @@ <cd:constant type="margintext"/> <cd:constant type="cd:name"/> </cd:parameter> - <cd:parameter name="location"> - <!-- optional margin location --> - <cd:constant type="cd:name"/> - </cd:parameter> <cd:parameter name="width"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -240,11 +237,20 @@ <cd:parameter name="deepnumbercommand"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="location"> + <!-- optional margin location --> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="strict"/> + <cd:constant type="positive"/> + <cd:constant type="all"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupheads" file="strc-sec.mkiv"> + <cd:command name="setupheads" level="style" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section-list-optional"/> <cd:assignments list="yes"> @@ -253,7 +259,7 @@ </cd:arguments> </cd:command> - <cd:command name="section" generated="yes" variant="instance" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance" level="document" category="structure" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -266,7 +272,7 @@ </cd:instances> </cd:command> - <cd:command name="section" generated="yes" variant="instance:ownnumber" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance:ownnumber" level="document" category="structure" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -280,7 +286,7 @@ </cd:instances> </cd:command> - <cd:command name="section" generated="yes" variant="instance:assignment" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance:assignment" level="document" category="structure" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -292,7 +298,7 @@ </cd:instances> </cd:command> - <cd:command name="section" type="environment" generated="yes" variant="instance" file="strc-sec.mkiv"> + <cd:command name="section" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -305,193 +311,7 @@ </cd:instances> </cd:command> - <!-- - - <cd:command name="part" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="chapter" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="section" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsection" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsection" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubsection" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubsubsection" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="title" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subject" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubject" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubject" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubsubject" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubsubsubject" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="part" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="chapter" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="section" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsection" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsection" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubsection" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubsubsection" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="title" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subject" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubject" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubject" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubsubject" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="subsubsubsubsubject" type="environment" file="strc-sec.mkiv"> - <cd:arguments> - <cd:resolve name="assignment-sectiondata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - --> - - <cd:command name="namedsection" type="environment" file="strc-sec.mkiv"> + <cd:command name="namedsection" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -499,25 +319,25 @@ </cd:arguments> </cd:command> - <cd:command name="definesection" file="strc-sec.mkiv"> + <cd:command name="definesection" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="placeheadtext" file="strc-sec.mkiv"> + <cd:command name="placeheadtext" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> </cd:arguments> </cd:command> - <cd:command name="placeheadnumber" file="strc-sec.mkiv"> + <cd:command name="placeheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> </cd:arguments> </cd:command> - <cd:command name="setupheadnumber" file="strc-sec.mkiv"> + <cd:command name="setupheadnumber" level="style" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:keywords> @@ -526,21 +346,21 @@ </cd:arguments> </cd:command> - <cd:command name="determineheadnumber" file="strc-sec.mkiv"> + <cd:command name="determineheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> </cd:arguments> </cd:command> - <cd:command name="currentheadnumber" file="strc-sec.mkiv"/> + <cd:command name="currentheadnumber" level="system" category="structure" file="strc-sec.mkiv"/> - <cd:command name="namedheadnumber" file="strc-sec.mkiv"> + <cd:command name="namedheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> </cd:arguments> </cd:command> - <cd:command name="somenamedheadnumber" file="strc-sec.mkiv"> + <cd:command name="somenamedheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> <cd:keywords delimiters="braces"> @@ -553,7 +373,7 @@ </cd:arguments> </cd:command> - <cd:command name="headnumber" file="strc-sec.mkiv"> + <cd:command name="headnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:keywords optional="yes"> @@ -566,7 +386,7 @@ </cd:arguments> </cd:command> - <cd:command name="someheadnumber" file="strc-sec.mkiv"> + <cd:command name="someheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:keywords> @@ -579,50 +399,50 @@ </cd:arguments> </cd:command> - <cd:command name="namedstructureheadlocation" file="strc-sec.mkiv"> + <cd:command name="namedstructureheadlocation" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> </cd:arguments> </cd:command> - <cd:command name="structurenumber" file="strc-sec.mkiv"/> + <cd:command name="structurenumber" level="system" category="structure" file="strc-sec.mkiv"/> - <cd:command name="structuretitle" file="strc-sec.mkiv"/> + <cd:command name="structuretitle" level="system" category="structure" file="strc-sec.mkiv"/> - <cd:command name="structurevariable" file="strc-sec.mkiv"> + <cd:command name="structurevariable" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="structureuservariable" file="strc-sec.mkiv"> + <cd:command name="structureuservariable" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="namedstructurevariable" file="strc-sec.mkiv"> + <cd:command name="namedstructurevariable" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="namedstructureuservariable" file="strc-sec.mkiv"> + <cd:command name="namedstructureuservariable" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="definesectionlevels" file="strc-lev.mkvi"> + <cd:command name="definesectionlevels" level="style" category="structure" file="strc-lev.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-section-list"/> </cd:arguments> </cd:command> - <cd:command name="sectionlevel" type="environment" file="strc-lev.mkvi"> + <cd:command name="sectionlevel" type="environment" level="document" category="structure" file="strc-lev.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -630,7 +450,7 @@ </cd:arguments> </cd:command> - <cd:command name="subjectlevel" type="environment" file="strc-lev.mkvi"> + <cd:command name="subjectlevel" type="environment" level="document" category="structure" file="strc-lev.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -638,7 +458,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineheadalternative" file="strc-ren.mkiv"> + <cd:command name="defineheadalternative" level="style" category="structure" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -648,7 +468,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupheadalternative" file="strc-ren.mkiv"> + <cd:command name="setupheadalternative" level="style" category="structure" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -664,38 +484,38 @@ </cd:arguments> </cd:command> - <cd:command name="localheadsetup" type="environment" file="strc-ren.mkiv"/> + <cd:command name="localheadsetup" type="environment" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headhbox" file="strc-ren.mkiv"> + <cd:command name="headhbox" level="system" category="structure" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="headvbox" file="strc-ren.mkiv"> + <cd:command name="headvbox" level="system" category="structure" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="headreferenceattributes" file="strc-ren.mkiv"/> + <cd:command name="headreferenceattributes" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headnumbercontent" file="strc-ren.mkiv"/> + <cd:command name="headnumbercontent" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headtextcontent" file="strc-ren.mkiv"/> + <cd:command name="headtextcontent" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headwidth" file="strc-ren.mkiv"/> + <cd:command name="headwidth" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headtextwidth" file="strc-ren.mkiv"/> + <cd:command name="headtextwidth" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headnumberwidth" file="strc-ren.mkiv"/> + <cd:command name="headnumberwidth" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headnumberdistance" file="strc-ren.mkiv"/> + <cd:command name="headnumberdistance" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headtextdistance" file="strc-ren.mkiv"/> + <cd:command name="headtextdistance" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headsetupspacing" file="strc-ren.mkiv"/> + <cd:command name="headsetupspacing" level="system" category="structure" file="strc-ren.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-sectionblock.xml b/tex/context/interface/mkiv/i-sectionblock.xml index d6fc97ee0..1cb2debde 100644 --- a/tex/context/interface/mkiv/i-sectionblock.xml +++ b/tex/context/interface/mkiv/i-sectionblock.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesectionblock" file="strc-sbe.mkiv"> + <cd:command name="definesectionblock" level="style" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsectionblock" file="strc-sbe.mkiv"> + <cd:command name="setupsectionblock" level="style" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -35,7 +35,7 @@ </cd:arguments> </cd:command> - <cd:command name="setsectionblock" file="strc-sbe.mkiv"> + <cd:command name="setsectionblock" level="system" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="sectionblock" type="environment" file="strc-sbe.mkiv"> + <cd:command name="sectionblock" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -58,7 +58,7 @@ </cd:arguments> </cd:command> - <cd:command name="sectionblock" type="environment" generated="yes" variant="instance" file="strc-sbe.mkiv"> + <cd:command name="sectionblock" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-sbe.mkiv"> <cd:sequence> <cd:instance value="sectionblock"/> </cd:sequence> @@ -75,7 +75,7 @@ </cd:instances> </cd:command> - <cd:command name="sectionblockenvironment" type="environment" file="strc-sbe.mkiv"> + <cd:command name="sectionblockenvironment" type="environment" level="style" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -83,7 +83,7 @@ <!-- - <cd:command name="frontmatter" type="environment" file="strc-sbe.mkiv"> + <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"> @@ -94,7 +94,7 @@ </cd:arguments> </cd:command> - <cd:command name="bodymatter" type="environment" file="strc-sbe.mkiv"> + <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"> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendices" type="environment" file="strc-sbe.mkiv"> + <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"> @@ -116,7 +116,7 @@ </cd:arguments> </cd:command> - <cd:command name="backmatter" type="environment" file="strc-sbe.mkiv"> + <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"> @@ -129,4 +129,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-selector.xml b/tex/context/interface/mkiv/i-selector.xml index e593e9117..44970669b 100644 --- a/tex/context/interface/mkiv/i-selector.xml +++ b/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" file="core-env.mkiv"> + <cd:command name="defineselector" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -13,7 +13,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupselector" file="core-env.mkiv"> + <cd:command name="setupselector" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="select" file="core-env.mkiv"> + <cd:command name="select" level="document" 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" file="core-env.mkiv"> + <cd:command name="directselect" level="system" 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-setup.xml b/tex/context/interface/mkiv/i-setup.xml index 4771230eb..a4420bfcf 100644 --- a/tex/context/interface/mkiv/i-setup.xml +++ b/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" file="x-setups-basics.mkiv"> + <cd:command name="setupsetup" level="style" file="x-setups-basics.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="criterium"> @@ -19,124 +19,149 @@ </cd:arguments> </cd:command> - <cd:command name="basicsetup" file="x-setups-basics.mkiv"> + <cd:command name="basicsetup" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="basicsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="basicsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="shortsetup" file="x-setups-basics.mkiv"> + <cd:command name="shortsetup" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="shortsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="shortsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setup" file="x-setups-basics.mkiv"> + <cd:command name="setup" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="setup" variant="argument" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showsetup" file="x-setups-basics.mkiv"> + <cd:command name="showsetup" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="showsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="showsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdinternal" file="x-setups-basics.mkiv"> + <cd:command name="placesetup" level="document" file="x-setups-basics.mkiv"/> + + <cd:command name="placeallsetups" level="document" file="x-setups-basics.mkiv"/> + + <cd:command name="placeeverysetup" level="document" file="x-setups-basics.mkiv"/> + + <cd:command name="showrootvalues" level="document" 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: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:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetup" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetup" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdshortsetup" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetup" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdshortsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdfullsetup" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetup" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdfullsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetupinstance" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetupinstance" level="document" 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" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetupinstance" level="document" 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" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetupinstance" level="document" 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" file="x-setups-basics.mkiv"> + <cd:command name="showdefinition" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="definition" file="x-setups-basics.mkiv"> + <cd:command name="showdefinition" variant="argument" level="document" 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:arguments> <cd:resolve name="keyword-text-list"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-setups.xml b/tex/context/interface/mkiv/i-setups.xml index d6b7b4d5a..df7281e74 100644 --- a/tex/context/interface/mkiv/i-setups.xml +++ b/tex/context/interface/mkiv/i-setups.xml @@ -4,119 +4,119 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setups" file="core-env.mkiv"> + <cd:command name="setups" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="setups" variant="direct" file="core-env.mkiv"> + <cd:command name="setups" variant="direct" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="setup" file="core-env.mkiv"> + <cd:command name="setup" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setup" variant="direct" file="core-env.mkiv"> + <cd:command name="setup" variant="direct" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="directsetup" file="core-env.mkiv"> + <cd:command name="directsetup" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fastsetup" file="core-env.mkiv"> + <cd:command name="fastsetup" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="texsetup" file="core-env.mkiv"> + <cd:command name="texsetup" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="luasetup" file="core-env.mkiv"> + <cd:command name="luasetup" level="style" category="lua" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="systemsetups" file="core-env.mkiv"> + <cd:command name="systemsetups" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsetups" file="core-env.mkiv"> + <cd:command name="resetsetups" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showsetupsdefinition" file="core-env.mkiv"> + <cd:command name="showsetupsdefinition" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupwithargument" file="core-env.mkiv"> + <cd:command name="setupwithargument" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fastsetupwithargument" file="core-env.mkiv"> + <cd:command name="fastsetupwithargument" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setupwithargumentswapped" file="core-env.mkiv"> + <cd:command name="setupwithargumentswapped" level="system" file="core-env.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fastsetupwithargumentswapped" file="core-env.mkiv"> + <cd:command name="fastsetupwithargumentswapped" level="system" file="core-env.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="usesetupsparameter" file="core-env.mkiv"> + <cd:command name="usesetupsparameter" level="system" file="core-env.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="autosetups" file="core-env.mkiv"> + <cd:command name="autosetups" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doprocesslocalsetups" file="core-env.mkiv"> + <cd:command name="doprocesslocalsetups" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesetups" file="core-env.mkiv"> + <cd:command name="doifelsesetups" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -124,7 +124,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsetupselse" file="core-env.mkiv"> + <cd:command name="doifsetupselse" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -132,21 +132,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifsetups" file="core-env.mkiv"> + <cd:command name="doifsetups" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifnotsetups" level="system" category="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" file="core-env.mkiv"> + <cd:command name="luasetups" type="environment" level="system" category="lua" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -155,13 +155,13 @@ </cd:arguments> </cd:command> - <cd:command name="luasetups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="luasetups" type="environment" variant="string" level="system" category="lua" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetups" type="environment" file="core-env.mkiv"> + <cd:command name="xmlsetups" type="environment" level="style" category="xml" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -170,13 +170,13 @@ </cd:arguments> </cd:command> - <cd:command name="xmlsetups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="xmlsetups" type="environment" variant="string" level="style" category="xml" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="rawsetups" type="environment" file="core-env.mkiv"> + <cd:command name="rawsetups" type="environment" level="system" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -185,13 +185,13 @@ </cd:arguments> </cd:command> - <cd:command name="rawsetups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="rawsetups" type="environment" variant="string" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="localsetups" type="environment" file="core-env.mkiv"> + <cd:command name="localsetups" type="environment" level="style" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -200,13 +200,13 @@ </cd:arguments> </cd:command> - <cd:command name="localsetups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="localsetups" type="environment" variant="string" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="setups" type="environment" file="core-env.mkiv"> + <cd:command name="setups" type="environment" level="style" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -215,10 +215,10 @@ </cd:arguments> </cd:command> - <cd:command name="setups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="setups" type="environment" variant="string" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-shift.xml b/tex/context/interface/mkiv/i-shift.xml index 792a8d84f..521317d1d 100644 --- a/tex/context/interface/mkiv/i-shift.xml +++ b/tex/context/interface/mkiv/i-shift.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineshift" file="node.rul.mkiv"> + <cd:command name="defineshift" level="style" category="layout" 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="setupshift" file="node-rul.mkiv"> + <cd:command name="setupshift" level="style" category="layout" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="shift" generated="yes" variant="instance" file="node-rul.mkiv"> + <cd:command name="shift" generated="yes" variant="instance" level="document" category="layout" file="node-rul.mkiv"> <cd:sequence> <cd:instance value="shift"/> </cd:sequence> @@ -67,7 +67,7 @@ </cd:instances> </cd:command> - <cd:command name="shift" type="environment" file="node-rul.mkiv"> + <cd:command name="shift" type="environment" level="document" category="layout" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -75,13 +75,13 @@ <!-- - <cd:command name="shiftup" file="node-rul.mkiv"> + <cd:command name="shiftup" level="document" category="layout" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="shiftdown" file="node-rul.mkiv"> + <cd:command name="shiftdown" level="document" category="layout" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> @@ -89,4 +89,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sidebar.xml b/tex/context/interface/mkiv/i-sidebar.xml index 25a7ed306..7518b5c61 100644 --- a/tex/context/interface/mkiv/i-sidebar.xml +++ b/tex/context/interface/mkiv/i-sidebar.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesidebar" file="anch-bar.mkiv"> + <cd:command name="definesidebar" level="style" category="rules" file="anch-bar.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="setupsidebar" file="anch-bar.mkiv"> + <cd:command name="setupsidebar" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -48,7 +48,7 @@ <!-- - <cd:command name="setupsidebars" file="anch-bar.mkiv"> + <cd:command name="setupsidebars" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -59,7 +59,7 @@ --> - <cd:command name="sidebar" type="environment" file="anch-bar.mkiv"> + <cd:command name="sidebar" type="environment" level="document" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -68,7 +68,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmarginrule" file="anch-bar.mkiv"> + <cd:command name="setupmarginrule" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:assignments list="yes"> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmarginrules" file="anch-bar.mkiv"> + <cd:command name="setupmarginrules" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:assignments list="yes"> @@ -86,13 +86,13 @@ </cd:arguments> </cd:command> - <cd:command name="marginrule" type="environment" file="anch-bar.mkiv"> + <cd:command name="marginrule" type="environment" level="document" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="marginrule" type="environment" variant="assignment" file="anch-bar.mkiv"> + <cd:command name="marginrule" type="environment" variant="assignment" level="document" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmarginrule"/> @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-smash.xml b/tex/context/interface/mkiv/i-smash.xml index 16c1046bd..9183c8a6b 100644 --- a/tex/context/interface/mkiv/i-smash.xml +++ b/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" file="supp-box.mkiv"> + <cd:command name="smashbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="smashboxed" file="supp-box.mkiv"> + <cd:command name="smashboxed" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hsmashbox" file="supp-box.mkiv"> + <cd:command name="hsmashbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vsmashbox" file="supp-box.mkiv"> + <cd:command name="vsmashbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hsmash" file="supp-box.mkiv"> + <cd:command name="hsmash" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vsmash" file="supp-box.mkiv"> + <cd:command name="vsmash" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hsmashed" file="supp-box.mkiv"> + <cd:command name="hsmashed" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vsmashed" file="supp-box.mkiv"> + <cd:command name="vsmashed" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smashedhbox" file="supp-box.mkiv"> + <cd:command name="smashedhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smashedvbox" file="supp-box.mkiv"> + <cd:command name="smashedvbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smash" file="supp-box.mkiv"> + <cd:command name="smash" level="document" file="supp-box.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="w"/> @@ -79,4 +79,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sort.xml b/tex/context/interface/mkiv/i-sort.xml index a72df624b..5a263ab97 100644 --- a/tex/context/interface/mkiv/i-sort.xml +++ b/tex/context/interface/mkiv/i-sort.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesorting" file="strc-syn.mkiv"> + <cd:command name="definesorting" level="style" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-plural"/> @@ -15,7 +15,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsorting" file="strc-syn.mkiv"> + <cd:command name="setupsorting" level="style" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular-list-optional"/> <cd:assignments list="yes"> @@ -78,7 +78,7 @@ </cd:arguments> </cd:command> - <cd:command name="sorting" generated="yes" variant="instance" file="strc-syn.mkiv"> + <cd:command name="sorting" generated="yes" variant="instance" level="document" category="language" file="strc-syn.mkiv"> <cd:sequence> <cd:instance value="sorting"/> </cd:sequence> @@ -91,7 +91,7 @@ </cd:instances> </cd:command> - <cd:command name="definesort" file="strc-syn.mkiv"> + <cd:command name="definesort" level="system" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -103,7 +103,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofsorts" generated="yes" variant="instance" file="strc-syn.mkiv"> + <cd:command name="placelistofsorts" generated="yes" variant="instance" level="document" category="language" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="sorts"/> @@ -118,7 +118,7 @@ </cd:instances> </cd:command> - <cd:command name="completelistofsorts" generated="yes" variant="instance" file="strc-syn.mkiv"> + <cd:command name="completelistofsorts" generated="yes" variant="instance" level="document" category="language" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="sorts"/> @@ -133,27 +133,27 @@ </cd:instances> </cd:command> - <cd:command name="doifelsecurrentsortingused" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsortingused" level="system" category="language conditional" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="resetusedsortings" file="strc-syn.mkiv"> + <cd:command name="resetusedsortings" level="system" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> </cd:arguments> </cd:command> - <cd:command name="registersort" file="strc-syn.mkiv"> + <cd:command name="registersort" level="system" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="placelistofsorts" file="strc-syn.mkiv"> + <cd:command name="placelistofsorts" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> @@ -162,7 +162,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofsorts" file="strc-syn.mkiv"> + <cd:command name="completelistofsorts" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> @@ -173,14 +173,14 @@ <!-- - <cd:command name="logo" file="strc-syn.mkiv"> + <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" file="strc-syn.mkiv"> + <cd:command name="placelistoflogos" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupsorting"/> @@ -188,7 +188,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistoflogos" file="strc-syn.mkiv"> + <cd:command name="completelistoflogos" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupsorting"/> @@ -198,4 +198,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-soundtrack.xml b/tex/context/interface/mkiv/i-soundtrack.xml index b0f460352..c374268bb 100644 --- a/tex/context/interface/mkiv/i-soundtrack.xml +++ b/tex/context/interface/mkiv/i-soundtrack.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupexternalsoundtracks" file="scrn-wid.mkvi"> + <cd:command name="setupexternalsoundtracks" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="option"> @@ -14,17 +14,17 @@ </cd:arguments> </cd:command> - <cd:command name="useexternalsoundtrack" file="scrn-wid.mkvi"> + <cd:command name="useexternalsoundtrack" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="checksoundtrack" file="scrn-wid.mkvi"> + <cd:command name="checksoundtrack" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-spellchecking.xml b/tex/context/interface/mkiv/i-spellchecking.xml index 615ba390b..90a219fc8 100644 --- a/tex/context/interface/mkiv/i-spellchecking.xml +++ b/tex/context/interface/mkiv/i-spellchecking.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupspellchecking" file="lang-wrd.mkiv"> + <cd:command name="setupspellchecking" level="style" category="language" file="lang-wrd.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -23,11 +23,11 @@ </cd:arguments> </cd:command> - <cd:command name="loadspellchecklist" file="lang-wrd.mkiv"> + <cd:command name="loadspellchecklist" level="style" category="language" file="lang-wrd.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-spreadsheet.xml b/tex/context/interface/mkiv/i-spreadsheet.xml index 9f6273891..8181cfe2d 100644 --- a/tex/context/interface/mkiv/i-spreadsheet.xml +++ b/tex/context/interface/mkiv/i-spreadsheet.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definespreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="definespreadsheet" level="style" category="tables" file="m-spreadsheet.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="setupspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="setupspreadsheet" level="style" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -32,31 +32,31 @@ </cd:arguments> </cd:command> - <cd:command name="resetspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="resetspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="spreadsheet" type="environment" file="m-spreadsheet.mkiv"> + <cd:command name="spreadsheet" type="environment" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="showspreadsheet" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="inspectspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="inspectspreadsheet" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="setspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -65,7 +65,7 @@ </cd:arguments> </cd:command> - <cd:command name="getspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="getspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsespreadsheetcell" file="m-spreadsheet.mkiv"> + <cd:command name="doifelsespreadsheetcell" level="system" category="tables 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" file="m-spreadsheet.mkiv"> + <cd:command name="doifspreadsheetcellelse" level="system" category="tables conditional" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -94,31 +94,31 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEsetspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="TABLEsetspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="TABLEgetspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="TABLEgetspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setspr" file="m-spreadsheet.mkiv"> + <cd:command name="setspr" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getspr" file="m-spreadsheet.mkiv"> + <cd:command name="getspr" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="spreadsheettable" type="environment" file="m-spreadsheet.mkiv"> + <cd:command name="spreadsheettable" type="environment" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -127,9 +127,9 @@ </cd:arguments> </cd:command> - <cd:command name="row" type="environment" file="m-spreadsheet.mkiv"/> + <cd:command name="row" type="environment" scope="spreadsheettable" level="document" category="tables" file="m-spreadsheet.mkiv"/> - <cd:command name="cell" type="environment" file="m-spreadsheet.mkiv"> + <cd:command name="cell" type="environment" scope="spreadsheettable" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> diff --git a/tex/context/interface/mkiv/i-startstop.xml b/tex/context/interface/mkiv/i-startstop.xml index 2a6be1393..c7780488c 100644 --- a/tex/context/interface/mkiv/i-startstop.xml +++ b/tex/context/interface/mkiv/i-startstop.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definestartstop" file="core-sys.mkiv"> + <cd:command name="definestartstop" level="style" category="structure" 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="setupstartstop" file="core-sys.mkiv"> + <cd:command name="setupstartstop" level="style" category="structure" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -51,13 +51,13 @@ </cd:arguments> </cd:command> - <cd:command name="startstop" type="environment" generated="yes" variant="example" file="core-sys.mkiv"> + <cd:command name="startstop" type="environment" generated="yes" variant="example" level="document" category="structure" file="core-sys.mkiv"> <cd:sequence> <cd:variable value="startstop"/> </cd:sequence> </cd:command> - <cd:command name="startstop" type="environment" file="core-sys.mkiv"> + <cd:command name="startstop" type="environment" level="document" category="structure" file="core-sys.mkiv"> <cd:sequence> <cd:string value=""/><!-- value="zero width space --> </cd:sequence> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="startstop" generated="yes" variant="example" file="core-sys.mkiv"> + <cd:command name="startstop" generated="yes" variant="example" level="document" category="structure" file="core-sys.mkiv"> <cd:sequence> <cd:variable value="startstop"/> </cd:sequence> @@ -75,4 +75,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-steps.xml b/tex/context/interface/mkiv/i-steps.xml index 47a3b45ca..c71bc2e2f 100644 --- a/tex/context/interface/mkiv/i-steps.xml +++ b/tex/context/interface/mkiv/i-steps.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="setupSTEPchart" file="m-steps.mkvi"> + <cd:command name="setupSTEPchart" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupSTEPcharts" file="m-steps.mkvi"> + <cd:command name="setupSTEPcharts" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -41,7 +41,7 @@ --> - <cd:command name="setupSTEPcharts" file="m-steps.mkvi"> + <cd:command name="setupSTEPcharts" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -66,7 +66,7 @@ <!-- - <cd:command name="setupSTEPcell" file="m-steps.mkvi"> + <cd:command name="setupSTEPcell" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -102,7 +102,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupSTEPcells" file="m-steps.mkvi"> + <cd:command name="setupSTEPcells" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -114,7 +114,7 @@ --> - <cd:command name="setupSTEPcells" file="m-steps.mkvi"> + <cd:command name="setupSTEPcells" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -152,7 +152,7 @@ <!-- - <cd:command name="setupSTEPtext" file="m-steps.mkvi"> + <cd:command name="setupSTEPtext" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -185,7 +185,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupSTEPtexts" file="m-steps.mkvi"> + <cd:command name="setupSTEPtexts" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -197,7 +197,7 @@ --> - <cd:command name="setupSTEPtexts" file="m-steps.mkvi"> + <cd:command name="setupSTEPtexts" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -232,7 +232,7 @@ <!-- - <cd:command name="setupSTEPline" file="m-steps.mkvi"> + <cd:command name="setupSTEPline" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -259,7 +259,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupSTEPlines" file="m-steps.mkvi"> + <cd:command name="setupSTEPlines" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -271,7 +271,7 @@ --> - <cd:command name="setupSTEPlines" file="m-steps.mkvi"> + <cd:command name="setupSTEPlines" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -298,7 +298,7 @@ </cd:arguments> </cd:command> - <cd:command name="STEPchart" type="environment" file="m-steps.mkvi"> + <cd:command name="STEPchart" type="environment" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -307,7 +307,7 @@ </cd:arguments> </cd:command> - <cd:command name="STEPtable" type="environment" file="m-steps.mkvi"> + <cd:command name="STEPtable" type="environment" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -316,7 +316,7 @@ </cd:arguments> </cd:command> - <cd:command name="STEPaligntable" type="environment" file="m-steps.mkvi"> + <cd:command name="STEPaligntable" type="environment" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -325,7 +325,7 @@ </cd:arguments> </cd:command> - <cd:command name="STEPchart" file="m-steps.mkvi"> + <cd:command name="STEPchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -334,15 +334,15 @@ </cd:arguments> </cd:command> - <cd:command name="makeSTEPchart" file="m-steps.mkvi"> + <cd:command name="makeSTEPchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="STEPcell" type="environment" file="m-steps.mkvi"/> + <cd:command name="STEPcell" type="environment" level="document" category="graphics" file="m-steps.mkvi"/> - <cd:command name="cells" file="m-steps.mkvi"> + <cd:command name="cells" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -350,7 +350,7 @@ </cd:arguments> </cd:command> - <cd:command name="cells" variant="aligntable" file="m-steps.mkvi"> + <cd:command name="cells" variant="aligntable" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -359,7 +359,7 @@ </cd:arguments> </cd:command> - <cd:command name="texts" file="m-steps.mkvi"> + <cd:command name="texts" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -367,42 +367,42 @@ </cd:arguments> </cd:command> - <cd:command name="cell" file="m-steps.mkvi"> + <cd:command name="cell" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="text" file="m-steps.mkvi"> + <cd:command name="text" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="toptext" file="m-steps.mkvi"> + <cd:command name="toptext" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="bottext" file="m-steps.mkvi"> + <cd:command name="bottext" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="topcell" file="m-steps.mkvi"> + <cd:command name="topcell" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="botcell" file="m-steps.mkvi"> + <cd:command name="botcell" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> diff --git a/tex/context/interface/mkiv/i-stream.xml b/tex/context/interface/mkiv/i-stream.xml index 97be35774..7e769fdb6 100644 --- a/tex/context/interface/mkiv/i-stream.xml +++ b/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" file="page-str.mkiv"/> + <cd:command name="currentoutputstream" level="system" file="page-str.mkiv"/> - <cd:command name="ifinoutputstream" file="page-str.mkiv"> + <cd:command name="ifinoutputstream" level="system" 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" file="page-str.mkiv"> + <cd:command name="enableoutputstream" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="disableoutputstream" file="page-str.mkiv"/> + <cd:command name="disableoutputstream" level="system" file="page-str.mkiv"/> - <cd:command name="outputstream" type="environment" file="page-str.mkiv"> + <cd:command name="outputstream" type="environment" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushoutputstream" file="page-str.mkiv"> + <cd:command name="flushoutputstream" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreambox" file="page-str.mkiv"> + <cd:command name="outputstreambox" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamcopy" file="page-str.mkiv"> + <cd:command name="outputstreamcopy" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamunvbox" file="page-str.mkiv"> + <cd:command name="outputstreamunvbox" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamunvcopy" file="page-str.mkiv"> + <cd:command name="outputstreamunvcopy" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="synchronizeoutputstreams" file="page-str.mkiv"> + <cd:command name="synchronizeoutputstreams" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="pushoutputstream" file="page-str.mkiv"> + <cd:command name="pushoutputstream" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-string.xml b/tex/context/interface/mkiv/i-string.xml index 7a7eb1c98..aba5429c5 100644 --- a/tex/context/interface/mkiv/i-string.xml +++ b/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" file="blob-ini.mkiv"> + <cd:command name="wdofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="htofstring" file="blob-ini.mkiv"> + <cd:command name="htofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="dpofstring" file="blob-ini.mkiv"> + <cd:command name="dpofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hdofstring" file="blob-ini.mkiv"> + <cd:command name="hdofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="htdpofstring" file="blob-ini.mkiv"> + <cd:command name="htdpofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="widthofstring" file="blob-ini.mkiv"> + <cd:command name="widthofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="heightofstring" file="blob-ini.mkiv"> + <cd:command name="heightofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="depthofstring" file="blob-ini.mkiv"> + <cd:command name="depthofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="heightanddepthofstring" file="blob-ini.mkiv"> + <cd:command name="heightanddepthofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setwidthof" file="blob-ini.mkiv"> + <cd:command name="setwidthof" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:text/> <cd:delimiter name="to"/> @@ -66,4 +66,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-strut.xml b/tex/context/interface/mkiv/i-strut.xml index 1fd12a3bb..0653dd214 100644 --- a/tex/context/interface/mkiv/i-strut.xml +++ b/tex/context/interface/mkiv/i-strut.xml @@ -4,15 +4,17 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="strutdp" file="supp-box.mkiv"/> + <cd:command name="strutdp" level="system" file="supp-box.mkiv"/> - <cd:command name="strutht" file="supp-box.mkiv"/> + <cd:command name="strutht" level="system" file="supp-box.mkiv"/> - <cd:command name="strutwd" file="supp-box.mkiv"/> + <cd:command name="strutwd" level="system" file="supp-box.mkiv"/> - <cd:command name="struthtdp" file="supp-box.mkiv"/> + <cd:command name="struthtdp" level="system" file="supp-box.mkiv"/> - <cd:command name="setupstruts" file="spac-ver.mkiv"> + <cd:command name="strutgap" level="system" file="supp-box.mkiv"/> + + <cd:command name="setupstruts" level="style" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-strut"/> @@ -20,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizestrut" file="spac-ver.mkiv"> + <cd:command name="synchronizestrut" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-strut"/> @@ -28,26 +30,36 @@ </cd:arguments> </cd:command> - <cd:command name="strut" file="spac-ver.mkiv"/> + <cd:command name="strut" level="style" file="spac-ver.mkiv"/> + + <cd:command name="halfstrut" level="system" file="spac-ver.mkiv"/> + + <cd:command name="quarterstrut" level="system" file="spac-ver.mkiv"/> + + <cd:command name="halflinestrut" level="system" file="spac-ver.mkiv"/> + + <cd:command name="noheightstrut" level="system" file="spac-ver.mkiv"/> + + <cd:command name="depthstrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="setstrut" file="spac-ver.mkiv"/> + <cd:command name="setstrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="setcharstrut" file="spac-ver.mkiv"> + <cd:command name="setcharstrut" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setfontstrut" file="spac-ver.mkiv"/> + <cd:command name="setfontstrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="setcapstrut" file="spac-ver.mkiv"/> + <cd:command name="setcapstrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="setnostrut" file="spac-ver.mkiv"/> + <cd:command name="setnostrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="showstruts" file="spac-ver.mkiv"/> + <cd:command name="showstruts" level="document" file="spac-ver.mkiv"/> - <cd:command name="showcolorstruts" file="spac-ver.mkiv"/> + <cd:command name="showcolorstruts" level="document" file="spac-ver.mkiv"/> - <cd:command name="strut" type="environment" begin="beg" end="end" file="spac-ver.mkiv"/> + <cd:command name="strut" type="environment" begin="beg" end="end" level="system" file="spac-ver.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-symbol.xml b/tex/context/interface/mkiv/i-symbol.xml index 7797a3bee..123e98cbf 100644 --- a/tex/context/interface/mkiv/i-symbol.xml +++ b/tex/context/interface/mkiv/i-symbol.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesymbol" file="symb-ini.mkiv"> + <cd:command name="definesymbol" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseinsymbolset" file="symb-ini.mkiv"> + <cd:command name="doifelseinsymbolset" level="system" category="symbols 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" file="symb-ini.mkiv"> + <cd:command name="doifinsymbolsetelse" level="system" category="symbols 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" file="symb-ini.mkiv"> + <cd:command name="doifinsymbolset" level="system" category="symbols 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" file="symb-ini.mkiv"> + <cd:command name="doifelsesymbolset" level="system" category="symbols 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" file="symb-ini.mkiv"> + <cd:command name="doifsymbolsetelse" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -55,27 +55,27 @@ </cd:arguments> </cd:command> - <cd:command name="symbol" file="symb-ini.mkiv"> + <cd:command name="symbol" level="document" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="symbol" variant="direct" file="symb-ini.mkiv"> + <cd:command name="symbol" variant="direct" level="document" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="directsymbol" file="symb-ini.mkiv"> + <cd:command name="directsymbol" level="system" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definefiguresymbol" file="symb-ini.mkiv"> + <cd:command name="definefiguresymbol" level="style" category="symbols 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" file="symb-ini.mkiv"> + <cd:command name="figuresymbol" level="document" category="symbols 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" file="symb-ini.mkiv"> + <cd:command name="doifelsesymboldefined" level="system" category="symbols 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" file="symb-ini.mkiv"> + <cd:command name="doifsymboldefinedelse" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -116,30 +116,30 @@ </cd:arguments> </cd:command> - <cd:command name="symbolset" type="environment" file="symb-ini.mkiv"> + <cd:command name="symbolset" type="environment" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupsymbolset" file="symb-ini.mkiv"> + <cd:command name="setupsymbolset" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsymbolset" file="symb-ini.mkiv"/> + <cd:command name="resetsymbolset" level="system" category="symbols" file="symb-ini.mkiv"/> - <cd:command name="usesymbols" file="symb-ini.mkiv"> + <cd:command name="usesymbols" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="showsymbolset" file="symb-run.mkiv"> + <cd:command name="showsymbolset" level="document" category="symbols" file="symb-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-synctex.xml b/tex/context/interface/mkiv/i-synctex.xml new file mode 100644 index 000000000..21f49e3f6 --- /dev/null +++ b/tex/context/interface/mkiv/i-synctex.xml @@ -0,0 +1,42 @@ +<?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="synctexsetfilename" level="system" category="pdf" file="cont-run.mkiv"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="synctexresetfilename" level="system" category="pdf" file="cont-run.mkiv"/> + + <cd:command name="synctexblockfilename" level="system" category="pdf" file="cont-run.mkiv"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="setupsynctex" level="style" category="pdf" file="cont-run.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="state"> + <cd:constant type="start"/> + <cd:constant type="stop" default="yes"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="min"/> + <cd:constant type="max" default="yes"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="blocksynctexfile" level="style" category="pdf" file="cont-run.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-file-list"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml index 6c615b12a..3e3e1c027 100644 --- a/tex/context/interface/mkiv/i-synonym.xml +++ b/tex/context/interface/mkiv/i-synonym.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesynonyms" file="strc-syn.mkiv"> + <cd:command name="definesynonyms" level="style" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-plural"/> @@ -17,7 +17,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsynonyms" file="strc-syn.mkiv"> + <cd:command name="setupsynonyms" level="style" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular-list-optional"/> <cd:assignments list="yes"> @@ -80,7 +80,7 @@ </cd:arguments> </cd:command> - <cd:command name="synonym" generated="yes" variant="instance" file="strc-syn.mkiv"> + <cd:command name="synonym" generated="yes" variant="instance" level="document" category="symbols" file="strc-syn.mkiv"> <cd:sequence> <cd:instance value="synonym"/> </cd:sequence> @@ -94,7 +94,7 @@ </cd:instances> </cd:command> - <cd:command name="definesynonym" file="strc-syn.mkiv"> + <cd:command name="definesynonym" level="style" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -107,7 +107,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofsynonyms" generated="yes" variant="instance" file="strc-syn.mkiv"> + <cd:command name="placelistofsynonyms" generated="yes" variant="instance" level="document" category="symbols" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="synonyms"/> @@ -122,7 +122,7 @@ </cd:instances> </cd:command> - <cd:command name="completelistofsynonyms" generated="yes" variant="instance" file="strc-syn.mkiv"> + <cd:command name="completelistofsynonyms" generated="yes" variant="instance" level="document" category="symbols" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="synonyms"/> @@ -137,40 +137,40 @@ </cd:instances> </cd:command> - <cd:command name="registersynonym" file="strc-syn.mkiv"> + <cd:command name="registersynonym" level="system" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentsynonymused" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsynonymused" level="system" category="symbols 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" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsynonymshown" level="system" category="symbols conditional" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="resetusedsynonyms" file="strc-syn.mkiv"> + <cd:command name="resetusedsynonyms" level="system" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> </cd:arguments> </cd:command> - <cd:command name="resetshownsynonyms" file="strc-syn.mkiv"> + <cd:command name="resetshownsynonyms" level="system" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> </cd:arguments> </cd:command> - <cd:command name="placelistofsynonyms" file="strc-syn.mkiv"> + <cd:command name="placelistofsynonyms" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> @@ -179,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofsynonyms" file="strc-syn.mkiv"> + <cd:command name="completelistofsynonyms" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> @@ -188,7 +188,7 @@ </cd:arguments> </cd:command> - <cd:command name="infull" file="strc-syn.mkiv"> + <cd:command name="infull" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -196,7 +196,7 @@ <!-- - <cd:command name="abbreviation" file="strc-syn.mkiv"> + <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"/> @@ -204,7 +204,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofabbreviations" file="strc-syn.mkiv"> + <cd:command name="placelistofabbreviations" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupsynonyms"/> @@ -212,7 +212,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofabbreviations" file="strc-syn.mkiv"> + <cd:command name="completelistofabbreviations" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupsynonyms"/> @@ -222,4 +222,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-system.xml b/tex/context/interface/mkiv/i-system.xml index aa12bd779..44def10e0 100644 --- a/tex/context/interface/mkiv/i-system.xml +++ b/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" file="syst-aux.mkiv"> + <cd:command name="expanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="expanded" type="environment" file="syst-aux.mkiv"/> + <cd:command name="expanded" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="gobbleoneargument" file="syst-aux.mkiv"> + <cd:command name="gobbleoneargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="gobbletwoarguments" file="syst-aux.mkiv"> + <cd:command name="gobbletwoarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="gobblethreearguments" file="syst-aux.mkiv"> + <cd:command name="gobblethreearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -33,7 +33,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefourarguments" file="syst-aux.mkiv"> + <cd:command name="gobblefourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefivearguments" file="syst-aux.mkiv"> + <cd:command name="gobblefivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblesixarguments" file="syst-aux.mkiv"> + <cd:command name="gobblesixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblesevenarguments" file="syst-aux.mkiv"> + <cd:command name="gobblesevenarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleeightarguments" file="syst-aux.mkiv"> + <cd:command name="gobbleeightarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleninearguments" file="syst-aux.mkiv"> + <cd:command name="gobbleninearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -102,7 +102,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbletenarguments" file="syst-aux.mkiv"> + <cd:command name="gobbletenarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -117,20 +117,20 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleoneoptional" file="syst-aux.mkiv"> + <cd:command name="gobbleoneoptional" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> </cd:arguments> </cd:command> - <cd:command name="gobbletwooptionals" file="syst-aux.mkiv"> + <cd:command name="gobbletwooptionals" level="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" file="syst-aux.mkiv"> + <cd:command name="gobblethreeoptionals" level="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" file="syst-aux.mkiv"> + <cd:command name="gobblefouroptionals" level="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" file="syst-aux.mkiv"> + <cd:command name="gobblefiveoptionals" level="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" file="syst-aux.mkiv"/> + <cd:command name="donothing" level="system" file="syst-aux.mkiv"/> - <cd:command name="doifelsenextchar" file="syst-aux.mkiv"> + <cd:command name="doifelsenextchar" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifnextcharelse" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifelsenextoptional" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextoptionalelse" file="syst-aux.mkiv"> + <cd:command name="doifnextoptionalelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextoptionalcs" file="syst-aux.mkiv"> + <cd:command name="doifelsenextoptionalcs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifnextoptionalcselse" file="syst-aux.mkiv"> + <cd:command name="doifnextoptionalcselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextbgroup" file="syst-aux.mkiv"> + <cd:command name="doifelsenextbgroup" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextbgroupelse" file="syst-aux.mkiv"> + <cd:command name="doifnextbgroupelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextbgroupcs" file="syst-aux.mkiv"> + <cd:command name="doifelsenextbgroupcs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifnextbgroupcselse" file="syst-aux.mkiv"> + <cd:command name="doifnextbgroupcselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextparenthesis" file="syst-aux.mkiv"> + <cd:command name="doifelsenextparenthesis" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextparenthesiselse" file="syst-aux.mkiv"> + <cd:command name="doifnextparenthesiselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefastoptionalcheck" file="syst-aux.mkiv"> + <cd:command name="doifelsefastoptionalcheck" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiffastoptionalcheckelse" file="syst-aux.mkiv"> + <cd:command name="doiffastoptionalcheckelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefastoptionalcheckcs" file="syst-aux.mkiv"> + <cd:command name="doifelsefastoptionalcheckcs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doiffastoptionalcheckcselse" file="syst-aux.mkiv"> + <cd:command name="doiffastoptionalcheckcselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="assumelongusagecs" file="syst-aux.mkiv"> + <cd:command name="assumelongusagecs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setvalue" file="syst-aux.mkiv"> + <cd:command name="setvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setgvalue" file="syst-aux.mkiv"> + <cd:command name="setgvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setevalue" file="syst-aux.mkiv"> + <cd:command name="setevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setxvalue" file="syst-aux.mkiv"> + <cd:command name="setxvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getvalue" file="syst-aux.mkiv"> + <cd:command name="getvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letvalue" file="syst-aux.mkiv"> + <cd:command name="letvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="letgvalue" file="syst-aux.mkiv"> + <cd:command name="letgvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="resetvalue" file="syst-aux.mkiv"> + <cd:command name="resetvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="undefinevalue" file="syst-aux.mkiv"> + <cd:command name="undefinevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="ignorevalue" file="syst-aux.mkiv"> + <cd:command name="ignorevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setuvalue" file="syst-aux.mkiv"> + <cd:command name="setuvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuevalue" file="syst-aux.mkiv"> + <cd:command name="setuevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setugvalue" file="syst-aux.mkiv"> + <cd:command name="setugvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuxvalue" file="syst-aux.mkiv"> + <cd:command name="setuxvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getuvalue" file="syst-aux.mkiv"> + <cd:command name="getuvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseundefined" file="syst-aux.mkiv"> + <cd:command name="doifelseundefined" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifundefinedelse" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifelsedefined" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifdefinedelse" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifundefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifdefined" file="syst-aux.mkiv"> + <cd:command name="doifdefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="letbeundefined" file="syst-aux.mkiv"> + <cd:command name="letbeundefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="localundefine" file="syst-aux.mkiv"> + <cd:command name="localundefine" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="globalundefine" file="syst-aux.mkiv"> + <cd:command name="globalundefine" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsealldefined" file="syst-aux.mkiv"> + <cd:command name="doifelsealldefined" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifalldefinedelse" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doif" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -468,7 +468,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnot" file="syst-aux.mkiv"> + <cd:command name="doifnot" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -476,7 +476,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelse" file="syst-aux.mkiv"> + <cd:command name="doifelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -485,7 +485,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseempty" file="syst-aux.mkiv"> + <cd:command name="doifelseempty" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifemptyelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> @@ -501,161 +501,161 @@ </cd:arguments> </cd:command> - <cd:command name="doifempty" file="syst-aux.mkiv"> + <cd:command name="doifempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotempty" file="syst-aux.mkiv"> + <cd:command name="doifnotempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelseinset" file="syst-aux.mkiv"> + <cd:command name="doifelseinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifinsetelse" file="syst-aux.mkiv"> + <cd:command name="doifinsetelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifinset" file="syst-aux.mkiv"> + <cd:command name="doifinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotinset" file="syst-aux.mkiv"> + <cd:command name="doifnotinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecommon" file="syst-aux.mkiv"> + <cd:command name="doifelsecommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifcommonelse" file="syst-aux.mkiv"> + <cd:command name="doifcommonelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifcommon" file="syst-aux.mkiv"> + <cd:command name="doifcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotcommon" file="syst-aux.mkiv"> + <cd:command name="doifnotcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="processcommalist" file="syst-aux.mkiv"> + <cd:command name="processcommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="quitcommalist" file="syst-aux.mkiv"/> + <cd:command name="quitcommalist" level="system" file="syst-aux.mkiv"/> - <cd:command name="quitprevcommalist" file="syst-aux.mkiv"/> + <cd:command name="quitprevcommalist" level="system" file="syst-aux.mkiv"/> - <cd:command name="processcommacommand" file="syst-aux.mkiv"> + <cd:command name="processcommacommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processcommalistwithparameters" file="syst-aux.mkiv"> + <cd:command name="processcommalistwithparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="processcommalist" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="processcommacommand" type="environment" file="syst-aux.mkiv"> + <cd:command name="processcommacommand" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="currentcommalistitem" file="syst-aux.mkiv"/> + <cd:command name="currentcommalistitem" level="system" file="syst-aux.mkiv"/> - <cd:command name="processaction" file="syst-aux.mkiv"> + <cd:command name="processaction" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="processfirstactioninset" file="syst-aux.mkiv"> + <cd:command name="processfirstactioninset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="processallactionsinset" file="syst-aux.mkiv"> + <cd:command name="processallactionsinset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="commalistelement" file="syst-aux.mkiv"/> + <cd:command name="commalistelement" level="system" file="syst-aux.mkiv"/> - <cd:command name="firstcharacter" file="syst-aux.mkiv"/> + <cd:command name="firstcharacter" level="system" file="syst-aux.mkiv"/> - <cd:command name="remainingcharacters" file="syst-aux.mkiv"/> + <cd:command name="remainingcharacters" level="system" file="syst-aux.mkiv"/> - <cd:command name="getfirstcharacter" file="syst-aux.mkiv"> + <cd:command name="getfirstcharacter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefirstchar" file="syst-aux.mkiv"> + <cd:command name="doifelsefirstchar" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doiffirstcharelse" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="thefirstcharacter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="theremainingcharacters" file="syst-aux.mkiv"> + <cd:command name="theremainingcharacters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelseinstring" file="syst-aux.mkiv"> + <cd:command name="doifelseinstring" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifinstringelse" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifinstring" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifnotinstring" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifelseincsname" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifincsnameelse" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifelsenumber" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifnumberelse" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="doifnumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotnumber" file="syst-aux.mkiv"> + <cd:command name="doifnotnumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="percentdimen" file="syst-aux.mkiv"> + <cd:command name="percentdimen" level="system" 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" file="syst-aux.mkiv"> + <cd:command name="setpercentdimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -793,170 +793,170 @@ </cd:arguments> </cd:command> - <cd:command name="makerawcommalist" file="syst-aux.mkiv"> + <cd:command name="makerawcommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawprocesscommalist" file="syst-aux.mkiv"> + <cd:command name="rawprocesscommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawprocesscommacommand" file="syst-aux.mkiv"> + <cd:command name="rawprocesscommacommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawdoifelseinset" file="syst-aux.mkiv"> + <cd:command name="rawdoifelseinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="rawdoifinsetelse" file="syst-aux.mkiv"> + <cd:command name="rawdoifinsetelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="rawdoifinset" file="syst-aux.mkiv"> + <cd:command name="rawdoifinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="rawprocessaction" file="syst-aux.mkiv"> + <cd:command name="rawprocessaction" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="currentvalue" file="syst-aux.mkiv"/> + <cd:command name="currentvalue" level="system" file="syst-aux.mkiv"/> - <cd:command name="getparameters" file="syst-aux.mkiv"> + <cd:command name="getparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="geteparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="getgparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="getxparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="forgetparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="getexpandedparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="doassign" level="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" file="syst-aux.mkiv"> + <cd:command name="doeassign" level="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" file="syst-aux.mkiv"> + <cd:command name="undoassign" level="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" file="syst-aux.mkiv"> + <cd:command name="doassignempty" level="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" file="syst-aux.mkiv"> + <cd:command name="processassignmentlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processassignmentcommand" file="syst-aux.mkiv"> + <cd:command name="processassignmentcommand" level="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" file="syst-aux.mkiv"> + <cd:command name="processassignmentlist" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="processassignmentcommand" type="environment" file="syst-aux.mkiv"> + <cd:command name="processassignmentcommand" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="currentassignmentlistkey" file="syst-aux.mkiv"/> + <cd:command name="currentassignmentlistkey" level="system" file="syst-aux.mkiv"/> - <cd:command name="currentassignmentlistvalue" file="syst-aux.mkiv"/> + <cd:command name="currentassignmentlistvalue" level="system" file="syst-aux.mkiv"/> - <cd:command name="getemptyparameters" file="syst-aux.mkiv"> + <cd:command name="getemptyparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="copyparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="checkparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="ifparameters" file="syst-aux.mkiv"> + <cd:command name="ifparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -979,35 +979,35 @@ </cd:arguments> </cd:command> - <cd:command name="commalistsize" file="syst-aux.mkiv"/> + <cd:command name="commalistsize" level="system" file="syst-aux.mkiv"/> - <cd:command name="getcommalistsize" file="syst-aux.mkiv"> + <cd:command name="getcommalistsize" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="getcommacommandsize" file="syst-aux.mkiv"> + <cd:command name="getcommacommandsize" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="getfromcommalist" file="syst-aux.mkiv"> + <cd:command name="getfromcommalist" level="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" file="syst-aux.mkiv"> + <cd:command name="getfromcommacommand" level="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="dogetcommacommandelement" file="syst-aux.mkiv"> + <cd:command name="dogetcommacommandelement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-number"/> <cd:delimiter name="from"/> @@ -1017,14 +1017,14 @@ </cd:arguments> </cd:command> - <cd:command name="dosingleempty" file="syst-aux.mkiv"> + <cd:command name="dosingleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dodoubleempty" file="syst-aux.mkiv"> + <cd:command name="dodoubleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1032,7 +1032,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleempty" file="syst-aux.mkiv"> + <cd:command name="dotripleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1041,7 +1041,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadrupleempty" file="syst-aux.mkiv"> + <cd:command name="doquadrupleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1051,7 +1051,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintupleempty" file="syst-aux.mkiv"> + <cd:command name="doquintupleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1062,7 +1062,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosixtupleempty" file="syst-aux.mkiv"> + <cd:command name="dosixtupleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1074,7 +1074,7 @@ </cd:arguments> </cd:command> - <cd:command name="doseventupleempty" file="syst-aux.mkiv"> + <cd:command name="doseventupleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1087,14 +1087,14 @@ </cd:arguments> </cd:command> - <cd:command name="dosingleargument" file="syst-aux.mkiv"> + <cd:command name="dosingleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> </cd:arguments> </cd:command> - <cd:command name="dodoubleargument" file="syst-aux.mkiv"> + <cd:command name="dodoubleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1102,7 +1102,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleargument" file="syst-aux.mkiv"> + <cd:command name="dotripleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1111,7 +1111,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadrupleargument" file="syst-aux.mkiv"> + <cd:command name="doquadrupleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1121,7 +1121,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintupleargument" file="syst-aux.mkiv"> + <cd:command name="doquintupleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1132,7 +1132,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosixtupleargument" file="syst-aux.mkiv"> + <cd:command name="dosixtupleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1144,7 +1144,7 @@ </cd:arguments> </cd:command> - <cd:command name="doseventupleargument" file="syst-aux.mkiv"> + <cd:command name="doseventupleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1157,13 +1157,13 @@ </cd:arguments> </cd:command> - <cd:command name="strippedcsname" file="syst-aux.mkiv"> + <cd:command name="strippedcsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="strippedcsname" variant="string" file="syst-aux.mkiv"> + <cd:command name="strippedcsname" variant="string" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -1171,13 +1171,13 @@ </cd:arguments> </cd:command> - <cd:command name="complexorsimple" file="syst-aux.mkiv"> + <cd:command name="complexorsimple" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="complexorsimple" variant="argument" file="syst-aux.mkiv"> + <cd:command name="complexorsimple" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1186,13 +1186,13 @@ </cd:arguments> </cd:command> - <cd:command name="complexorsimpleempty" file="syst-aux.mkiv"> + <cd:command name="complexorsimpleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="complexorsimpleempty" variant="argument" file="syst-aux.mkiv"> + <cd:command name="complexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1201,13 +1201,13 @@ </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimple" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimple" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimple" variant="argument" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimple" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1216,13 +1216,13 @@ </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimpleempty" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimpleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimpleempty" variant="argument" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1231,18 +1231,18 @@ </cd:arguments> </cd:command> - <cd:command name="permitspacesbetweengroups" file="syst-aux.mkiv"/> + <cd:command name="permitspacesbetweengroups" level="system" file="syst-aux.mkiv"/> - <cd:command name="dontpermitspacesbetweengroups" file="syst-aux.mkiv"/> + <cd:command name="dontpermitspacesbetweengroups" level="system" file="syst-aux.mkiv"/> - <cd:command name="dosinglegroupempty" file="syst-aux.mkiv"> + <cd:command name="dosinglegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dodoublegroupempty" file="syst-aux.mkiv"> + <cd:command name="dodoublegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1250,7 +1250,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotriplegroupempty" file="syst-aux.mkiv"> + <cd:command name="dotriplegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1259,7 +1259,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadruplegroupempty" file="syst-aux.mkiv"> + <cd:command name="doquadruplegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1269,7 +1269,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintuplegroupempty" file="syst-aux.mkiv"> + <cd:command name="doquintuplegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1280,27 +1280,27 @@ </cd:arguments> </cd:command> - <cd:command name="firstofoneargument" file="syst-aux.mkiv"> + <cd:command name="firstofoneargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstoftwoarguments" file="syst-aux.mkiv"> + <cd:command name="firstoftwoarguments" level="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" file="syst-aux.mkiv"> + <cd:command name="secondoftwoarguments" level="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" file="syst-aux.mkiv"> + <cd:command name="firstofthreearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1308,7 +1308,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofthreearguments" file="syst-aux.mkiv"> + <cd:command name="secondofthreearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1316,7 +1316,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofthreearguments" file="syst-aux.mkiv"> + <cd:command name="thirdofthreearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1324,7 +1324,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstoffourarguments" file="syst-aux.mkiv"> + <cd:command name="firstoffourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1333,7 +1333,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondoffourarguments" file="syst-aux.mkiv"> + <cd:command name="secondoffourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1342,7 +1342,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdoffourarguments" file="syst-aux.mkiv"> + <cd:command name="thirdoffourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1351,7 +1351,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthoffourarguments" file="syst-aux.mkiv"> + <cd:command name="fourthoffourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1360,7 +1360,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstoffivearguments" file="syst-aux.mkiv"> + <cd:command name="firstoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1370,7 +1370,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondoffivearguments" file="syst-aux.mkiv"> + <cd:command name="secondoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1380,7 +1380,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdoffivearguments" file="syst-aux.mkiv"> + <cd:command name="thirdoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1390,7 +1390,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthoffivearguments" file="syst-aux.mkiv"> + <cd:command name="fourthoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1400,7 +1400,7 @@ </cd:arguments> </cd:command> - <cd:command name="fifthoffivearguments" file="syst-aux.mkiv"> + <cd:command name="fifthoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1410,7 +1410,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstofsixarguments" file="syst-aux.mkiv"> + <cd:command name="firstofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1421,7 +1421,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofsixarguments" file="syst-aux.mkiv"> + <cd:command name="secondofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1432,7 +1432,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofsixarguments" file="syst-aux.mkiv"> + <cd:command name="thirdofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1443,7 +1443,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthofsixarguments" file="syst-aux.mkiv"> + <cd:command name="fourthofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1454,7 +1454,7 @@ </cd:arguments> </cd:command> - <cd:command name="fifthofsixarguments" file="syst-aux.mkiv"> + <cd:command name="fifthofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1465,7 +1465,7 @@ </cd:arguments> </cd:command> - <cd:command name="sixthofsixarguments" file="syst-aux.mkiv"> + <cd:command name="sixthofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1476,27 +1476,27 @@ </cd:arguments> </cd:command> - <cd:command name="firstofoneunexpanded" file="syst-aux.mkiv"> + <cd:command name="firstofoneunexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstoftwounexpanded" file="syst-aux.mkiv"> + <cd:command name="firstoftwounexpanded" level="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" file="syst-aux.mkiv"> + <cd:command name="secondoftwounexpanded" level="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" file="syst-aux.mkiv"> + <cd:command name="firstofthreeunexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1504,7 +1504,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofthreeunexpanded" file="syst-aux.mkiv"> + <cd:command name="secondofthreeunexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1512,7 +1512,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofthreeunexpanded" file="syst-aux.mkiv"> + <cd:command name="thirdofthreeunexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1520,56 +1520,56 @@ </cd:arguments> </cd:command> - <cd:command name="letempty" file="syst-aux.mkiv"> + <cd:command name="letempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalletempty" file="syst-aux.mkiv"> + <cd:command name="globalletempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="letvalueempty" file="syst-aux.mkiv"> + <cd:command name="letvalueempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letgvalueempty" file="syst-aux.mkiv"> + <cd:command name="letgvalueempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letvaluerelax" file="syst-aux.mkiv"> + <cd:command name="letvaluerelax" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letgvalurelax" file="syst-aux.mkiv"> + <cd:command name="letgvalurelax" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="relaxvalueifundefined" file="syst-aux.mkiv"> + <cd:command name="relaxvalueifundefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="rawgetparameters" file="syst-aux.mkiv"> + <cd:command name="rawgetparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="texdefinition" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="spaces"/> @@ -1584,6 +1584,20 @@ <cd:keywords delimiters="none" optional="yes"> <cd:constant type="expanded"/> </cd:keywords> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="singleempty"/> + <cd:constant type="doubleempty"/> + <cd:constant type="tripleempty"/> + <cd:constant type="quadrupleempty"/> + <cd:constant type="quintupleempty"/> + <cd:constant type="sixtupleempty"/> + <cd:constant type="singleargument"/> + <cd:constant type="doubleargument"/> + <cd:constant type="tripleargument"/> + <cd:constant type="quadrupleargument"/> + <cd:constant type="quintupleargument"/> + <cd:constant type="sixtupleargument"/> + </cd:keywords> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> @@ -1593,39 +1607,39 @@ </cd:arguments> </cd:command> - <cd:command name="texdefinition" file="syst-aux.mkiv"> + <cd:command name="texdefinition" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="texcode" type="environment" file="syst-aux.mkiv"/> + <cd:command name="texcode" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="newcounter" file="syst-aux.mkiv"> + <cd:command name="newcounter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fastincrement" file="syst-aux.mkiv"> + <cd:command name="fastincrement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fastdecrement" file="syst-aux.mkiv"> + <cd:command name="fastdecrement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="increment" file="syst-aux.mkiv"> + <cd:command name="increment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="increment" variant="argument" file="syst-aux.mkiv"> + <cd:command name="increment" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" list="yes"> <cd:constant type="cd:csname"/> @@ -1634,13 +1648,13 @@ </cd:arguments> </cd:command> - <cd:command name="decrement" file="syst-aux.mkiv"> + <cd:command name="decrement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="decrement" variant="argument" file="syst-aux.mkiv"> + <cd:command name="decrement" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" list="yes"> <cd:constant type="cd:csname"/> @@ -1649,47 +1663,49 @@ </cd:arguments> </cd:command> - <cd:command name="incrementvalue" file="syst-aux.mkiv"> + <cd:command name="incrementvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="decrementvalue" file="syst-aux.mkiv"> + <cd:command name="decrementvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="newsignal" file="syst-aux.mkiv"> + <cd:command name="newsignal" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="checkedstrippedcsname" file="syst-aux.mkiv"> + <cd:command name="checkedstrippedcsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="checkedstrippedcsname" variant="string" file="syst-aux.mkiv"> + <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" file="syst-aux.mkiv"> + <cd:command name="savenormalmeaning" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="recursedepth" file="syst-aux.mkiv"/> + <cd:command name="recursedepth" level="system" file="syst-aux.mkiv"/> - <cd:command name="recurselevel" file="syst-aux.mkiv"/> + <cd:command name="recurselevel" level="system" file="syst-aux.mkiv"/> - <cd:command name="dostepwiserecurse" file="syst-aux.mkiv"> + <cd:command name="resetrecurselevel" level="system" file="syst-aux.mkiv"/> + + <cd:command name="dostepwiserecurse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -1700,75 +1716,79 @@ </cd:arguments> </cd:command> - <cd:command name="dorecurse" file="syst-aux.mkiv"> + <cd:command name="dorecurse" level="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" file="syst-aux.mkiv"> + <cd:command name="doexpandedrecurse" level="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" file="syst-aux.mkiv"> + <cd:command name="dowith" level="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" file="syst-aux.mkiv"> + <cd:command name="doloop" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="exitloop" file="syst-aux.mkiv"/> + <cd:command name="exitloop" level="system" file="syst-aux.mkiv"/> - <cd:command name="exitloopnow" file="syst-aux.mkiv"/> + <cd:command name="exitloopnow" level="system" file="syst-aux.mkiv"/> - <cd:command name="dorecurse" file="syst-aux.mkiv"> + <cd:command name="dofastloopcs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doloopoverlist" file="syst-aux.mkiv"> + <cd:command name="fastloopindex" level="system" file="syst-aux.mkiv"/> + + <cd:command name="fastloopfinal" level="system" file="syst-aux.mkiv"/> + + <cd:command name="doloopoverlist" level="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" file="syst-aux.mkiv"/> + <cd:command name="recursestring" level="system" file="syst-aux.mkiv"/> - <cd:command name="newevery" file="syst-aux.mkiv"> + <cd:command name="newevery" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="EveryPar" file="syst-aux.mkiv"> + <cd:command name="EveryPar" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="EveryLine" file="syst-aux.mkiv"> + <cd:command name="EveryLine" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="forgeteverypar" file="syst-aux.mkiv"/> + <cd:command name="forgeteverypar" level="system" file="syst-aux.mkiv"/> - <cd:command name="convertvalue" file="syst-aux.mkiv"> + <cd:command name="convertvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:delimiter name="to"/> @@ -1776,14 +1796,14 @@ </cd:arguments> </cd:command> - <cd:command name="defconvertedvalue" file="syst-aux.mkiv"> + <cd:command name="defconvertedvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseassignment" file="syst-aux.mkiv"> + <cd:command name="doifelseassignment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -1791,7 +1811,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifassignmentelse" file="syst-aux.mkiv"> + <cd:command name="doifassignmentelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -1799,13 +1819,13 @@ </cd:arguments> </cd:command> - <cd:command name="docheckassignment" file="syst-aux.mkiv"> + <cd:command name="docheckassignment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ifassignment" file="syst-aux.mkiv"> + <cd:command name="ifassignment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -1814,7 +1834,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertargument" file="syst-aux.mkiv"> + <cd:command name="convertargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -1822,7 +1842,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertcommand" file="syst-aux.mkiv"> + <cd:command name="convertcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:delimiter name="to"/> @@ -1830,55 +1850,55 @@ </cd:arguments> </cd:command> - <cd:command name="defconvertedargument" file="syst-aux.mkiv"> + <cd:command name="defconvertedargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="defconvertedcommand" file="syst-aux.mkiv"> + <cd:command name="defconvertedcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="edefconvertedargument" file="syst-aux.mkiv"> + <cd:command name="edefconvertedargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="gdefconvertedargument" file="syst-aux.mkiv"> + <cd:command name="gdefconvertedargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="gdefconvertedcommand" file="syst-aux.mkiv"> + <cd:command name="gdefconvertedcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="xdefconvertedargument" file="syst-aux.mkiv"> + <cd:command name="xdefconvertedargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showvalue" file="syst-aux.mkiv"> + <cd:command name="showvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemeaning" file="syst-aux.mkiv"> + <cd:command name="doifelsemeaning" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1887,7 +1907,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmeaningelse" file="syst-aux.mkiv"> + <cd:command name="doifmeaningelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1896,7 +1916,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesamestring" file="syst-aux.mkiv"> + <cd:command name="doifelsesamestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1905,7 +1925,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsamestringelse" file="syst-aux.mkiv"> + <cd:command name="doifsamestringelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1914,7 +1934,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsamestring" file="syst-aux.mkiv"> + <cd:command name="doifsamestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1922,7 +1942,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotsamestring" file="syst-aux.mkiv"> + <cd:command name="doifnotsamestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1930,7 +1950,7 @@ </cd:arguments> </cd:command> - <cd:command name="ConvertToConstant" file="syst-aux.mkiv"> + <cd:command name="ConvertToConstant" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -1938,7 +1958,7 @@ </cd:arguments> </cd:command> - <cd:command name="ConvertConstantAfter" file="syst-aux.mkiv"> + <cd:command name="ConvertConstantAfter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -1946,61 +1966,61 @@ </cd:arguments> </cd:command> - <cd:command name="assignifempty" file="syst-aux.mkiv"> + <cd:command name="assignifempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="grabuntil" file="syst-aux.mkiv"> + <cd:command name="grabuntil" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processbetween" file="syst-aux.mkiv"> + <cd:command name="processbetween" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="gobbleuntil" file="syst-aux.mkiv"> + <cd:command name="gobbleuntil" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="gobbleuntilrelax" file="syst-aux.mkiv"> + <cd:command name="gobbleuntilrelax" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="relax"/> </cd:arguments> </cd:command> - <cd:command name="processuntil" file="syst-aux.mkiv"> + <cd:command name="processuntil" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="groupedcommand" file="syst-aux.mkiv"> + <cd:command name="groupedcommand" level="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" file="syst-aux.mkiv"> + <cd:command name="simplegroupedcommand" level="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" file="syst-aux.mkiv"> + <cd:command name="pickupgroupedcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2008,35 +2028,35 @@ </cd:arguments> </cd:command> - <cd:command name="BeforePar" file="syst-aux.mkiv"> + <cd:command name="BeforePar" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="AfterPar" file="syst-aux.mkiv"> + <cd:command name="AfterPar" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="GetPar" file="syst-aux.mkiv"/> + <cd:command name="GetPar" level="system" file="syst-aux.mkiv"/> - <cd:command name="GotoPar" file="syst-aux.mkiv"/> + <cd:command name="GotoPar" level="system" file="syst-aux.mkiv"/> - <cd:command name="dowithpargument" file="syst-aux.mkiv"> + <cd:command name="dowithpargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dowithwargument" file="syst-aux.mkiv"> + <cd:command name="dowithwargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dorepeatwithcommand" file="syst-aux.mkiv"> + <cd:command name="dorepeatwithcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -2046,7 +2066,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsestringinstring" file="syst-aux.mkiv"> + <cd:command name="doifelsestringinstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2055,7 +2075,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifstringinstringelse" file="syst-aux.mkiv"> + <cd:command name="doifstringinstringelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2064,7 +2084,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendtoks" file="syst-aux.mkiv"> + <cd:command name="appendtoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2072,7 +2092,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependtoks" file="syst-aux.mkiv"> + <cd:command name="prependtoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2080,7 +2100,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendtoksonce" file="syst-aux.mkiv"> + <cd:command name="appendtoksonce" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2088,7 +2108,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependtoksonce" file="syst-aux.mkiv"> + <cd:command name="prependtoksonce" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2096,7 +2116,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseintoks" file="syst-aux.mkiv"> + <cd:command name="doifelseintoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2105,7 +2125,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifintokselse" file="syst-aux.mkiv"> + <cd:command name="doifintokselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2114,25 +2134,25 @@ </cd:arguments> </cd:command> - <cd:command name="collecting" type="environment" file="syst-aux.mkiv"/> + <cd:command name="collecting" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="collect" type="environment" file="syst-aux.mkiv"/> + <cd:command name="collect" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="expandedcollect" type="environment" file="syst-aux.mkiv"/> + <cd:command name="expandedcollect" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="collect" file="syst-aux.mkiv"> + <cd:command name="collect" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="collectexpanded" file="syst-aux.mkiv"> + <cd:command name="collectexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="removetoks" file="syst-aux.mkiv"> + <cd:command name="removetoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="from"/> @@ -2140,7 +2160,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendetoks" file="syst-aux.mkiv"> + <cd:command name="appendetoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2148,7 +2168,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependetoks" file="syst-aux.mkiv"> + <cd:command name="prependetoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2156,19 +2176,19 @@ </cd:arguments> </cd:command> - <cd:command name="flushtoks" file="syst-aux.mkiv"> + <cd:command name="flushtoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dotoks" file="syst-aux.mkiv"> + <cd:command name="dotoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="beforesplitstring" file="syst-aux.mkiv"> + <cd:command name="beforesplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2178,7 +2198,7 @@ </cd:arguments> </cd:command> - <cd:command name="aftersplitstring" file="syst-aux.mkiv"> + <cd:command name="aftersplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2188,7 +2208,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitstring" file="syst-aux.mkiv"> + <cd:command name="splitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2200,7 +2220,7 @@ </cd:arguments> </cd:command> - <cd:command name="greedysplitstring" file="syst-aux.mkiv"> + <cd:command name="greedysplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2212,7 +2232,7 @@ </cd:arguments> </cd:command> - <cd:command name="beforetestandsplitstring" file="syst-aux.mkiv"> + <cd:command name="beforetestandsplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2222,7 +2242,7 @@ </cd:arguments> </cd:command> - <cd:command name="aftertestandsplitstring" file="syst-aux.mkiv"> + <cd:command name="aftertestandsplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2232,7 +2252,7 @@ </cd:arguments> </cd:command> - <cd:command name="testandsplitstring" file="syst-aux.mkiv"> + <cd:command name="testandsplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2244,7 +2264,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcolon" file="syst-aux.mkiv"> + <cd:command name="splitatperiod" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2252,7 +2272,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcomma" file="syst-aux.mkiv"> + <cd:command name="splitatcomma" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2260,7 +2280,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatasterisk" file="syst-aux.mkiv"> + <cd:command name="splitatasterisk" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2268,7 +2288,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcolon" file="syst-aux.mkiv"> + <cd:command name="splitatcolon" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2276,7 +2296,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcolons" file="syst-aux.mkiv"> + <cd:command name="splitatcolons" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2284,7 +2304,7 @@ </cd:arguments> </cd:command> - <cd:command name="removesubstring" file="syst-aux.mkiv"> + <cd:command name="removesubstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="from"/> @@ -2294,81 +2314,81 @@ </cd:arguments> </cd:command> - <cd:command name="appendtocommalist" file="syst-aux.mkiv"> + <cd:command name="appendtocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="prependtocommalist" file="syst-aux.mkiv"> + <cd:command name="prependtocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="addtocommalist" file="syst-aux.mkiv"> + <cd:command name="addtocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="pretocommalist" file="syst-aux.mkiv"> + <cd:command name="pretocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="robustdoifelseinset" file="syst-aux.mkiv"> + <cd:command name="robustdoifelseinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="robustdoifinsetelse" file="syst-aux.mkiv"> + <cd:command name="robustdoifinsetelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="robustaddtocommalist" file="syst-aux.mkiv"> + <cd:command name="robustaddtocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="robustpretocommalist" file="syst-aux.mkiv"> + <cd:command name="robustpretocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="xsplitstring" file="syst-aux.mkiv"> + <cd:command name="xsplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="removefromcommalist" file="syst-aux.mkiv"> + <cd:command name="removefromcommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="substituteincommalist" file="syst-aux.mkiv"> + <cd:command name="substituteincommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2376,14 +2396,14 @@ </cd:arguments> </cd:command> - <cd:command name="replaceincommalist" file="syst-aux.mkiv"> + <cd:command name="replaceincommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="globalprocesscommalist" file="syst-aux.mkiv"> + <cd:command name="globalprocesscommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -2392,112 +2412,112 @@ </cd:arguments> </cd:command> - <cd:command name="withoutpt" file="syst-aux.mkiv"> + <cd:command name="withoutpt" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="PtToCm" file="syst-aux.mkiv"> + <cd:command name="PtToCm" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="dimensiontocount" file="syst-aux.mkiv"> + <cd:command name="dimensiontocount" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="numberofpoints" file="syst-aux.mkiv"> + <cd:command name="numberofpoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="swapdimens" file="syst-aux.mkiv"> + <cd:command name="swapdimens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="swapcounts" file="syst-aux.mkiv"> + <cd:command name="swapcounts" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="swapmacros" file="syst-aux.mkiv"> + <cd:command name="swapmacros" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapdimens" file="syst-aux.mkiv"> + <cd:command name="globalswapdimens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapcounts" file="syst-aux.mkiv"> + <cd:command name="globalswapcounts" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapmacros" file="syst-aux.mkiv"> + <cd:command name="globalswapmacros" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalpushmacro" file="syst-aux.mkiv"> + <cd:command name="globalpushmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="localpushmacro" file="syst-aux.mkiv"> + <cd:command name="localpushmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalpopmacro" file="syst-aux.mkiv"> + <cd:command name="globalpopmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="localpopmacro" file="syst-aux.mkiv"> + <cd:command name="localpopmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="pushmacro" file="syst-aux.mkiv"> + <cd:command name="pushmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="popmacro" file="syst-aux.mkiv"> + <cd:command name="popmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="localhsize" file="syst-aux.mkiv"/> + <cd:command name="localhsize" level="system" file="syst-aux.mkiv"/> - <cd:command name="setlocalhsize" file="syst-aux.mkiv"> + <cd:command name="setlocalhsize" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:dimension" prefix="cd:sign" method="none"/> @@ -2505,9 +2525,9 @@ </cd:arguments> </cd:command> - <cd:command name="availablehsize" file="syst-aux.mkiv"/> + <cd:command name="availablehsize" level="system" file="syst-aux.mkiv"/> - <cd:command name="distributedhsize" file="syst-aux.mkiv"> + <cd:command name="distributedhsize" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -2515,14 +2535,14 @@ </cd:arguments> </cd:command> - <cd:command name="hsizefraction" file="syst-aux.mkiv"> + <cd:command name="hsizefraction" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="doifvalue" file="syst-aux.mkiv"> + <cd:command name="doifvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2530,7 +2550,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotvalue" file="syst-aux.mkiv"> + <cd:command name="doifnotvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2538,7 +2558,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsevalue" file="syst-aux.mkiv"> + <cd:command name="doifelsevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2547,7 +2567,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvalueelse" file="syst-aux.mkiv"> + <cd:command name="doifvalueelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2556,21 +2576,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifnothing" file="syst-aux.mkiv"> + <cd:command name="doifnothing" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifsomething" file="syst-aux.mkiv"> + <cd:command name="doifsomething" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenothing" file="syst-aux.mkiv"> + <cd:command name="doifelsenothing" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2578,7 +2598,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnothingelse" file="syst-aux.mkiv"> + <cd:command name="doifnothingelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2586,7 +2606,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesomething" file="syst-aux.mkiv"> + <cd:command name="doifelsesomething" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2594,7 +2614,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomethingelse" file="syst-aux.mkiv"> + <cd:command name="doifsomethingelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2602,21 +2622,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifvaluenothing" file="syst-aux.mkiv"> + <cd:command name="doifvaluenothing" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifvaluesomething" file="syst-aux.mkiv"> + <cd:command name="doifvaluesomething" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsevaluenothing" file="syst-aux.mkiv"> + <cd:command name="doifelsevaluenothing" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2624,7 +2644,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvaluenothingelse" file="syst-aux.mkiv"> + <cd:command name="doifvaluenothingelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2632,7 +2652,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseemptyvalue" file="syst-aux.mkiv"> + <cd:command name="doifelseemptyvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2640,7 +2660,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvalueelse" file="syst-aux.mkiv"> + <cd:command name="doifemptyvalueelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2648,55 +2668,55 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvalue" file="syst-aux.mkiv"> + <cd:command name="doifemptyvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotemptyvalue" file="syst-aux.mkiv"> + <cd:command name="doifnotemptyvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelseallcommon" file="syst-aux.mkiv"> + <cd:command name="doifelseallcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifallcommonelse" file="syst-aux.mkiv"> + <cd:command name="doifallcommonelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifallcommon" file="syst-aux.mkiv"> + <cd:command name="doifallcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotallcommon" file="syst-aux.mkiv"> + <cd:command name="doifnotallcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="dodoubleemptywithset" file="syst-aux.mkiv"> + <cd:command name="dodoubleemptywithset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list-optional"/> @@ -2704,7 +2724,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleemptywithset" file="syst-aux.mkiv"> + <cd:command name="dotripleemptywithset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list-optional"/> @@ -2713,7 +2733,7 @@ </cd:arguments> </cd:command> - <cd:command name="dodoubleargumentwithset" file="syst-aux.mkiv"> + <cd:command name="dodoubleargumentwithset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list"/> @@ -2721,7 +2741,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleargumentwithset" file="syst-aux.mkiv"> + <cd:command name="dotripleargumentwithset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list"/> @@ -2730,7 +2750,7 @@ </cd:arguments> </cd:command> - <cd:command name="stripcharacter" file="syst-aux.mkiv"> + <cd:command name="stripcharacter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:delimiter name="from"/> @@ -2740,7 +2760,7 @@ </cd:arguments> </cd:command> - <cd:command name="stripspaces" file="syst-aux.mkiv"> + <cd:command name="stripspaces" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="from"/> <cd:resolve name="string-text"/> @@ -2749,7 +2769,7 @@ </cd:arguments> </cd:command> - <cd:command name="unspacestring" file="syst-aux.mkiv"> + <cd:command name="unspacestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2757,14 +2777,14 @@ </cd:arguments> </cd:command> - <cd:command name="executeifdefined" file="syst-aux.mkiv"> + <cd:command name="executeifdefined" level="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" file="syst-aux.mkiv"> + <cd:command name="doifelsesomespace" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2772,7 +2792,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomespaceelse" file="syst-aux.mkiv"> + <cd:command name="doifsomespaceelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2780,7 +2800,7 @@ </cd:arguments> </cd:command> - <cd:command name="processseparatedlist" file="syst-aux.mkiv"> + <cd:command name="processseparatedlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> @@ -2791,7 +2811,7 @@ </cd:arguments> </cd:command> - <cd:command name="processlist" file="syst-aux.mkiv"> + <cd:command name="processlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> @@ -2800,14 +2820,14 @@ </cd:arguments> </cd:command> - <cd:command name="processassignlist" file="syst-aux.mkiv"> + <cd:command name="processassignlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="untexargument" file="syst-aux.mkiv"> + <cd:command name="untexargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:delimiter name="to"/> @@ -2815,7 +2835,7 @@ </cd:arguments> </cd:command> - <cd:command name="untexcommand" file="syst-aux.mkiv"> + <cd:command name="untexcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-csname"/> <cd:delimiter name="to"/> @@ -2823,56 +2843,56 @@ </cd:arguments> </cd:command> - <cd:command name="PointsToBigPoints" file="syst-aux.mkiv"> + <cd:command name="PointsToBigPoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="PointsToWholeBigPoints" file="syst-aux.mkiv"> + <cd:command name="PointsToWholeBigPoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ScaledPointsToBigPoints" file="syst-aux.mkiv"> + <cd:command name="ScaledPointsToBigPoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ScaledPointsToWholeBigPoints" file="syst-aux.mkiv"> + <cd:command name="ScaledPointsToWholeBigPoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="PointsToReal" file="syst-aux.mkiv"> + <cd:command name="PointsToReal" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dontleavehmode" file="syst-aux.mkiv"/> + <cd:command name="dontleavehmode" level="style" file="syst-aux.mkiv"/> - <cd:command name="utfupper" file="syst-aux.mkiv"> + <cd:command name="utfupper" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="utflower" file="syst-aux.mkiv"> + <cd:command name="utflower" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="uppercasestring" file="syst-aux.mkiv"> + <cd:command name="uppercasestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2880,7 +2900,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowercasestring" file="syst-aux.mkiv"> + <cd:command name="lowercasestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2888,7 +2908,7 @@ </cd:arguments> </cd:command> - <cd:command name="counttoken" file="syst-aux.mkiv"> + <cd:command name="counttoken" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="in"/> @@ -2898,7 +2918,7 @@ </cd:arguments> </cd:command> - <cd:command name="counttokens" file="syst-aux.mkiv"> + <cd:command name="counttokens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2906,7 +2926,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitofftokens" file="syst-aux.mkiv"> + <cd:command name="splitofftokens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="from"/> @@ -2916,7 +2936,7 @@ </cd:arguments> </cd:command> - <cd:command name="handletokens" file="syst-aux.mkiv"> + <cd:command name="handletokens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="with"/> @@ -2924,11 +2944,11 @@ </cd:arguments> </cd:command> - <cd:command name="settrialtypesetting" file="syst-aux.mkiv"/> + <cd:command name="settrialtypesetting" level="system" file="syst-aux.mkiv"/> - <cd:command name="resettrialtypesetting" file="syst-aux.mkiv"/> + <cd:command name="resettrialtypesetting" level="system" file="syst-aux.mkiv"/> - <cd:command name="iftrialtypesetting" file="syst-aux.mkiv"> + <cd:command name="iftrialtypesetting" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -2937,64 +2957,64 @@ </cd:arguments> </cd:command> - <cd:command name="integerrounding" file="syst-aux.mkiv"> + <cd:command name="integerrounding" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="onedigitrounding" file="syst-aux.mkiv"> + <cd:command name="onedigitrounding" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="twodigitrounding" file="syst-aux.mkiv"> + <cd:command name="twodigitrounding" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="threedigitrounding" file="syst-aux.mkiv"> + <cd:command name="threedigitrounding" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="processcontent" file="syst-aux.mkiv"> + <cd:command name="processcontent" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dogobblesingleempty" file="syst-aux.mkiv"> + <cd:command name="dogobblesingleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dogobbledoubleempty" file="syst-aux.mkiv"> + <cd:command name="dogobbledoubleempty" level="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" file="syst-aux.mkiv"> + <cd:command name="gobblesingleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="gobbledoubleempty" file="syst-aux.mkiv"> + <cd:command name="gobbledoubleempty" level="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" file="syst-aux.mkiv"> + <cd:command name="doifelsesometoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> @@ -3002,7 +3022,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsometokselse" file="syst-aux.mkiv"> + <cd:command name="doifsometokselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> @@ -3010,71 +3030,71 @@ </cd:arguments> </cd:command> - <cd:command name="doifsometoks" file="syst-aux.mkiv"> + <cd:command name="doifsometoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifemptytoks" file="syst-aux.mkiv"> + <cd:command name="doifemptytoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="strictinspectnextcharacter" type="environment" file="syst-aux.mkiv"/> + <cd:command name="strictinspectnextcharacter" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="strictdoifelsenextoptional" file="syst-aux.mkiv"> + <cd:command name="strictdoifelsenextoptional" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="strictdoifnextoptionalelse" file="syst-aux.mkiv"> + <cd:command name="strictdoifnextoptionalelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="gobblespacetokens" file="syst-aux.mkiv"/> + <cd:command name="gobblespacetokens" level="system" file="syst-aux.mkiv"/> - <cd:command name="verbatimstring" file="syst-aux.mkiv"> + <cd:command name="verbatimstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lastdigit" file="syst-aux.mkiv"> + <cd:command name="lastdigit" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="lasttwodigits" file="syst-aux.mkiv"> + <cd:command name="lasttwodigits" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="serializedcommalist" file="syst-aux.mkiv"/> + <cd:command name="serializedcommalist" level="system" file="syst-aux.mkiv"/> - <cd:command name="serializecommalist" file="syst-aux.mkiv"> + <cd:command name="serializecommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="purenumber" file="syst-aux.mkiv"> + <cd:command name="purenumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="filterfromvalue" file="syst-aux.mkiv"> + <cd:command name="filterfromvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -3082,73 +3102,73 @@ </cd:arguments> </cd:command> - <cd:command name="filterfromnext" file="syst-aux.mkiv"> + <cd:command name="filterfromnext" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> - <cd:resolve name="argument-content-optional"/> - <cd:resolve name="argument-content-optional"/> - <cd:resolve name="argument-content-optional"/> - <cd:resolve name="argument-content-optional"/> - <cd:resolve name="argument-content-optional"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> </cd:arguments> </cd:command> - <cd:command name="definemeasure" file="syst-aux.mkiv"> + <cd:command name="definemeasure" level="style" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="freezemeasure" file="syst-aux.mkiv"> + <cd:command name="freezemeasure" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setmeasure" file="syst-aux.mkiv"> + <cd:command name="setmeasure" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setgmeasure" file="syst-aux.mkiv"> + <cd:command name="setgmeasure" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setemeasure" file="syst-aux.mkiv"> + <cd:command name="setemeasure" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setxmeasure" file="syst-aux.mkiv"> + <cd:command name="setxmeasure" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="measure" file="syst-aux.mkiv"> + <cd:command name="measure" level="style" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="measured" file="syst-aux.mkiv"> + <cd:command name="measured" level="style" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dividedsize" file="syst-aux.mkiv"> + <cd:command name="dividedsize" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -3156,7 +3176,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedimension" file="syst-aux.mkiv"> + <cd:command name="doifelsedimension" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3164,7 +3184,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdimensionelse" file="syst-aux.mkiv"> + <cd:command name="doifdimensionelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3172,7 +3192,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedimenstring" file="syst-aux.mkiv"> + <cd:command name="doifelsedimenstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3180,7 +3200,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdimenstringelse" file="syst-aux.mkiv"> + <cd:command name="doifdimenstringelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3188,23 +3208,23 @@ </cd:arguments> </cd:command> - <cd:command name="compresult" file="syst-aux.mkiv"/> + <cd:command name="compresult" level="system" file="syst-aux.mkiv"/> - <cd:command name="comparedimension" file="syst-aux.mkiv"> + <cd:command name="comparedimension" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="comparedimensioneps" file="syst-aux.mkiv"> + <cd:command name="comparedimensioneps" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="letcscsname" file="syst-aux.mkiv"> + <cd:command name="letcscsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:delimiter name="csname"/> @@ -3213,7 +3233,7 @@ </cd:arguments> </cd:command> - <cd:command name="letcsnamecs" file="syst-aux.mkiv"> + <cd:command name="letcsnamecs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="csname"/> <cd:resolve name="string-name"/> @@ -3222,7 +3242,7 @@ </cd:arguments> </cd:command> - <cd:command name="letcsnamecsname" file="syst-aux.mkiv"> + <cd:command name="letcsnamecsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="csname"/> <cd:resolve name="string-name"/> @@ -3233,20 +3253,20 @@ </cd:arguments> </cd:command> - <cd:command name="addvalue" file="syst-aux.mkiv"> + <cd:command name="addvalue" level="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" file="syst-aux.mkiv"> + <cd:command name="unspaced" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="unspaceargument" file="syst-aux.mkiv"> + <cd:command name="unspaceargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -3254,14 +3274,14 @@ </cd:arguments> </cd:command> - <cd:command name="unspaceafter" file="syst-aux.mkiv"> + <cd:command name="unspaceafter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelsehasspace" file="syst-aux.mkiv"> + <cd:command name="doifelsehasspace" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3269,7 +3289,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifhasspaceelse" file="syst-aux.mkiv"> + <cd:command name="doifhasspaceelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3277,25 +3297,25 @@ </cd:arguments> </cd:command> - <cd:command name="setflag" file="syst-aux.mkiv"> + <cd:command name="setflag" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetflag" file="syst-aux.mkiv"> + <cd:command name="resetflag" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="flag" file="syst-aux.mkiv"> + <cd:command name="flag" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseflagged" file="syst-aux.mkiv"> + <cd:command name="doifelseflagged" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -3303,7 +3323,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifflaggedelse" file="syst-aux.mkiv"> + <cd:command name="doifflaggedelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -3311,14 +3331,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotflagged" file="syst-aux.mkiv"> + <cd:command name="doifnotflagged" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="inheritparameter" file="syst-aux.mkiv"> + <cd:command name="inheritparameter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> @@ -3326,7 +3346,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsenonzeropositive" file="syst-aux.mkiv"> + <cd:command name="doifelsenonzeropositive" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -3334,7 +3354,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnonzeropositiveelse" file="syst-aux.mkiv"> + <cd:command name="doifnonzeropositiveelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -3342,118 +3362,118 @@ </cd:arguments> </cd:command> - <cd:command name="getrawparameters" file="syst-aux.mkiv"> + <cd:command name="getrawparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="getraweparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="getrawgparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="getrawxparameters" level="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" file="syst-aux.mkiv"> + <cd:command name="unprotected" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="par"/> </cd:arguments> </cd:command> - <cd:command name="resettimer" file="syst-aux.mkiv"/> + <cd:command name="resettimer" level="system" file="syst-aux.mkiv"/> - <cd:command name="elapsedtime" file="syst-aux.mkiv"/> + <cd:command name="elapsedtime" level="system" file="syst-aux.mkiv"/> - <cd:command name="elapsedseconds" file="syst-aux.mkiv"/> + <cd:command name="elapsedseconds" level="system" file="syst-aux.mkiv"/> - <cd:command name="currentfeaturetest" file="syst-aux.mkiv"/> + <cd:command name="currentfeaturetest" level="system" file="syst-aux.mkiv"/> - <cd:command name="testfeature" file="syst-aux.mkiv"> + <cd:command name="testfeature" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> - <cd:resolve name="argument-content"/> + <cd:content/> </cd:arguments> </cd:command> - <cd:command name="showtimer" file="syst-aux.mkiv"> + <cd:command name="showtimer" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="testfeatureonce" file="syst-aux.mkiv"> + <cd:command name="testfeatureonce" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> - <cd:resolve name="argument-content"/> + <cd:content/> </cd:arguments> </cd:command> - <cd:command name="freezedimenmacro" file="syst-aux.mkiv"> + <cd:command name="freezedimenmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="negated" file="syst-aux.mkiv"> + <cd:command name="negated" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="assigndimen" file="syst-aux.mkiv"> + <cd:command name="assigndimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="appendvalue" file="syst-aux.mkiv"> + <cd:command name="appendvalue" level="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" file="syst-aux.mkiv"> + <cd:command name="appendgvalue" level="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" file="syst-aux.mkiv"> + <cd:command name="prependvalue" level="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" file="syst-aux.mkiv"> + <cd:command name="prependgvalue" level="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" file="syst-aux.mkiv"> + <cd:command name="processranges" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:number"/> @@ -3463,7 +3483,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithrange" file="syst-aux.mkiv"> + <cd:command name="dowithrange" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:number"/> @@ -3473,11 +3493,11 @@ </cd:arguments> </cd:command> - <cd:command name="ignoreimplicitspaces" file="syst-aux.mkiv"/> + <cd:command name="ignoreimplicitspaces" level="system" file="syst-aux.mkiv"/> - <cd:command name="nointerference" type="environment" file="syst-aux.mkiv"/> + <cd:command name="nointerference" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="expandcheckedcsname" file="syst-aux.mkiv"> + <cd:command name="expandcheckedcsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-key"/> @@ -3485,43 +3505,43 @@ </cd:arguments> </cd:command> - <cd:command name="docheckedpair" file="syst-aux.mkiv"> + <cd:command name="docheckedpair" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> </cd:arguments> </cd:command> - <cd:command name="constantnumber" file="syst-aux.mkiv"> + <cd:command name="constantnumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantnumberargument" file="syst-aux.mkiv"> + <cd:command name="constantnumberargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantdimen" file="syst-aux.mkiv"> + <cd:command name="constantdimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantdimenargument" file="syst-aux.mkiv"> + <cd:command name="constantdimenargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantemptyargument" file="syst-aux.mkiv"> + <cd:command name="constantemptyargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="getsubstring" file="syst-aux.mkiv"> + <cd:command name="getsubstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -3529,7 +3549,7 @@ </cd:arguments> </cd:command> - <cd:command name="converteddimen" file="syst-aux.mkiv"> + <cd:command name="converteddimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:keywords delimiters="braces"> @@ -3549,11 +3569,78 @@ </cd:arguments> </cd:command> - <cd:command name="ntimes" file="syst-aux.mkiv"> + <cd:command name="ntimes" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="expdoifelse" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoif" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifnot" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifelsecommon" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifcommonelse" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifelseinset" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifinsetelse" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="luaexpr" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-systemlog.xml b/tex/context/interface/mkiv/i-systemlog.xml index 02c4bece9..fc3243cfb 100644 --- a/tex/context/interface/mkiv/i-systemlog.xml +++ b/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" file="core-sys.mkiv"> + <cd:command name="systemlog" level="system" 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" file="core-sys.mkiv"> + <cd:command name="systemlogfirst" level="system" 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" file="core-sys.mkiv"> + <cd:command name="systemloglast" level="system" 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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-table.xml b/tex/context/interface/mkiv/i-table.xml index 950a9ff34..e59a9ca97 100644 --- a/tex/context/interface/mkiv/i-table.xml +++ b/tex/context/interface/mkiv/i-table.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="table" type="environment" file="tabl-tab.mkiv"> + <cd:command name="table" type="environment" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:template/> <cd:assignments list="yes" optional="yes"> @@ -13,7 +13,7 @@ </cd:arguments> </cd:command> - <cd:command name="table" type="environment" variant="name" file="tabl-tab.mkiv"> + <cd:command name="table" type="environment" variant="name" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetabletemplate" file="tabl-tab.mkiv"> + <cd:command name="definetabletemplate" level="style" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:template/> @@ -31,31 +31,31 @@ </cd:arguments> </cd:command> - <cd:command name="tables" type="environment" file="tabl-tab.mkiv"> + <cd:command name="tables" type="environment" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:template/> </cd:arguments> </cd:command> - <cd:command name="tables" type="environment" variant="name" file="tabl-tab.mkiv"> + <cd:command name="tables" type="environment" variant="name" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tablehead" type="environment" file="tabl-tab.mkiv"> + <cd:command name="tablehead" type="environment" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tabletail" type="environment" file="tabl-tab.mkiv"> + <cd:command name="tabletail" type="environment" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setuptables" file="tabl-tab.mkiv"> + <cd:command name="setuptables" level="style" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="text"> @@ -126,34 +126,34 @@ <!-- - <cd:command name="ReFormat" scope="table" file="tabl-tab.mkiv"> + <cd:command name="ReFormat" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-template"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="enlarge" scope="table" file="tabl-tab.mkiv"> + <cd:command name="enlarge" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Enlarge" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Enlarge" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="use" scope="table" file="tabl-tab.mkiv"> + <cd:command name="use" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Use" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Use" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="keyword-template"/> @@ -161,19 +161,19 @@ </cd:arguments> </cd:command> - <cd:command name="JustLeft" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="JustLeft" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="JustCenter" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="JustCenter" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="JustRight" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="JustRight" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="Smash" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Smash" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="Raise" variant="argument" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Raise" variant="argument" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" optional="yes"> <cd:constant type="cd:dimension"/> @@ -182,14 +182,14 @@ </cd:arguments> </cd:command> - <cd:command name="Raise" variant="string" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Raise" variant="string" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="string-number-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="Lower" variant="argument" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Lower" variant="argument" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" optional="yes"> <cd:constant type="cd:dimension"/> @@ -198,14 +198,14 @@ </cd:arguments> </cd:command> - <cd:command name="Lower" variant="string" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Lower" variant="string" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="string-number-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="BackSpace" variant="argument" scope="table" file="tabl-tab.mkiv"> + <cd:command name="BackSpace" variant="argument" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" optional="yes"> <cd:constant type="cd:dimension"/> @@ -213,13 +213,13 @@ </cd:arguments> </cd:command> - <cd:command name="BackSpace" variant="string" scope="table" file="tabl-tab.mkiv"> + <cd:command name="BackSpace" variant="string" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="string-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="Vspace" variant="argument" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Vspace" variant="argument" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" optional="yes"> <cd:constant type="cd:dimension"/> @@ -227,48 +227,48 @@ </cd:arguments> </cd:command> - <cd:command name="Vspace" variant="string" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Vspace" variant="string" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="string-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="OpenUp" scope="table" file="tabl-tab.mkiv"> + <cd:command name="OpenUp" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="TableLeft" scope="table" file="tabl-tab.mkiv"> + <cd:command name="TableLeft" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="TableCenter" scope="table" file="tabl-tab.mkiv"> + <cd:command name="TableCenter" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="TableRight" scope="table" file="tabl-tab.mkiv"> + <cd:command name="TableRight" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="SR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="SR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="FR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="FR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="MR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="MR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="LR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="LR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="AR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="AR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="VL" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VL" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -277,7 +277,7 @@ </cd:arguments> </cd:command> - <cd:command name="VC" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -286,7 +286,7 @@ </cd:arguments> </cd:command> - <cd:command name="HL" scope="table" file="tabl-tab.mkiv"> + <cd:command name="HL" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -295,7 +295,7 @@ </cd:arguments> </cd:command> - <cd:command name="HC" scope="table" file="tabl-tab.mkiv"> + <cd:command name="HC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -304,7 +304,7 @@ </cd:arguments> </cd:command> - <cd:command name="VS" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VS" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -313,7 +313,7 @@ </cd:arguments> </cd:command> - <cd:command name="VD" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VD" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -322,7 +322,7 @@ </cd:arguments> </cd:command> - <cd:command name="VT" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VT" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -331,7 +331,7 @@ </cd:arguments> </cd:command> - <cd:command name="VN" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VN" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:keywords list="yes" optional="yes"> @@ -341,7 +341,7 @@ </cd:arguments> </cd:command> - <cd:command name="TB" scope="table" file="tabl-tab.mkiv"> + <cd:command name="TB" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="blank"/> @@ -349,7 +349,7 @@ </cd:arguments> </cd:command> - <cd:command name="NL" scope="table" file="tabl-tab.mkiv"> + <cd:command name="NL" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="blank"/> @@ -357,17 +357,17 @@ </cd:arguments> </cd:command> - <cd:command name="NR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="NR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="NC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="NC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="FC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="FC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="MC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="MC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="LC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="LC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="DL" scope="table" file="tabl-tab.mkiv"> + <cd:command name="DL" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -376,29 +376,29 @@ </cd:arguments> </cd:command> - <cd:command name="DC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="DC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="DV" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="DV" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="DR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="DR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="TWO" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="TWO" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="THREE" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="THREE" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="FOUR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="FOUR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="FIVE" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="FIVE" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="SIX" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="SIX" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="SPAN" scope="table" file="tabl-tab.mkiv"> + <cd:command name="SPAN" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="REF" scope="table" file="tabl-tab.mkiv"> + <cd:command name="REF" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-template"/> <cd:content/> @@ -407,4 +407,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tabulation.xml b/tex/context/interface/mkiv/i-tabulation.xml index be3a602ac..3efc34f42 100644 --- a/tex/context/interface/mkiv/i-tabulation.xml +++ b/tex/context/interface/mkiv/i-tabulation.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetabulation" 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"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptabulation" file="tabl-tbl.mkiv"> + <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"> @@ -99,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="tabulation" type="environment" generated="yes" variant="example" file="tabl-tbl.mkiv"> + <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> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetabulate" file="tabl-tbl.mkiv"> + <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"/> @@ -119,7 +119,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptabulate" 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"/> @@ -129,7 +129,7 @@ </cd:arguments> </cd:command> - <cd:command name="tabulate" type="environment" file="tabl-tbl.mkiv"> + <cd:command name="tabulate" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:template optional="yes"/> <cd:assignments list="yes" optional="yes"> @@ -138,7 +138,7 @@ </cd:arguments> </cd:command> - <cd:command name="tabulate" type="environment" generated="yes" variant="instance" file="tabl-tbl.mkiv"> + <cd:command name="tabulate" type="environment" generated="yes" variant="instance" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:sequence> <cd:instance value="tabulate"/> </cd:sequence> @@ -153,29 +153,29 @@ </cd:instances> </cd:command> - <cd:command name="tabulatehead" type="environment" file="tabl-tbl.mkiv"> + <cd:command name="tabulatehead" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="tabulatetail" type="environment" file="tabl-tbl.mkiv"> + <cd:command name="tabulatetail" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="tabulaterule" file="tabl-tbl.mkiv"/> + <cd:command name="tabulaterule" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateline" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateline" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateautorule" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateautorule" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateautoline" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateautoline" level="document" category="tables" file="tabl-tbl.mkiv"/> <!-- - <cd:command name="legend" type="environment" file="tabl-tbl.mkiv"> + <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"> @@ -184,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="fact" type="environment" file="tabl-tbl.mkiv"> + <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"> @@ -193,7 +193,7 @@ </cd:arguments> </cd:command> - <cd:command name="VL" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="VL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -202,76 +202,78 @@ </cd:arguments> </cd:command> - <cd:command name="NC" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NC" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="RC" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NI" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="HC" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="RC" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="EQ" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="HC" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="RQ" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="EQ" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="HQ" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="RQ" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NG" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="HQ" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NN" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NG" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="ND" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NN" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="ND" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NB" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="CC" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="NB" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> + + <cd:command name="CC" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-optional"/> </cd:arguments> </cd:command> - <cd:command name="CL" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="CL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-optional"/> </cd:arguments> </cd:command> - <cd:command name="CM" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="CM" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-optional"/> </cd:arguments> </cd:command> - <cd:command name="CR" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="CR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-optional"/> </cd:arguments> </cd:command> - <cd:command name="SR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="SR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="FR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="FR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="MR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="MR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="LR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="LR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="AR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="AR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="FL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="FL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="ML" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="ML" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="LL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="LL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="TL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="TL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="BL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="BL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="HL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="HL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="HR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="HR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml index 063a0c436..3e0d49d80 100644 --- a/tex/context/interface/mkiv/i-tagging.xml +++ b/tex/context/interface/mkiv/i-tagging.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuptagging" file="strc-tag.mkiv"> + <cd:command name="setuptagging" level="style" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -18,21 +18,21 @@ </cd:arguments> </cd:command> - <cd:command name="tagged" type="environment" begin="dostart" end="dostop" file="strc-tag.mkiv"> + <cd:command name="tagged" type="environment" begin="dostart" end="dostop" level="system" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="element" type="environment" file="strc-tag.mkiv"> + <cd:command name="element" type="environment" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="doifelseinelement" file="strc-tag.mkiv"> + <cd:command name="doifelseinelement" level="system" category="xml 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" file="strc-tag.mkiv"> + <cd:command name="doifinelementelse" level="system" category="xml 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" file="strc-tag.mkiv"> + <cd:command name="taggedlabeltexts" level="system" category="xml 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" file="strc-tag.mkiv"> + <cd:command name="namedtaggedlabeltexts" level="system" category="xml language" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -66,10 +66,10 @@ </cd:arguments> </cd:command> - <cd:command name="settaggedmetadata" file="strc-tag.mkiv"> + <cd:command name="settaggedmetadata" level="document" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tex.xml b/tex/context/interface/mkiv/i-tex.xml new file mode 100644 index 000000000..277c4db95 --- /dev/null +++ b/tex/context/interface/mkiv/i-tex.xml @@ -0,0 +1,457 @@ +<?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="␣" level="primitive"/> + + <cd:command name="-" level="primitive"/> + + <cd:command name="/" level="primitive"/> + + <cd:command name="above" level="primitive"> + <cd:arguments> + <cd:resolve name="string-dimension"/> + </cd:arguments> + </cd:command> + + <!-- + + <cd:command name="abovedisplayshortskip" level="primitive"> + + --> + + <cd:command name="abovedisplayshortskip" level="primitive"> + <cd:arguments> + <cd:resolve name="string-assignment-optional"/> + <cd:resolve name="string-dimension"/> + </cd:arguments> + </cd:command> + + <!-- + + <cd:command name="abovedisplayskip" level="primitive"/> + + --> + + <cd:command name="abovedisplayskip" level="primitive"> + <cd:arguments> + <cd:resolve name="string-assignment-optional"/> + <cd:resolve name="string-dimension"/> + </cd:arguments> + </cd:command> + + <cd:command name="abovewithdelims" level="primitive"> + <cd:arguments> + <cd:resolve name="string-text"/> + <cd:resolve name="string-text"/> + <cd:resolve name="string-dimension"/> + </cd:arguments> + </cd:command> + +<cd:command name="accent" level="primitive"/> +<cd:command name="adjdemerits" level="primitive"/> +<cd:command name="advance" level="primitive"/> +<cd:command name="afterassignment" level="primitive"/> +<cd:command name="aftergroup" level="primitive"/> +<cd:command name="atop" level="primitive"/> +<cd:command name="atopwithdelims" level="primitive"/> +<cd:command name="badness" level="primitive"/> +<cd:command name="baselineskip" level="primitive"/> +<cd:command name="batchmode" level="primitive"/> +<cd:command name="begingroup" level="primitive"/> +<cd:command name="belowdisplayshortskip" level="primitive"/> +<cd:command name="belowdisplayskip" level="primitive"/> +<cd:command name="binoppenalty" level="primitive"/> +<cd:command name="botmark" level="primitive"/> +<cd:command name="box" level="primitive"/> +<cd:command name="boxmaxdepth" level="primitive"/> +<cd:command name="brokenpenalty" level="primitive"/> +<cd:command name="catcode" level="primitive"/> +<cd:command name="char" level="primitive"/> +<cd:command name="chardef" level="primitive"/> +<cd:command name="cleaders" level="primitive"/> +<cd:command name="closein" level="primitive"/> +<cd:command name="closeout" level="primitive"/> +<cd:command name="clubpenalty" level="primitive"/> +<cd:command name="copy" level="primitive"/> +<cd:command name="count" level="primitive"/> +<cd:command name="countdef" level="primitive"/> +<cd:command name="cr" level="primitive"/> +<cd:command name="crcr" level="primitive"/> +<cd:command name="csname" level="primitive"/> +<cd:command name="day" level="primitive"/> +<cd:command name="deadcycles" level="primitive"/> +<cd:command name="def" level="primitive"/> +<cd:command name="defaulthyphenchar" level="primitive"/> +<cd:command name="defaultskewchar" level="primitive"/> +<cd:command name="delcode" level="primitive"/> +<cd:command name="delimiter" level="primitive"/> +<cd:command name="delimiterfactor" level="primitive"/> +<cd:command name="delimitershortfall" level="primitive"/> +<cd:command name="dimen" level="primitive"/> +<cd:command name="dimendef" level="primitive"/> +<cd:command name="discretionary" level="primitive"/> +<cd:command name="displayindent" level="primitive"/> +<cd:command name="displaylimits" level="primitive"/> +<cd:command name="displaystyle" level="primitive"/> +<cd:command name="displaywidowpenalty" level="primitive"/> +<cd:command name="displaywidth" level="primitive"/> +<cd:command name="divide" level="primitive"/> +<cd:command name="doublehyphendemerits" level="primitive"/> +<cd:command name="dp" level="primitive"/> +<cd:command name="dump" level="primitive"/> +<cd:command name="edef" level="primitive"/> +<cd:command name="else" level="primitive"/> +<cd:command name="emergencystretch" level="primitive"/> +<cd:command name="end" level="primitive"/> +<cd:command name="endcsname" level="primitive"/> +<cd:command name="endgroup" level="primitive"/> +<cd:command name="endinput" level="primitive"/> +<cd:command name="endlinechar" level="primitive"/> +<cd:command name="eqno" level="primitive"/> +<cd:command name="errhelp" level="primitive"/> +<cd:command name="errmessage" level="primitive"/> +<cd:command name="errorcontextlines" level="primitive"/> +<cd:command name="errorstopmode" level="primitive"/> +<cd:command name="escapechar" level="primitive"/> +<cd:command name="everycr" level="primitive"/> +<cd:command name="everydisplay" level="primitive"/> +<cd:command name="everyhbox" level="primitive"/> +<cd:command name="everyjob" level="primitive"/> +<cd:command name="everymath" level="primitive"/> +<cd:command name="everypar" level="primitive"/> +<cd:command name="everyvbox" level="primitive"/> +<cd:command name="exhyphenpenalty" level="primitive"/> +<cd:command name="expandafter" level="primitive"/> +<cd:command name="fam" level="primitive"/> +<cd:command name="fi" level="primitive"/> +<cd:command name="finalhyphendemerits" level="primitive"/> +<cd:command name="firstmark" level="primitive"/> +<cd:command name="floatingpenalty" level="primitive"/> +<cd:command name="font" level="primitive"/> +<cd:command name="fontdimen" level="primitive"/> +<cd:command name="fontname" level="primitive"/> +<cd:command name="futurelet" level="primitive"/> +<cd:command name="gdef" level="primitive"/> +<cd:command name="global" level="primitive"/> +<cd:command name="globaldefs" level="primitive"/> +<cd:command name="halign" level="primitive"/> +<cd:command name="hangafter" level="primitive"/> +<cd:command name="hangindent" level="primitive"/> +<cd:command name="hbadness" level="primitive"/> +<cd:command name="hbox" level="primitive"/> +<cd:command name="hfil" level="primitive"/> +<cd:command name="hfill" level="primitive"/> +<cd:command name="hfilneg" level="primitive"/> +<cd:command name="hfuzz" level="primitive"/> +<cd:command name="hoffset" level="primitive"/> +<cd:command name="holdinginserts" level="primitive"/> +<cd:command name="hrule" level="primitive"/> +<cd:command name="hsize" level="primitive"/> +<cd:command name="hskip" level="primitive"/> +<cd:command name="hss" level="primitive"/> +<cd:command name="ht" level="primitive"/> +<cd:command name="hyphenation" level="primitive"/> +<cd:command name="hyphenchar" level="primitive"/> +<cd:command name="hyphenpenalty" level="primitive"/> + + <!-- + + <cd:command name="if" level="primitive"/> + + --> + + <cd:command name="if" level="primitive"> + <cd:arguments> + <cd:resolve name="string-text"/> + <cd:resolve name="string-text"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="else"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="fi"/> + </cd:arguments> + </cd:command> + + <!-- + + <cd:command name="ifcase" level="primitive"/> + + --> + + <cd:command name="ifcase" level="primitive"> + <cd:arguments> + <cd:resolve name="string-number"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="or"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="else"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="fi"/> + </cd:arguments> + </cd:command> + + <!-- + + <cd:command name="ifcat" level="primitive"/> + + --> + + <cd:command name="ifcat" level="primitive"> + <cd:arguments> + <cd:resolve name="string-text"/> + <cd:resolve name="string-text"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="else"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="fi"/> + </cd:arguments> + </cd:command> + +<cd:command name="ifdim" level="primitive"/> +<cd:command name="ifeof" level="primitive"/> + + <!-- + + <cd:command name="iffalse" level="primitive"/> + + --> + + <cd:command name="iffalse" level="primitive"> + <cd:arguments> + <cd:resolve name="string-text"/> + <cd:delimiter name="else"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="fi"/> + </cd:arguments> + </cd:command> + +<cd:command name="ifhbox" level="primitive"/> +<cd:command name="ifhmode" level="primitive"/> +<cd:command name="ifinner" level="primitive"/> +<cd:command name="ifmmode" level="primitive"/> +<cd:command name="ifnum" level="primitive"/> +<cd:command name="ifodd" level="primitive"/> + + <!-- + + <cd:command name="iftrue" level="primitive"/> + + --> + + <cd:command name="iftrue" level="primitive"> + <cd:arguments> + <cd:resolve name="string-text"/> + <cd:delimiter name="else"/> + <cd:resolve name="string-text"/> + <cd:delimiter name="fi"/> + </cd:arguments> + </cd:command> + +<cd:command name="ifvbox" level="primitive"/> +<cd:command name="ifvmode" level="primitive"/> +<cd:command name="ifvoid" level="primitive"/> +<cd:command name="ifx" level="primitive"/> +<cd:command name="ignorespaces" level="primitive"/> +<cd:command name="immediate" level="primitive"/> +<cd:command name="indent" level="primitive"/> +<cd:command name="input" level="primitive"/> +<cd:command name="inputlineno" level="primitive"/> +<cd:command name="insert" level="primitive"/> +<cd:command name="insertpenalties" level="primitive"/> +<cd:command name="interlinepenalty" level="primitive"/> +<cd:command name="jobname" level="primitive"/> +<cd:command name="kern" level="primitive"/> +<cd:command name="language" level="primitive"/> +<cd:command name="lastbox" level="primitive"/> +<cd:command name="lastkern" level="primitive"/> +<cd:command name="lastpenalty" level="primitive"/> +<cd:command name="lastskip" level="primitive"/> +<cd:command name="lccode" level="primitive"/> +<cd:command name="leaders" level="primitive"/> +<cd:command name="left" level="primitive"/> +<cd:command name="lefthyphenmin" level="primitive"/> +<cd:command name="leftskip" level="primitive"/> +<cd:command name="leqno" level="primitive"/> +<cd:command name="let" level="primitive"/> +<cd:command name="limits" level="primitive"/> +<cd:command name="linepenalty" level="primitive"/> +<cd:command name="lineskip" level="primitive"/> +<cd:command name="lineskiplimit" level="primitive"/> +<cd:command name="long" level="primitive"/> +<cd:command name="looseness" level="primitive"/> +<cd:command name="lower" level="primitive"/> +<cd:command name="lowercase" level="primitive"/> +<cd:command name="mag" level="primitive"/> +<cd:command name="mark" level="primitive"/> +<cd:command name="mathaccent" level="primitive"/> +<cd:command name="mathbin" level="primitive"/> +<cd:command name="mathchar" level="primitive"/> +<cd:command name="mathchardef" level="primitive"/> +<cd:command name="mathchoice" level="primitive"/> +<cd:command name="mathclose" level="primitive"/> +<cd:command name="mathcode" level="primitive"/> +<cd:command name="mathinner" level="primitive"/> +<cd:command name="mathop" level="primitive"/> +<cd:command name="mathopen" level="primitive"/> +<cd:command name="mathord" level="primitive"/> +<cd:command name="mathpunct" level="primitive"/> +<cd:command name="mathrel" level="primitive"/> +<cd:command name="mathsurround" level="primitive"/> +<cd:command name="maxdeadcycles" level="primitive"/> +<cd:command name="maxdepth" level="primitive"/> +<cd:command name="meaning" level="primitive"/> +<cd:command name="medmuskip" level="primitive"/> +<cd:command name="message" level="primitive"/> +<cd:command name="mkern" level="primitive"/> +<cd:command name="month" level="primitive"/> +<cd:command name="moveleft" level="primitive"/> +<cd:command name="moveright" level="primitive"/> +<cd:command name="mskip" level="primitive"/> +<cd:command name="multiply" level="primitive"/> +<cd:command name="muskip" level="primitive"/> +<cd:command name="muskipdef" level="primitive"/> +<cd:command name="newlinechar" level="primitive"/> +<cd:command name="noalign" level="primitive"/> +<cd:command name="noboundary" level="primitive"/> +<cd:command name="noexpand" level="primitive"/> +<cd:command name="noindent" level="primitive"/> +<cd:command name="nolimits" level="primitive"/> +<cd:command name="nonscript" level="primitive"/> +<cd:command name="nonstopmode" level="primitive"/> +<cd:command name="nulldelimiterspace" level="primitive"/> +<cd:command name="nullfont" level="primitive"/> +<cd:command name="number" level="primitive"/> +<cd:command name="omit" level="primitive"/> +<cd:command name="openin" level="primitive"/> +<cd:command name="openout" level="primitive"/> +<cd:command name="or" level="primitive"/> +<cd:command name="outer" level="primitive"/> +<cd:command name="output" level="primitive"/> +<cd:command name="outputpenalty" level="primitive"/> +<cd:command name="over" level="primitive"/> +<cd:command name="overfullrule" level="primitive"/> +<cd:command name="overline" level="primitive"/> +<cd:command name="overwithdelims" level="primitive"/> +<cd:command name="pagedepth" level="primitive"/> +<cd:command name="pagefilllstretch" level="primitive"/> +<cd:command name="pagefillstretch" level="primitive"/> +<cd:command name="pagefilstretch" level="primitive"/> +<cd:command name="pagegoal" level="primitive"/> +<cd:command name="pageshrink" level="primitive"/> +<cd:command name="pagestretch" level="primitive"/> +<cd:command name="pagetotal" level="primitive"/> +<cd:command name="par" level="primitive"/> +<cd:command name="parfillskip" level="primitive"/> +<cd:command name="parindent" level="primitive"/> +<cd:command name="parshape" level="primitive"/> +<cd:command name="parskip" level="primitive"/> +<cd:command name="patterns" level="primitive"/> +<cd:command name="pausing" level="primitive"/> +<cd:command name="penalty" level="primitive"/> +<cd:command name="postdisplaypenalty" level="primitive"/> +<cd:command name="predisplaypenalty" level="primitive"/> +<cd:command name="predisplaysize" level="primitive"/> +<cd:command name="pretolerance" level="primitive"/> +<cd:command name="prevdepth" level="primitive"/> +<cd:command name="prevgraf" level="primitive"/> +<cd:command name="radical" level="primitive"/> +<cd:command name="raise" level="primitive"/> +<cd:command name="read" level="primitive"/> + + <cd:command name="relax" level="primitive"/> + +<cd:command name="relpenalty" level="primitive"/> +<cd:command name="right" level="primitive"/> +<cd:command name="righthyphenmin" level="primitive"/> +<cd:command name="rightskip" level="primitive"/> +<cd:command name="romannumeral" level="primitive"/> +<cd:command name="scriptfont" level="primitive"/> +<cd:command name="scriptscriptfont" level="primitive"/> +<cd:command name="scriptscriptstyle" level="primitive"/> +<cd:command name="scriptspace" level="primitive"/> +<cd:command name="scriptstyle" level="primitive"/> +<cd:command name="scrollmode" level="primitive"/> +<cd:command name="setbox" level="primitive"/> +<cd:command name="setlanguage" level="primitive"/> +<cd:command name="sfcode" level="primitive"/> +<cd:command name="shipout" level="primitive"/> +<cd:command name="show" level="primitive"/> +<cd:command name="showbox" level="primitive"/> +<cd:command name="showboxbreadth" level="primitive"/> +<cd:command name="showboxdepth" level="primitive"/> +<cd:command name="showlists" level="primitive"/> +<cd:command name="showthe" level="primitive"/> +<cd:command name="skewchar" level="primitive"/> +<cd:command name="skip" level="primitive"/> +<cd:command name="skipdef" level="primitive"/> +<cd:command name="spacefactor" level="primitive"/> +<cd:command name="spaceskip" level="primitive"/> +<cd:command name="span" level="primitive"/> +<cd:command name="special" level="primitive"/> +<cd:command name="splitbotmark" level="primitive"/> +<cd:command name="splitfirstmark" level="primitive"/> +<cd:command name="splitmaxdepth" level="primitive"/> +<cd:command name="splittopskip" level="primitive"/> +<cd:command name="string" level="primitive"/> +<cd:command name="tabskip" level="primitive"/> +<cd:command name="textfont" level="primitive"/> +<cd:command name="textstyle" level="primitive"/> +<cd:command name="the" level="primitive"/> +<cd:command name="thickmuskip" level="primitive"/> +<cd:command name="thinmuskip" level="primitive"/> +<cd:command name="time" level="primitive"/> +<cd:command name="toks" level="primitive"/> +<cd:command name="toksdef" level="primitive"/> +<cd:command name="tolerance" level="primitive"/> +<cd:command name="topmark" level="primitive"/> +<cd:command name="topskip" level="primitive"/> +<cd:command name="tracingcommands" level="primitive"/> +<cd:command name="tracinglostchars" level="primitive"/> +<cd:command name="tracingmacros" level="primitive"/> +<cd:command name="tracingonline" level="primitive"/> +<cd:command name="tracingoutput" level="primitive"/> +<cd:command name="tracingpages" level="primitive"/> +<cd:command name="tracingparagraphs" level="primitive"/> +<cd:command name="tracingrestores" level="primitive"/> +<cd:command name="tracingstats" level="primitive"/> +<cd:command name="uccode" level="primitive"/> +<cd:command name="uchyph" level="primitive"/> +<cd:command name="underline" level="primitive"/> +<cd:command name="unhbox" level="primitive"/> +<cd:command name="unhcopy" level="primitive"/> +<cd:command name="unkern" level="primitive"/> +<cd:command name="unpenalty" level="primitive"/> +<cd:command name="unskip" level="primitive"/> +<cd:command name="unvbox" level="primitive"/> +<cd:command name="unvcopy" level="primitive"/> +<cd:command name="uppercase" level="primitive"/> +<cd:command name="vadjust" level="primitive"/> +<cd:command name="valign" level="primitive"/> +<cd:command name="vbadness" level="primitive"/> +<cd:command name="vbox" level="primitive"/> +<cd:command name="vcenter" level="primitive"/> + + <cd:command name="vfil" level="primitive"/> + + <cd:command name="vfill" level="primitive"/> + +<cd:command name="vfilneg" level="primitive"/> +<cd:command name="vfuzz" level="primitive"/> +<cd:command name="voffset" level="primitive"/> +<cd:command name="vrule" level="primitive"/> +<cd:command name="vsize" level="primitive"/> +<cd:command name="vskip" level="primitive"/> +<cd:command name="vsplit" level="primitive"/> +<cd:command name="vss" level="primitive"/> +<cd:command name="vtop" level="primitive"/> +<cd:command name="wd" level="primitive"/> +<cd:command name="widowpenalty" level="primitive"/> +<cd:command name="write" level="primitive"/> +<cd:command name="xdef" level="primitive"/> +<cd:command name="xleaders" level="primitive"/> +<cd:command name="xspaceskip" level="primitive"/> +<cd:command name="year" level="primitive"/> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textbackground.xml b/tex/context/interface/mkiv/i-textbackground.xml index bc16ffa8d..6104b1d9a 100644 --- a/tex/context/interface/mkiv/i-textbackground.xml +++ b/tex/context/interface/mkiv/i-textbackground.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetextbackground" file="anch-bck.mkiv"> + <cd:command name="definetextbackground" level="style" category="background" file="anch-bck.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="setuptextbackground" file="anch-bck.mkiv"> + <cd:command name="setuptextbackground" level="style" category="background" file="anch-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -25,8 +25,12 @@ <cd:parameter name="location"> <cd:constant type="text" default="yes"/> <cd:constant type="paragraph"/> + <cd:constant type="always"/> <cd:constant type="none"/> </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="alternative"> <cd:constant type="cd:number"/> </cd:parameter> @@ -113,7 +117,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" type="environment" file="anch-bck.mkiv"> + <cd:command name="textbackground" type="environment" level="document" category="background" file="anch-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -122,7 +126,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" type="environment" generated="yes" variant="example" file="anch-bck.mkiv"> + <cd:command name="textbackground" type="environment" generated="yes" variant="example" level="document" category="background" file="anch-bck.mkiv"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -133,7 +137,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" generated="yes" variant="example" file="anch-bck.mkiv"> + <cd:command name="textbackground" generated="yes" variant="example" level="document" category="background" file="anch-bck.mkiv"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -142,6 +146,6 @@ </cd:arguments> </cd:command> - <cd:command name="textbackgroundmanual" type="environment" file="anch-bck.mkiv"/> + <cd:command name="textbackgroundmanual" type="environment" level="system" category="background" file="anch-bck.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textflow.xml b/tex/context/interface/mkiv/i-textflow.xml index edcf03492..9c9ea2190 100644 --- a/tex/context/interface/mkiv/i-textflow.xml +++ b/tex/context/interface/mkiv/i-textflow.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetextflow" file="page-flw.mkiv"> + <cd:command name="definetextflow" level="style" category="structure" file="page-flw.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="setuptextflow" file="page-flw.mkiv"> + <cd:command name="setuptextflow" level="style" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -31,13 +31,13 @@ </cd:arguments> </cd:command> - <cd:command name="textflowcollector" file="page-flw.mkiv"> + <cd:command name="textflowcollector" level="system" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsetextflowcollector" file="page-flw.mkiv"> + <cd:command name="doifelsetextflowcollector" level="system" category="structure 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" file="page-flw.mkiv"> + <cd:command name="doiftextflowcollectorelse" level="system" category="structure 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" file="page-flw.mkiv"> + <cd:command name="doifelsetextflow" level="system" category="structure 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" file="page-flw.mkiv"> + <cd:command name="doiftextflowelse" level="system" category="structure conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -69,16 +69,16 @@ </cd:arguments> </cd:command> - <cd:command name="textflow" type="environment" file="page-flw.mkiv"> + <cd:command name="textflow" type="environment" level="document" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushtextflow" file="page-flw.mkiv"> + <cd:command name="flushtextflow" level="document" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textrule.xml b/tex/context/interface/mkiv/i-textrule.xml index a849f44e1..b71df66a6 100644 --- a/tex/context/interface/mkiv/i-textrule.xml +++ b/tex/context/interface/mkiv/i-textrule.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuptextrules" file="pack-mrl.mkiv"> + <cd:command name="setuptextrules" level="style" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="textrule" file="pack-mrl.mkiv"> + <cd:command name="textrule" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -63,10 +63,10 @@ </cd:arguments> </cd:command> - <cd:command name="textrule" type="environment" file="pack-mrl.mkiv"> + <cd:command name="textrule" type="environment" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml index 009949d35..bd1b128b3 100644 --- a/tex/context/interface/mkiv/i-texts.xml +++ b/tex/context/interface/mkiv/i-texts.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="definelayoutelement" file="page-txt.mkvi"> + <cd:command name="definelayoutelement" level="system" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -16,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayoutelement" file="page-txt.mkvi"> + <cd:command name="setuplayoutelement" level="system" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayouttext" file="page-txt.mkvi"> + <cd:command name="setuplayouttext" level="system" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -96,7 +96,7 @@ --> - <cd:command name="setuplayouttext" file="page-txt.mkvi"> + <cd:command name="setuplayouttext" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -165,7 +165,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptop" file="page-txt.mkvi"> + <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -178,7 +178,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupheader" file="page-txt.mkvi"> + <cd:command name="setupheader" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -191,7 +191,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptext" file="page-txt.mkvi"> + <cd:command name="setuptext" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -204,7 +204,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfooter" file="page-txt.mkvi"> + <cd:command name="setupfooter" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -217,7 +217,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbottom" file="page-txt.mkvi"> + <cd:command name="setupbottom" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -230,7 +230,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayouttextline" file="page-txt.mkvi"> + <cd:command name="doifelselayouttextline" level="system" category="layout conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -238,7 +238,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayouttextlineelse" file="page-txt.mkvi"> + <cd:command name="doiflayouttextlineelse" level="system" category="layout conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -246,7 +246,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayoutsomeline" file="page-txt.mkvi"> + <cd:command name="doifelselayoutsomeline" level="system" category="layout conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -254,7 +254,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayoutsomelineelse" file="page-txt.mkvi"> + <cd:command name="doiflayoutsomelineelse" level="system" category="layout conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -262,11 +262,11 @@ </cd:arguments> </cd:command> - <cd:command name="noheaderandfooterlines" file="page-txt.mkvi"/> + <cd:command name="noheaderandfooterlines" level="style" category="layout" file="page-txt.mkvi"/> - <cd:command name="notopandbottomlines" file="page-txt.mkvi"/> + <cd:command name="notopandbottomlines" level="style" category="layout" file="page-txt.mkvi"/> - <cd:command name="setuptoptexts" file="page-txt.mkvi"> + <cd:command name="setuptoptexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -280,7 +280,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupheadertexts" file="page-txt.mkvi"> + <cd:command name="setupheadertexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -294,7 +294,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptexttexts" file="page-txt.mkvi"> + <cd:command name="setuptexttexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -308,7 +308,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfootertexts" file="page-txt.mkvi"> + <cd:command name="setupfootertexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -322,7 +322,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbottomtexts" file="page-txt.mkvi"> + <cd:command name="setupbottomtexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -336,7 +336,7 @@ </cd:arguments> </cd:command> - <cd:command name="settextcontent" file="page-txt.mkvi"> + <cd:command name="settextcontent" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -360,7 +360,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetext" file="page-txt.mkvi"> + <cd:command name="definetext" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -382,4 +382,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-thinrule.xml b/tex/context/interface/mkiv/i-thinrule.xml index b74286e5e..372f9a238 100644 --- a/tex/context/interface/mkiv/i-thinrule.xml +++ b/tex/context/interface/mkiv/i-thinrule.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupthinrules" file="pack-mrl.mkiv"> + <cd:command name="setupthinrules" level="style" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="height"> @@ -59,11 +59,11 @@ </cd:arguments> </cd:command> - <cd:command name="thinrule" file="pack-mrl.mkiv"/> + <cd:command name="thinrule" level="document" category="rules" file="pack-mrl.mkiv"/> - <cd:command name="hairline" file="pack-mrl.mkiv"/> + <cd:command name="hairline" level="document" category="rules" file="pack-mrl.mkiv"/> - <cd:command name="thinrules" file="pack-mrl.mkiv"> + <cd:command name="thinrules" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupthinrules"/> @@ -71,4 +71,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-todo.xml b/tex/context/interface/mkiv/i-todo.xml new file mode 100644 index 000000000..a3d17515f --- /dev/null +++ b/tex/context/interface/mkiv/i-todo.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" ?> + +<!-- + + page-ffl.mkiv: + + \startfacingfloat[tag] ... \stopfacingfloat + \definefacingfloat + \setupfacingfloat + + keywords: spaceinbetween inbetween style color page + + typo-pnc.mkiv + + \setperiodkerning + \resetperiodkerning + \defineperiodkerning + + keywords: factor + +--> diff --git a/tex/context/interface/mkiv/i-token.xml b/tex/context/interface/mkiv/i-token.xml index 2cc0f4674..129f472ba 100644 --- a/tex/context/interface/mkiv/i-token.xml +++ b/tex/context/interface/mkiv/i-token.xml @@ -4,28 +4,28 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="tokens" type="environment" file="toks-tra.mkiv"> + <cd:command name="tokens" type="environment" level="system" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushtokens" file="toks-tra.mkiv"> + <cd:command name="flushtokens" level="system" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showtokens" file="toks-tra.mkiv"> + <cd:command name="showtokens" level="system" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="testtokens" file="toks-tra.mkiv"> + <cd:command name="testtokens" level="system" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tolerance.xml b/tex/context/interface/mkiv/i-tolerance.xml index b33fef05d..3d0010edf 100644 --- a/tex/context/interface/mkiv/i-tolerance.xml +++ b/tex/context/interface/mkiv/i-tolerance.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuptolerance" file="spac-hor.mkiv"> + <cd:command name="setuptolerance" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="horizontal"/> @@ -19,4 +19,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tooltip.xml b/tex/context/interface/mkiv/i-tooltip.xml index f46ffb091..df43ff9ce 100644 --- a/tex/context/interface/mkiv/i-tooltip.xml +++ b/tex/context/interface/mkiv/i-tooltip.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetooltip" file="scrn-fld.mkvi"> + <cd:command name="definetooltip" level="style" category="pdf" file="scrn-fld.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="setuptooltip" file="scrn-fld.mkvi"> + <cd:command name="setuptooltip" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="tooltip" generated="yes" variant="instance" file="scrn-fld.mkvi"> + <cd:command name="tooltip" generated="yes" variant="instance" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:sequence> <cd:instance value="tooltip"/> </cd:sequence> @@ -44,7 +44,7 @@ </cd:instances> </cd:command> - <cd:command name="tooltip" generated="yes" variant="instance:argument" file="scrn-fld.mkvi"> + <cd:command name="tooltip" generated="yes" variant="instance:argument" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:sequence> <cd:instance value="tooltip"/> </cd:sequence> @@ -64,7 +64,7 @@ <!-- - <cd:command name="tooltip" file="scrn-fld.mkvi"> + <cd:command name="tooltip" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptooltip"/> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="tooltip" variant="argument" file="scrn-fld.mkvi"> + <cd:command name="tooltip" variant="argument" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -88,4 +88,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tracker.xml b/tex/context/interface/mkiv/i-tracker.xml index 4dbc31886..3db36addc 100644 --- a/tex/context/interface/mkiv/i-tracker.xml +++ b/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" file="trac-ctx.mkiv"> + <cd:command name="installtextracker" level="system" 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" file="trac-ctx.mkiv"> + <cd:command name="installtexdirective" level="system" 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" file="trac-deb.mkiv"> + <cd:command name="enabletrackers" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disabletrackers" file="trac-deb.mkiv"> + <cd:command name="disabletrackers" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="resettrackers" file="trac-deb.mkiv"/> + <cd:command name="resettrackers" level="system" file="trac-deb.mkiv"/> - <cd:command name="showtrackers" file="trac-deb.mkiv"/> + <cd:command name="showtrackers" level="document" file="trac-deb.mkiv"/> - <cd:command name="enabledirectives" file="trac-deb.mkiv"> + <cd:command name="enabledirectives" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disabledirectives" file="trac-deb.mkiv"> + <cd:command name="disabledirectives" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="showdirectives" file="trac-deb.mkiv"/> + <cd:command name="showdirectives" level="document" file="trac-deb.mkiv"/> - <cd:command name="enableexperiments" file="trac-deb.mkiv"> + <cd:command name="enableexperiments" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disableexperiments" file="trac-deb.mkiv"> + <cd:command name="disableexperiments" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="showexperiments" file="trac-deb.mkiv"/> + <cd:command name="showexperiments" level="document" file="trac-deb.mkiv"/> - <cd:command name="showedebuginfo" file="trac-deb.mkiv"/> + <cd:command name="showedebuginfo" level="system" file="trac-deb.mkiv"/> - <cd:command name="overloaderror" file="trac-deb.mkiv"/> + <cd:command name="overloaderror" level="system" file="trac-deb.mkiv"/> - <cd:command name="showlogcategories" file="trac-deb.mkiv"/> + <cd:command name="showlogcategories" level="system" file="trac-deb.mkiv"/> - <cd:command name="showjustification" file="trac-jus.mkiv"/> + <cd:command name="showjustification" level="system" file="trac-jus.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-translate.xml b/tex/context/interface/mkiv/i-translate.xml index ba3510f0b..a865a4dd0 100644 --- a/tex/context/interface/mkiv/i-translate.xml +++ b/tex/context/interface/mkiv/i-translate.xml @@ -4,20 +4,20 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="translateinput" file="m-translate.mkiv"> + <cd:command name="translateinput" level="style" category="language" file="m-translate.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="resetinputtranslation" file="m-translate.mkiv"/> + <cd:command name="resetinputtranslation" level="system" category="language" file="m-translate.mkiv"/> - <cd:command name="enableinputtranslation" file="m-translate.mkiv"/> + <cd:command name="enableinputtranslation" level="style" category="language" file="m-translate.mkiv"/> - <cd:command name="disableinputtranslation" file="m-translate.mkiv"/> + <cd:command name="disableinputtranslation" level="style" category="language" file="m-translate.mkiv"/> - <cd:command name="readtranslatedfile" file="m-translate.mkiv"> + <cd:command name="readtranslatedfile" level="document" category="language" file="m-translate.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-translation.xml b/tex/context/interface/mkiv/i-translation.xml index f4f77c526..f4f03037e 100644 --- a/tex/context/interface/mkiv/i-translation.xml +++ b/tex/context/interface/mkiv/i-translation.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="translate" file="lang-lab.mkiv"> + <cd:command name="translate" level="document" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:language"> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="assigntranslation" file="lang-lab.mkiv"> + <cd:command name="assigntranslation" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:language"> @@ -26,4 +26,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-twopassdata.xml b/tex/context/interface/mkiv/i-twopassdata.xml index 508294f08..992735693 100644 --- a/tex/context/interface/mkiv/i-twopassdata.xml +++ b/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" file="core-two.mkiv"> + <cd:command name="immediatesavetwopassdata" level="system" 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" file="core-two.mkiv"> + <cd:command name="savetwopassdata" level="system" 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" file="core-two.mkiv"> + <cd:command name="lazysavetwopassdata" level="system" 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" file="core-two.mkiv"> + <cd:command name="savetaggedtwopassdata" level="system" 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" file="core-two.mkiv"> + <cd:command name="lazysavetaggedtwopassdata" level="system" 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" file="core-two.mkiv"> + <cd:command name="definetwopasslist" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="gettwopassdata" file="core-two.mkiv"> + <cd:command name="gettwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="checktwopassdata" file="core-two.mkiv"> + <cd:command name="checktwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="findtwopassdata" file="core-two.mkiv"> + <cd:command name="findtwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getfirsttwopassdata" file="core-two.mkiv"> + <cd:command name="getfirsttwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getlasttwopassdata" file="core-two.mkiv"> + <cd:command name="getlasttwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getnamedtwopassdatalist" file="core-two.mkiv"> + <cd:command name="getnamedtwopassdatalist" level="system" file="core-two.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="gettwopassdatalist" file="core-two.mkiv"> + <cd:command name="gettwopassdatalist" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseintwopassdata" file="core-two.mkiv"> + <cd:command name="doifelseintwopassdata" level="system" 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" file="core-two.mkiv"> + <cd:command name="doifintwopassdataelse" level="system" 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" file="core-two.mkiv"> + <cd:command name="getfromtwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-typography.xml b/tex/context/interface/mkiv/i-typography.xml index 6c2aa7389..c5f06fa13 100644 --- a/tex/context/interface/mkiv/i-typography.xml +++ b/tex/context/interface/mkiv/i-typography.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="normalizetextwidth" file="typo-txt.mkvi"> + <cd:command name="normalizetextwidth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizetextheight" file="typo-txt.mkvi"> + <cd:command name="normalizetextheight" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizetextdepth" file="typo-txt.mkvi"> + <cd:command name="normalizetextdepth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizetextline" file="typo-txt.mkvi"> + <cd:command name="normalizetextline" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizefontwidth" file="typo-txt.mkvi"> + <cd:command name="normalizefontwidth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizefontheight" file="typo-txt.mkvi"> + <cd:command name="normalizefontheight" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizefontdepth" file="typo-txt.mkvi"> + <cd:command name="normalizefontdepth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizefontline" file="typo-txt.mkvi"> + <cd:command name="normalizefontline" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -72,7 +72,7 @@ </cd:arguments> </cd:command> - <cd:command name="widthspanningtext" file="typo-txt.mkvi"> + <cd:command name="widthspanningtext" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -80,7 +80,7 @@ </cd:arguments> </cd:command> - <cd:command name="heightspanningtext" file="typo-txt.mkvi"> + <cd:command name="heightspanningtext" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="depthspanningtext" file="typo-txt.mkvi"> + <cd:command name="depthspanningtext" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -96,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="linespanningtext" file="typo-txt.mkvi"> + <cd:command name="linespanningtext" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -104,9 +104,9 @@ </cd:arguments> </cd:command> - <cd:command name="normalizedfontsize" file="typo-txt.mkvi"/> + <cd:command name="normalizedfontsize" level="system" category="fonts" file="typo-txt.mkvi"/> - <cd:command name="NormalizeTextWidth" file="typo-txt.mkvi"> + <cd:command name="NormalizeTextWidth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -114,7 +114,7 @@ </cd:arguments> </cd:command> - <cd:command name="NormalizeTextHeight" file="typo-txt.mkvi"> + <cd:command name="NormalizeTextHeight" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -122,7 +122,7 @@ </cd:arguments> </cd:command> - <cd:command name="NormalizeFontWidth" file="typo-txt.mkvi"> + <cd:command name="NormalizeFontWidth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -131,7 +131,7 @@ </cd:arguments> </cd:command> - <cd:command name="NormalizeFontHeight" file="typo-txt.mkvi"> + <cd:command name="NormalizeFontHeight" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -140,7 +140,7 @@ </cd:arguments> </cd:command> - <cd:command name="WidthSpanningText" file="typo-txt.mkvi"> + <cd:command name="WidthSpanningText" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -148,9 +148,9 @@ </cd:arguments> </cd:command> - <cd:command name="TheNormalizedFontSize" file="typo-txt.mkvi"/> + <cd:command name="TheNormalizedFontSize" level="system" category="fonts" file="typo-txt.mkvi"/> - <cd:command name="nicelyfilledbox" type="environment" file="typo-txt.mkvi"> + <cd:command name="nicelyfilledbox" type="environment" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="width"> @@ -170,4 +170,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-unit.xml b/tex/context/interface/mkiv/i-unit.xml index 3380585dc..9efa452eb 100644 --- a/tex/context/interface/mkiv/i-unit.xml +++ b/tex/context/interface/mkiv/i-unit.xml @@ -4,19 +4,19 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="digits" file="phys-dim.mkiv"> + <cd:command name="digits" level="document" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="digits" variant="string" file="phys-dim.mkiv"> + <cd:command name="digits" variant="string" level="document" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="string-number"/> </cd:arguments> </cd:command> - <cd:command name="defineunit" file="phys-dim.mkiv"> + <cd:command name="defineunit" level="style" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -26,7 +26,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupunit" file="phys-dim.mkiv"> + <cd:command name="setupunit" level="style" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="unit" generated="yes" variant="instance" file="phys-dim.mkiv"> + <cd:command name="unit" generated="yes" variant="instance" level="document" category="symbols" file="phys-dim.mkiv"> <cd:sequence> <cd:instance value="unit"/> </cd:sequence> @@ -89,7 +89,7 @@ <!-- - <cd:command name="unit" file="phys-dim.mkiv"> + <cd:command name="unit" level="document" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> @@ -97,21 +97,21 @@ --> - <cd:command name="installunitsseparator" file="phys-dim.mkiv"> + <cd:command name="installunitsseparator" level="system" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installunitsspace" file="phys-dim.mkiv"> + <cd:command name="installunitsspace" level="system" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="registerunit" file="phys-dim.mkiv"> + <cd:command name="registerunit" level="style" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="prefix"/> @@ -125,4 +125,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-variables.xml b/tex/context/interface/mkiv/i-variables.xml index 63b34329c..7c295f9ad 100644 --- a/tex/context/interface/mkiv/i-variables.xml +++ b/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" file="core-env.mkiv"> + <cd:command name="setvariables" level="style" 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" file="core-env.mkiv"> + <cd:command name="setevariables" level="system" 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" file="core-env.mkiv"> + <cd:command name="setgvariables" level="system" 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" file="core-env.mkiv"> + <cd:command name="setxvariables" level="system" 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" file="core-env.mkiv"> + <cd:command name="checkvariables" level="system" 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" file="core-env.mkiv"> + <cd:command name="setvariable" level="style" 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" file="core-env.mkiv"> + <cd:command name="setevariable" level="system" 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" file="core-env.mkiv"> + <cd:command name="setgvariable" level="system" 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" file="core-env.mkiv"> + <cd:command name="setxvariable" level="system" 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" file="core-env.mkiv"> + <cd:command name="getvariable" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="showvariable" file="core-env.mkiv"> + <cd:command name="showvariable" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="doifelsevariable" file="core-env.mkiv"> + <cd:command name="doifelsevariable" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifvariableelse" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifvariable" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifnotvariable" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifelseemptyvariable" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifemptyvariableelse" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifemptyvariable" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifnotemptyvariable" level="system" category="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" file="core-env.mkiv"> + <cd:command name="getvariabledefault" level="system" 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" file="core-env.mkiv"> + <cd:command name="setupenv" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifelseenv" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifenvelse" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifenv" level="system" category="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" file="core-env.mkiv"> + <cd:command name="doifnotenv" level="system" category="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" file="core-env.mkiv"> + <cd:command name="env" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="envvar" file="core-env.mkiv"> + <cd:command name="envvar" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="setdocumentfilename" file="luat-ini.mkiv"> + <cd:command name="setdocumentfilename" 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" file="luat-ini.mkiv"> + <cd:command name="setdocumentargument" 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" file="luat-ini.mkiv"> + <cd:command name="setdocumentargumentdefault" 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" file="luat-ini.mkiv"> + <cd:command name="getdocumentfilename" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="getdocumentargument" file="luat-ini.mkiv"> + <cd:command name="getdocumentargument" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getdocumentargumentdefault" file="luat-ini.mkiv"> + <cd:command name="getdocumentargumentdefault" 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="doifelsedocumentargument" file="luat-ini.mkiv"> + <cd:command name="doifelsedocumentargument" level="system" category="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" file="luat-ini.mkiv"> + <cd:command name="doifdocumentargumentelse" level="system" category="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" file="luat-ini.mkiv"> + <cd:command name="doifdocumentargument" level="system" category="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" file="luat-ini.mkiv"> + <cd:command name="doifnotdocumentargument" level="system" category="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" file="luat-ini.mkiv"> + <cd:command name="doifelsedocumentfilename" level="system" category="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" file="luat-ini.mkiv"> + <cd:command name="doifdocumentfilenameelse" level="system" category="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" file="luat-ini.mkiv"> + <cd:command name="doifdocumentfilename" level="system" category="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" file="luat-ini.mkiv"> + <cd:command name="doifnotdocumentfilename" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-verbatim.xml b/tex/context/interface/mkiv/i-verbatim.xml index b23f57efe..e8abc1f66 100644 --- a/tex/context/interface/mkiv/i-verbatim.xml +++ b/tex/context/interface/mkiv/i-verbatim.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetype" file="buff-ver.mkiv"> + <cd:command name="definetype" level="style" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,20 +14,12 @@ </cd:arguments> </cd:command> - <cd:command name="setuptype" file="buff-ver.mkiv"> + <cd:command name="setuptype" level="style" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="option"> - <cd:constant type="mp"/> - <cd:constant type="lua"/> - <cd:constant type="xml"/> - <cd:constant type="parsed-xml"/> - <cd:constant type="nested"/> - <cd:constant type="tex"/> - <cd:constant type="context"/> - <cd:constant type="none"/> - <cd:constant type="cd:name"/> + <cd:resolve name="value-verbatim"/> </cd:parameter> <cd:parameter name="command"> <cd:constant type="cd:csname"/> @@ -77,7 +69,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" file="buff-ver.mkiv"> + <cd:command name="type" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -86,7 +78,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" variant="angles" file="buff-ver.mkiv"> + <cd:command name="type" variant="angles" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -95,7 +87,7 @@ </cd:arguments> </cd:command> - <cd:command name="typ" file="buff-ver.mkiv"> + <cd:command name="typ" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -104,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="typ" variant="angles" file="buff-ver.mkiv"> + <cd:command name="typ" variant="angles" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -113,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" generated="yes" variant="example" file="buff-ver.mkiv"> + <cd:command name="type" generated="yes" variant="example" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -125,7 +117,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" generated="yes" variant="example:angles" file="buff-ver.mkiv"> + <cd:command name="type" generated="yes" variant="example:angles" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -137,7 +129,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetyping" file="buff-ver.mkiv"> + <cd:command name="definetyping" level="style" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -147,7 +139,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptyping" file="buff-ver.mkiv"> + <cd:command name="setuptyping" level="style" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -161,15 +153,7 @@ <cd:resolve name="value-leftskip"/> </cd:parameter> <cd:parameter name="option"> - <cd:constant type="mp"/> - <cd:constant type="lua"/> - <cd:constant type="xml"/> - <cd:constant type="parsed-xml"/> - <cd:constant type="nested"/> - <cd:constant type="tex"/> - <cd:constant type="context"/> - <cd:constant type="none" default="yes"/> - <cd:constant type="cd:name"/> + <cd:resolve name="value-verbatim"/> </cd:parameter> <cd:parameter name="style"> <cd:resolve name="value-style"/> @@ -251,7 +235,7 @@ </cd:arguments> </cd:command> - <cd:command name="typing" type="environment" generated="yes" variant="instance" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" generated="yes" variant="instance" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -265,7 +249,7 @@ </cd:instances> </cd:command> - <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -279,55 +263,55 @@ </cd:instances> </cd:command> - <cd:command name="tex" file="buff-ver.mkiv"> + <cd:command name="tex" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="arg" file="buff-ver.mkiv"> + <cd:command name="arg" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mat" file="buff-ver.mkiv"> + <cd:command name="mat" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="dis" file="buff-ver.mkiv"> + <cd:command name="dis" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="astype" file="buff-ver.mkiv"> + <cd:command name="astype" level="system" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="asciistr" file="buff-ver.mkiv"> + <cd:command name="asciistr" level="system" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="verbatim" file="buff-ver.mkiv"> + <cd:command name="verbatim" level="system" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filename" file="buff-ver.mkiv"> + <cd:command name="filename" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="typefile" file="buff-ver.mkiv"> + <cd:command name="typefile" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -337,7 +321,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetypingfile" file="buff-ver.mkiv"> + <cd:command name="doifelsetypingfile" category="verbatim" level="system conditional" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -345,7 +329,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftypingfileelse" file="buff-ver.mkiv"> + <cd:command name="doiftypingfileelse" category="verbatim" level="system conditional" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -355,7 +339,7 @@ <!-- - <cd:command name="typing" type="environment" file="buff-ver.mkiv"> + <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"/> @@ -363,7 +347,7 @@ </cd:arguments> </cd:command> - <cd:command name="typing" type="environment" variant="argument" file="buff-ver.mkiv"> + <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"/> @@ -371,7 +355,7 @@ </cd:arguments> </cd:command> - <cd:command name="LUA" type="environment" file="buff-ver.mkiv"> + <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"/> @@ -379,7 +363,7 @@ </cd:arguments> </cd:command> - <cd:command name="LUA" type="environment" variant="argument" file="buff-ver.mkiv"> + <cd:command name="LUA" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:variable value="lua"/> </cd:sequence> @@ -390,7 +374,7 @@ </cd:arguments> </cd:command> - <cd:command name="MP" type="environment" file="buff-ver.mkiv"> + <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"/> @@ -398,7 +382,7 @@ </cd:arguments> </cd:command> - <cd:command name="MP" type="environment" variant="argument" file="buff-ver.mkiv"> + <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"/> @@ -406,7 +390,7 @@ </cd:arguments> </cd:command> - <cd:command name="XML" type="environment" file="buff-ver.mkiv"> + <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"/> @@ -414,7 +398,7 @@ </cd:arguments> </cd:command> - <cd:command name="XML" type="environment" variant="argument" file="buff-ver.mkiv"> + <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"/> @@ -422,7 +406,7 @@ </cd:arguments> </cd:command> - <cd:command name="PARSEDXML" type="environment" file="buff-ver.mkiv"> + <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"/> @@ -430,7 +414,7 @@ </cd:arguments> </cd:command> - <cd:command name="PARSEDXML" type="environment" variant="argument" file="buff-ver.mkiv"> + <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"/> @@ -438,7 +422,7 @@ </cd:arguments> </cd:command> - <cd:command name="TEX" type="environment" file="buff-ver.mkiv"> + <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"/> @@ -446,7 +430,7 @@ </cd:arguments> </cd:command> - <cd:command name="TEX" type="environment" variant="argument" file="buff-ver.mkiv"> + <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"/> @@ -456,4 +440,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-version.xml b/tex/context/interface/mkiv/i-version.xml index 9f7864e8a..22a3846d9 100644 --- a/tex/context/interface/mkiv/i-version.xml +++ b/tex/context/interface/mkiv/i-version.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupversion" file="page-inf.mkiv"> + <cd:command name="setupversion" level="style" file="page-inf.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="concept"/> @@ -16,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="version" file="page-inf.mkiv"> + <cd:command name="version" level="style" file="page-inf.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="concept"/> @@ -28,20 +28,20 @@ </cd:arguments> </cd:command> - <cd:command name="installversioninfo" file="page-inf.mkiv"> + <cd:command name="installversioninfo" level="system" file="page-inf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="includeversioninfo" file="page-inf.mkiv"> + <cd:command name="includeversioninfo" level="system" file="page-inf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseolderversion" file="file-mod.mkvi"> + <cd:command name="doifelseolderversion" level="system" category="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" file="file-mod.mkvi"> + <cd:command name="doifolderversionelse" level="system" category="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" file="file-mod.mkvi"> + <cd:command name="doifelseoldercontext" level="system" category="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" file="file-mod.mkvi"> + <cd:command name="doifoldercontextelse" level="system" category="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> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-viewerlayer.xml b/tex/context/interface/mkiv/i-viewerlayer.xml index 8e321971e..fde846e4d 100644 --- a/tex/context/interface/mkiv/i-viewerlayer.xml +++ b/tex/context/interface/mkiv/i-viewerlayer.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineviewerlayer" file="attr-lay.mkiv"> + <cd:command name="defineviewerlayer" level="style" category="pdf" file="attr-lay.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="setupviewerlayer" file="attr-lay.mkiv"> + <cd:command name="setupviewerlayer" level="style" category="pdf" file="attr-lay.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -44,25 +44,25 @@ </cd:arguments> </cd:command> - <cd:command name="viewerlayer" type="environment" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" type="environment" level="document" category="pdf" file="attr-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="viewerlayer" type="environment" generated="yes" variant="example" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" type="environment" generated="yes" variant="example" level="document" category="pdf" file="attr-lay.mkiv"> <cd:sequence> <cd:variable value="viewerlayer"/> </cd:sequence> </cd:command> - <cd:command name="viewerlayer" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" level="document" category="pdf" file="attr-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="showlayoutcomponents" file="attr-lay.mkiv"/> + <cd:command name="showlayoutcomponents" level="document" category="pdf" file="attr-lay.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-visual.xml b/tex/context/interface/mkiv/i-visual.xml index 64ae3f79d..7849ab90b 100644 --- a/tex/context/interface/mkiv/i-visual.xml +++ b/tex/context/interface/mkiv/i-visual.xml @@ -4,20 +4,20 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="fakerule" file="m-visual.mkiv"> + <cd:command name="fakerule" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="dorandomrecurse" file="m-visual.mkiv"> + <cd:command name="dorandomrecurse" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fakelines" file="m-visual.mkiv"> + <cd:command name="fakelines" level="document" 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" file="m-visual.mkiv"> + <cd:command name="fakewords" level="document" 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" file="m-visual.mkiv"> + <cd:command name="fakenwords" level="system" 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" file="m-visual.mkiv"/> + <cd:command name="showfakewords" level="system" file="m-visual.mkiv"/> - <cd:command name="fakeword" file="m-visual.mkiv"/> + <cd:command name="fakeword" level="system" file="m-visual.mkiv"/> - <cd:command name="fakeparindent" file="m-visual.mkiv"/> + <cd:command name="fakeparindent" level="system" file="m-visual.mkiv"/> - <cd:command name="fakeddroppedcaps" file="m-visual.mkiv"> + <cd:command name="fakeddroppedcaps" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="fakefigure" file="m-visual.mkiv"> + <cd:command name="fakefigure" level="document" 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" file="m-visual.mkiv"> + <cd:command name="fakeimage" level="document" 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" file="m-visual.mkiv"/> + <cd:command name="fakeformula" level="document" file="m-visual.mkiv"/> - <cd:command name="fakespacingformula" file="m-visual.mkiv"/> + <cd:command name="fakespacingformula" level="document" file="m-visual.mkiv"/> - <cd:command name="smashedgrid" file="m-visual.mkiv"> + <cd:command name="smashedgrid" level="system" 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" file="m-visual.mkiv"/> + <cd:command name="bodyfontgrid" level="system" file="m-visual.mkiv"/> - <cd:command name="emexgrid" file="m-visual.mkiv"/> + <cd:command name="emexgrid" level="system" file="m-visual.mkiv"/> - <cd:command name="simplethesis" file="m-visual.mkiv"/> + <cd:command name="simplethesis" level="system" file="m-visual.mkiv"/> - <cd:command name="showbaselines" file="m-visual.mkiv"/> + <cd:command name="showbaselines" level="system" file="m-visual.mkiv"/> - <cd:command name="showpagebuilder" file="m-visual.mkiv"/> + <cd:command name="showpagebuilder" level="system" file="m-visual.mkiv"/> - <cd:command name="tagbox" file="m-visual.mkiv"> + <cd:command name="tagbox" level="system" 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" file="m-visual.mkiv"> + <cd:command name="coloredhbox" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredvbox" file="m-visual.mkiv"> + <cd:command name="coloredvbox" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredvtop" file="m-visual.mkiv"> + <cd:command name="coloredvtop" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredstrut" file="m-visual.mkiv"/> + <cd:command name="coloredstrut" level="system" file="m-visual.mkiv"/> </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-visualizer.xml b/tex/context/interface/mkiv/i-visualizer.xml index 3d30b7f4d..daaad28cd 100644 --- a/tex/context/interface/mkiv/i-visualizer.xml +++ b/tex/context/interface/mkiv/i-visualizer.xml @@ -4,116 +4,117 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="ruledhbox" file="trac-vis.mkiv"> + <cd:command name="ruledhbox" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvbox" file="trac-vis.mkiv"> + <cd:command name="ruledvbox" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvtop" file="trac-vis.mkiv"> + <cd:command name="ruledvtop" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledtopv" file="trac-vis.mkiv"> + <cd:command name="ruledtopv" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledhpack" file="trac-vis.mkiv"> + <cd:command name="ruledhpack" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvpack" file="trac-vis.mkiv"> + <cd:command name="ruledvpack" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledtpack" file="trac-vis.mkiv"> + <cd:command name="ruledtpack" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledmbox" file="trac-vis.mkiv"> + <cd:command name="ruledmbox" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxr" file="trac-vis.mkiv"> + <cd:command name="filledhboxr" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxg" file="trac-vis.mkiv"> + <cd:command name="filledhboxg" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxb" file="trac-vis.mkiv"> + <cd:command name="filledhboxb" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxc" file="trac-vis.mkiv"> + <cd:command name="filledhboxc" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxm" file="trac-vis.mkiv"> + <cd:command name="filledhboxm" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxy" file="trac-vis.mkiv"> + <cd:command name="filledhboxy" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxk" file="trac-vis.mkiv"> + <cd:command name="filledhboxk" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="showmakeup" file="trc-vis.mkiv"> + <cd:command name="showmakeup" level="document" file="trc-vis.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="makeup" default="yes"/> <cd:constant type="all"/> <cd:constant type="boxes"/> + <cd:constant type="line"/> <cd:constant type="glyph"/> <cd:constant type="fontkern"/> <cd:constant type="hbox"/> @@ -137,20 +138,22 @@ </cd:arguments> </cd:command> - <cd:command name="showallmakeup" file="trc-vis.mkiv"/> + <cd:command name="showallmakeup" level="document" file="trc-vis.mkiv"/> - <cd:command name="showboxes" file="trc-vis.mkiv"/> + <cd:command name="showboxes" level="document" file="trc-vis.mkiv"/> - <cd:command name="showglyphs" file="trc-vis.mkiv"/> + <cd:command name="showglyphs" level="document" file="trc-vis.mkiv"/> - <cd:command name="showfontkerns" file="trc-vis.mkiv"/> + <cd:command name="showfontkerns" level="document" file="trc-vis.mkiv"/> - <cd:command name="setvisualizerfont" file="trc-vis.mkiv"> + <cd:command name="showfontitalics" level="document" file="trc-vis.mkiv"/> + + <cd:command name="setvisualizerfont" level="system" file="trc-vis.mkiv"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="resetvisualizers" file="trc-vis.mkiv"/> + <cd:command name="resetvisualizers" level="system" file="trc-vis.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml index 4618fc00a..ce6d5ac08 100644 --- a/tex/context/interface/mkiv/i-vspace.xml +++ b/tex/context/interface/mkiv/i-vspace.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definevspacingamount" file="spac-ver.mkiv"> + <cd:command name="definevspacingamount" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-dimension-optional"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="definevspacing" file="spac-ver.mkiv"> + <cd:command name="definevspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="vspacing" file="spac-ver.mkiv"> + <cd:command name="vspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="preference"/> @@ -31,6 +31,7 @@ <cd:constant type="enable"/> <cd:constant type="disable"/> <cd:constant type="nowhite"/> + <cd:constant type="packed"/> <cd:constant type="back"/> <cd:constant type="overlay"/> <cd:constant type="always"/> @@ -73,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="directvspacing" file="spac-ver.mkiv"> + <cd:command name="directvspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:inherit name="vspacing"/> @@ -81,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupvspacing" file="spac-ver.mkiv"> + <cd:command name="setupvspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="vspacing"/> @@ -89,33 +90,97 @@ </cd:arguments> </cd:command> - <cd:command name="setupblank" file="spac-ver.mkiv"> + <!-- + + <cd:command name="setupblank" level="style" category="whitespace" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:inherit name="vspacing"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="blank" level="document" category="whitespace" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:inherit name="vspacing"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupblank" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="vspacing"/> + <cd:inherit name="blank"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="blank" file="spac-ver.mkiv"> + <cd:command name="blank" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="vspacing"/> + <cd:constant type="preference"/> + <cd:constant type="samepage"/> + <cd:constant type="max"/> + <cd:constant type="force"/> + <cd:constant type="enable"/> + <cd:constant type="disable"/> + <cd:constant type="nowhite"/> + <cd:constant type="back"/> + <cd:constant type="overlay"/> + <cd:constant type="always"/> + <cd:constant type="weak"/> + <cd:constant type="strong"/> + <cd:constant type="default"/> + <cd:constant type="before"/> + <cd:constant type="inbetween"/> + <cd:constant type="after"/> + <cd:constant type="fixed"/> + <cd:constant type="flexible"/> + <cd:constant type="none"/> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant type="big"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="quarterline"/> + <cd:constant type="formula"/> + <cd:constant type="white"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant type="standard"/> + <cd:constant type="small" prefix="cd:number" method="factor"/> + <cd:constant type="medium" prefix="cd:number" method="factor"/> + <cd:constant type="big" prefix="cd:number" method="factor"/> + <cd:constant type="line" prefix="cd:number" method="factor"/> + <cd:constant type="halfline" prefix="cd:number" method="factor"/> + <cd:constant type="quarterline" prefix="cd:number" method="factor"/> + <cd:constant type="formula" prefix="cd:number" method="factor"/> + <cd:constant type="white" prefix="cd:number" method="factor"/> + <cd:constant type="height" prefix="cd:number" method="factor"/> + <cd:constant type="depth" prefix="cd:number" method="factor"/> + <cd:constant type="cd:number" prefix="category" method="range"/> + <cd:constant type="cd:number" prefix="order" method="range"/> + <cd:constant type="cd:number" prefix="penalty" method="range"/> + <cd:constant type="cd:dimension"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="useblankparameter" file="spac-ver.mkiv"> + <cd:command name="useblankparameter" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="inhibitblank" file="spac-ver.mkiv"/> + <cd:command name="inhibitblank" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="synchronizeblank" file="spac-ver.mkiv"/> + <cd:command name="synchronizeblank" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="definevspace" file="spac-ver.mkiv"> + <cd:command name="definevspace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -123,29 +188,29 @@ </cd:arguments> </cd:command> - <cd:command name="vspace" file="spac-ver.mkiv"> + <cd:command name="vspace" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="godown" file="spac-ver.mkiv"> + <cd:command name="godown" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="vglue" file="spac-ver.mkiv"> + <cd:command name="vglue" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="string-dimension"/> </cd:arguments> </cd:command> - <cd:command name="smallskip" file="spac-ver.mkiv"/> + <cd:command name="smallskip" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="medskip" file="spac-ver.mkiv"/> + <cd:command name="medskip" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="bigskip" file="spac-ver.mkiv"/> + <cd:command name="bigskip" level="system" category="whitespace" file="spac-ver.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-whitespace.xml b/tex/context/interface/mkiv/i-whitespace.xml index 06e1997c5..f1a8ce84e 100644 --- a/tex/context/interface/mkiv/i-whitespace.xml +++ b/tex/context/interface/mkiv/i-whitespace.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupwhitespace" file="spac-ver.mkiv"> + <cd:command name="setupwhitespace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="fix"/> @@ -23,15 +23,15 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizewhitespace" file="spac-ver.mkiv"/> + <cd:command name="synchronizewhitespace" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="correctwhitespace" file="spac-ver.mkiv"> + <cd:command name="correctwhitespace" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="packed" type="environment" file="spac-ver.mkiv"> + <cd:command name="packed" type="environment" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="blank"/> @@ -39,9 +39,9 @@ </cd:arguments> </cd:command> - <cd:command name="unpacked" type="environment" file="spac-ver.mkiv"/> + <cd:command name="unpacked" type="environment" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="linecorrection" type="environment" file="spac-ver.mkiv"> + <cd:command name="linecorrection" type="environment" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="locallinecorrection" type="environment" file="spac-ver.mkiv"> + <cd:command name="locallinecorrection" type="environment" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -59,4 +59,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-xml.xml b/tex/context/interface/mkiv/i-xml.xml index c13196383..d09913f7c 100644 --- a/tex/context/interface/mkiv/i-xml.xml +++ b/tex/context/interface/mkiv/i-xml.xml @@ -2,151 +2,151 @@ <?context-directive job ctxfile x-setups.ctx ?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" file="lxml-ini.mkiv"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> <!-- the definitions themselves --> - <cd:command name="xmlmain"> + <cd:command name="xmlmain" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlflush"> + <cd:command name="xmlflush" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmltext"> + <cd:command name="xmltext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlpure"> + <cd:command name="xmlpure" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushtext"> + <cd:command name="xmlflushtext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushpure"> + <cd:command name="xmlflushpure" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlnonspace"> + <cd:command name="xmlnonspace" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushspacewise"> + <cd:command name="xmlflushspacewise" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushlinewise"> + <cd:command name="xmlflushlinewise" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlall"> + <cd:command name="xmlall" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmllastmatch"/> + <cd:command name="xmllastmatch" level="style" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlfirst"> + <cd:command name="xmlfirst" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmllast"> + <cd:command name="xmllast" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlcontext"> + <cd:command name="xmlcontext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushcontext"> + <cd:command name="xmlflushcontext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlshow"> + <cd:command name="xmlshow" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinfo"> + <cd:command name="xmlinfo" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlfilter"> + <cd:command name="xmlfilter" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlstrip"> + <cd:command name="xmlstrip" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlstripped"> + <cd:command name="xmlstripped" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlstripnolines"> + <cd:command name="xmlstripnolines" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlstrippednolines"> + <cd:command name="xmlstrippednolines" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlposition"> + <cd:command name="xmlposition" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -154,27 +154,27 @@ </cd:arguments> </cd:command> - <cd:command name="xmlelement"> + <cd:command name="xmlelement" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="xmlpos"> + <cd:command name="xmlpos" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlsnippet"> + <cd:command name="xmlsnippet" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="xmlconcat"> + <cd:command name="xmlconcat" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -182,7 +182,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlconcatrange"> + <cd:command name="xmlconcatrange" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -192,7 +192,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlcommand"> + <cd:command name="xmlcommand" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -200,44 +200,73 @@ </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim"> + <cd:command name="xmlinlineverbatim" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim" type="environment"> + <cd:command name="xmlinlineverbatim" type="environment" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim"> + <cd:command name="xmldisplayverbatim" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim" type="environment"> + <cd:command name="xmldisplayverbatim" type="environment" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlverbatim"> + <cd:command name="xmlverbatim" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlprettyprint"> + <cd:command name="xmlprettyprint" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> - <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="xmlprettyprinttext" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloadfile"> + <cd:command name="xmlinlineprettyprint" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="xmlinlineprettyprinttext" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="xmlloadfile" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -245,7 +274,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloadbuffer"> + <cd:command name="xmlloadbuffer" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-name"/> @@ -253,7 +282,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloaddata"> + <cd:command name="xmlloaddata" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -261,7 +290,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloadonly"> + <cd:command name="xmlloadonly" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -269,7 +298,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessfile"> + <cd:command name="xmlprocessfile" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -277,7 +306,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessbuffer"> + <cd:command name="xmlprocessbuffer" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-name"/> @@ -285,7 +314,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessdata"> + <cd:command name="xmlprocessdata" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -293,7 +322,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlinclude"> + <cd:command name="xmlinclude" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -301,44 +330,44 @@ </cd:arguments> </cd:command> - <cd:command name="xmlname"> + <cd:command name="xmlname" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlpath"> + <cd:command name="xmlpath" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlnamespace"> + <cd:command name="xmlnamespace" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmltag"> + <cd:command name="xmltag" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlcount"> + <cd:command name="xmlcount" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlatt"> + <cd:command name="xmlatt" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlattdef"> + <cd:command name="xmlsetatt" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -346,16 +375,24 @@ </cd:arguments> </cd:command> - <cd:command name="xmlrefatt"> + <cd:command name="xmlattdef" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> + <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="xmllastatt"/> + <cd:command name="xmlrefatt" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmllastatt" level="style" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlattribute"> + <cd:command name="xmlattribute" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -363,7 +400,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlattributedef"> + <cd:command name="xmlsetattribute" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -372,14 +409,38 @@ </cd:arguments> </cd:command> - <cd:command name="xmlchainatt"> + <cd:command name="xmlattributedef" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> + <cd:resolve name="argument-lpath"/> <cd:resolve name="argument-name"/> + <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="xmlchainattdef"> + <cd:command name="xmlchainatt" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmlchainattdef" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmlpar" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmlsetpar" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -387,39 +448,58 @@ </cd:arguments> </cd:command> - <cd:command name="xmldirectives"> + <cd:command name="xmlparam" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> + <cd:resolve name="argument-lpath"/> + <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesbefore"> + <cd:command name="xmlsetparam" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> + <cd:resolve name="argument-lpath"/> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesafter"> + <cd:command name="xmllastpar" level="style" category="xml" file="lxml-ini.mkiv"/> + + <cd:command name="xmldirectives" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinstalldirective"> + <cd:command name="xmldirectivesbefore" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmldirectivesafter" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmlinstalldirective" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-csname"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetup"> + <cd:command name="xmlsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetsetup"> + <cd:command name="xmlsetsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-lpath"/> @@ -427,79 +507,79 @@ </cd:arguments> </cd:command> - <cd:command name="xmlremovesetup"> + <cd:command name="xmlremovesetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlremovedocumentsetup"> + <cd:command name="xmlremovedocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushdocumentsetups"> + <cd:command name="xmlflushdocumentsetups" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlresetsetups"> + <cd:command name="xmlresetsetups" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlresetdocumentsetups"> + <cd:command name="xmlresetdocumentsetups" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlprependsetup"> + <cd:command name="xmlprependsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlappendsetup"> + <cd:command name="xmlappendsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlbeforesetup"> + <cd:command name="xmlbeforesetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlaftersetup"> + <cd:command name="xmlaftersetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlprependdocumentsetup"> + <cd:command name="xmlprependdocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlappenddocumentsetup"> + <cd:command name="xmlappenddocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlbeforedocumentsetup"> + <cd:command name="xmlbeforedocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> @@ -507,7 +587,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlafterdocumentsetup"> + <cd:command name="xmlafterdocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> @@ -515,17 +595,16 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisteredsetups"> - </cd:command> + <cd:command name="xmlregisteredsetups" level="style" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlregistereddocumentsetups"> + <cd:command name="xmlregistereddocumentsetups" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetfunction"> + <cd:command name="xmlsetfunction" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -535,7 +614,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoif"> + <cd:command name="xmldoif" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -543,7 +622,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifnot"> + <cd:command name="xmldoifnot" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -551,7 +630,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelse"> + <cd:command name="xmldoifelse" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -560,7 +639,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoiftext"> + <cd:command name="xmldoiftext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -568,7 +647,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifnottext"> + <cd:command name="xmldoifnottext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -576,7 +655,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelsetext"> + <cd:command name="xmldoifelsetext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -585,21 +664,21 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifselfempty"> + <cd:command name="xmldoifselfempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="xmldoifnotselfempty"> + <cd:command name="xmldoifnotselfempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="xmldoifelseselfempty"> + <cd:command name="xmldoifelseselfempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-true"/> @@ -607,7 +686,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelseempty"> + <cd:command name="xmldoifelseempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -616,7 +695,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisterns"> + <cd:command name="xmlregisterns" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -625,14 +704,14 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisterns"> + <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:arguments> </cd:command> - <cd:command name="xmlremapname"> + <cd:command name="xmlremapname" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -641,7 +720,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlremapnamespace"> + <cd:command name="xmlremapnamespace" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -649,14 +728,14 @@ </cd:arguments> </cd:command> - <cd:command name="xmlchecknamespace"> + <cd:command name="xmlchecknamespace" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlmapvalue"> + <cd:command name="xmlmapvalue" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -664,7 +743,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlvalue"> + <cd:command name="xmlvalue" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -672,7 +751,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelsevalue"> + <cd:command name="xmldoifelsevalue" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -681,20 +760,20 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloaddirectives"> + <cd:command name="xmlloaddirectives" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="xmlsave"> + <cd:command name="xmlsave" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="xmltofile"> + <cd:command name="xmltofile" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -702,7 +781,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmltobuffer"> + <cd:command name="xmltobuffer" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -710,7 +789,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmltobufferverbose"> + <cd:command name="xmltobufferverbose" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -720,7 +799,7 @@ <!-- - <cd:command name="xmltoparameters"> + <cd:command name="xmltoparameters" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -730,55 +809,55 @@ --> - <cd:command name="xmladdindex"> + <cd:command name="xmladdindex" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinclusion"> + <cd:command name="xmlinclusion" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinclusions"> + <cd:command name="xmlinclusions" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlbadinclusions"> + <cd:command name="xmlbadinclusions" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlraw"> + <cd:command name="xmlraw" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlraw" type="environment"/> + <cd:command name="xmlraw" type="environment" level="style" category="xml" file="lxml-ini.mkiv"/> <!-- injectors --> - <cd:command name="xmlresetinjectors"/> + <cd:command name="xmlresetinjectors" level="style" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlsetinjectors"> + <cd:command name="xmlsetinjectors" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="xmlinjector"> + <cd:command name="xmlinjector" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlapplyselectors"> + <cd:command name="xmlapplyselectors" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> @@ -786,14 +865,14 @@ <!-- entities --> - <cd:command name="xmlsetentity"> + <cd:command name="xmlsetentity" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="xmltexentity"> + <cd:command name="xmltexentity" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -802,7 +881,7 @@ <!-- general setup --> - <cd:command name="setupxml"> + <cd:command name="setupxml" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="default"> @@ -818,7 +897,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldefaulttotext"> + <cd:command name="xmldefaulttotext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-xtable.xml b/tex/context/interface/mkiv/i-xtable.xml index 7500ff47f..c921e1a8d 100644 --- a/tex/context/interface/mkiv/i-xtable.xml +++ b/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" file="tabl-xtb.mkvi"> + <cd:command name="definextable" level="style" category="tables" 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" file="tabl-xtb.mkvi"> + <cd:command name="setupxtable" level="style" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtable" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -90,13 +90,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtable" type="environment" variant="name" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="embeddedxtable" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="embeddedxtable" type="environment" level="style" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -104,13 +104,13 @@ </cd:arguments> </cd:command> - <cd:command name="embeddedxtable" type="environment" variant="name" file="tabl-xtb.mkvi"> + <cd:command name="embeddedxtable" type="environment" variant="name" level="style" category="tables" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:sequence> <cd:variable value="xtable"/> </cd:sequence> @@ -121,13 +121,13 @@ </cd:arguments> </cd:command> - <cd:command name="processxtablebuffer" file="tabl-xtb.mkvi"> + <cd:command name="processxtablebuffer" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xrow" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xrow" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -136,7 +136,7 @@ </cd:arguments> </cd:command> - <cd:command name="xcell" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xcell" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -157,7 +157,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtablehead" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xtablehead" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -165,13 +165,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablehead" type="environment" variant="name" file="tabl-xtb.mkvi"> + <cd:command name="xtablehead" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablefoot" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xtablefoot" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -179,13 +179,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablefoot" type="environment" variant="name" file="tabl-xtb.mkvi"> + <cd:command name="xtablefoot" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablenext" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xtablenext" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -193,13 +193,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablenext" type="environment" variant="name" file="tabl-xtb.mkvi"> + <cd:command name="xtablenext" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablebody" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xtablebody" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -207,13 +207,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablebody" type="environment" variant="name" file="tabl-xtb.mkvi"> + <cd:command name="xtablebody" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xgroup" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -222,7 +222,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrowgroup" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xrowgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -231,7 +231,7 @@ </cd:arguments> </cd:command> - <cd:command name="xcellgroup" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xcellgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -240,8 +240,8 @@ </cd:arguments> </cd:command> - <cd:command name="currentxtablerow" file="tabl-xtb.mkvi"/> + <cd:command name="currentxtablerow" level="system" category="tables" file="tabl-xtb.mkvi"/> - <cd:command name="currentxtablecolumn" file="tabl-xtb.mkvi"/> + <cd:command name="currentxtablecolumn" level="system" category="tables" file="tabl-xtb.mkvi"/> -</cd:interface> +</cd:interface>
\ No newline at end of file |