diff options
| author | Hans Hagen <pragma@wxs.nl> | 2018-12-17 18:19:48 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2018-12-17 18:19:48 +0100 |
| commit | 15b67b20aa0d6c508578d0ca8cbdcd9cff9829a8 (patch) | |
| tree | d656b4161487a8c54d954458084914c7d408aca7 /tex/context/interface/mkiv | |
| parent | 5bb786877a5617fb8fbe3fd0e7b54fbcea3ce002 (diff) | |
| download | context-15b67b20aa0d6c508578d0ca8cbdcd9cff9829a8.tar.gz | |
2018-12-17 16:49:00
Diffstat (limited to 'tex/context/interface/mkiv')
30 files changed, 638 insertions, 68 deletions
diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index b29d35c1c..acd8ba5cb 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -866,23 +866,23 @@ <cd:constant type="cd:file"/> </cd:parameter> <cd:parameter name="intent"> - <cd:constant type="Coated FOGRA39 (ISO 12647-2:2004)"/> + <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="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="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="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"/> @@ -1491,6 +1491,11 @@ <cd:constant type="-"/> <cd:constant type="cd:name"/> </cd:keywords> + <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-blk.mkiv" level="style" name="hideblocks"> @@ -1561,6 +1566,13 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="structure" file="strc-blk.mkiv" level="document" name="blockuservariable"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-bookmark.xml"> <cd:command category="pdf" file="strc-bkm.mkiv" level="style" name="setupbookmark"> @@ -3052,7 +3064,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command evel="document" file="buff-ini.mkiv" generated="yes" lcategory="buffer" name="buffer" type="environment" variant="instance"> + <cd:command category="buffer" file="buff-ini.mkiv" generated="yes" level="document" name="buffer" type="environment" variant="instance"> <cd:sequence> <cd:instance value="buffer"/> </cd:sequence> @@ -4779,7 +4791,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="transparent" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="transparent" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -4885,7 +4897,7 @@ </cd:arguments> </cd:command> <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:command category="colors" file="colo-ini.mkiv" level="style" name="definepalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -5245,7 +5257,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="columns" file="page-mul.mkiv" name="columnspan" type="environment"> + <cd:command category="columns" file="page-mul.mkiv" level="document" name="columnspan" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumnspan"/> @@ -7320,6 +7332,7 @@ <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> + <cd:constant method="range" prefix="cd:name" type="cd:number"/> </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -8072,6 +8085,52 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="structure" file="file-job.mkvi" level="style" name="doifelsedocumentvariable"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="file-job.mkvi" level="style" name="doifdocumentvariableelse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="file-job.mkvi" level="style" name="doifdocumentvariable"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="file-job.mkvi" level="style" name="doifnotdocumentvariable"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-dummy.xml"> <cd:command file="mult-aux.mkiv" level="system" name="getdummyparameters"> @@ -10252,6 +10311,7 @@ <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> </cd:parameter> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> @@ -10389,6 +10449,7 @@ <cd:constant type="cd:dimension"/> </cd:parameter> <cd:inherit name="setupcounter"/> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> @@ -10402,6 +10463,16 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="structure background" file="strc-flt.mkvi" level="style" name="setupfloatframed"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="placefloat" variant="instance"> <cd:sequence> <cd:string value="place"/> @@ -11108,6 +11179,7 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="structure" file="tabl-tsp.mkiv" level="document" name="splittext" type="environment"/> </cd:interface> <cd:interface file="i-fontfamily.xml"> <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefontfamily"> @@ -11647,7 +11719,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command ategory="fonts" clevel="style" file="font-fea.mkvi" name="subtractfeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="subtractfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12344,7 +12416,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command ategory="fonts" clevel="style" file="font-ini.mkiv" name="switchstyleonly"> + <cd:command category="fonts" file="font-ini.mkiv" level="style" name="switchstyleonly"> <cd:arguments> <cd:keywords> <cd:constant type="rm"/> @@ -13769,21 +13841,25 @@ <cd:parameter name="topframe"> <cd:constant default="yes" type="on"/> <cd:constant type="off"/> + <cd:constant type="small"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="bottomframe"> <cd:constant default="yes" type="on"/> <cd:constant type="off"/> + <cd:constant type="small"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="leftframe"> <cd:constant default="yes" type="on"/> <cd:constant type="off"/> + <cd:constant type="small"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="rightframe"> <cd:constant default="yes" type="on"/> <cd:constant type="off"/> + <cd:constant type="small"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="region"> @@ -13800,8 +13876,9 @@ <cd:constant default="yes" type="on"/> <cd:constant type="off"/> <cd:constant type="overlay"/> - <cd:constant type="none"/> + <cd:constant type="small"/> <cd:constant type="closed"/> + <cd:constant type="none"/> </cd:parameter> <cd:parameter name="background"> <cd:constant type="foreground"/> @@ -13848,6 +13925,9 @@ <cd:constant default="yes" type="broad"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="minheight"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="align"> <cd:inherit name="setupalign"/> </cd:parameter> @@ -14290,6 +14370,17 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="background rules" level="system" name="doifelseframed"> + <cd:arguments> + <cd:csname/> + <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-framedtable.xml"> <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="defineframedtable"> @@ -15416,6 +15507,7 @@ <cd:constant type="quotation"/> <cd:constant type="sentence"/> <cd:constant type="intersentence"/> + <cd:constant type="final"/> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> @@ -18695,6 +18787,7 @@ </cd:parameter> <cd:parameter name="font"> <cd:constant type="auto"/> + <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="bidi"> <cd:constant type="left"/> @@ -18827,6 +18920,13 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="language" file="lang-ini.mkiv" level="document" name="language" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:language"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="language" file="lang-ini.mkiv" level="style" name="mainlanguage"> <cd:arguments> <cd:keywords> @@ -26698,6 +26798,7 @@ <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> + <cd:constant method="range" prefix="cd:name" type="cd:number"/> </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -34392,6 +34493,7 @@ <cd:constant default="yes" type="top"/> <cd:constant type="left"/> <cd:constant type="right"/> + <cd:constant type="none"/> </cd:parameter> <cd:parameter name="align"> <cd:constant type="auto"/> @@ -39630,6 +39732,24 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseassignmentcs"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:csname/> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command file="syst-aux.mkiv" level="system" name="doifassignmentelsecs"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:csname/> + <cd:csname/> + </cd:arguments> + </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="convertargument"> <cd:arguments> <cd:keywords delimiters="none"> @@ -42414,7 +42534,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="strc-tag.mkiv" name="element" type="environment"> + <cd:command category="xml" file="strc-tag.mkiv" level="document" name="element" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43376,6 +43496,44 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="toks-aux.mkiv" level="style" name="definetokenlist"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="toks-aux.mkiv" level="style" name="tokenlist" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="toks-aux.mkiv" level="style" name="gettokenlist"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="toks-aux.mkiv" level="style" name="resettokenlist"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="toks-aux.mkiv" level="style" name="settokenlist"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-tolerance.xml"> <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="setuptolerance"> @@ -44105,6 +44263,108 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="symbols" file="core-con.mkiv" level="style" name="spaceddigitsmethod"/> + <cd:command category="symbols" file="core-con.mkiv" level="style" name="spaceddigitssymbol"/> + <cd:command category="symbols" file="core-con.mkiv" level="style" name="spaceddigitsseparator"/> + <cd:command category="symbols" file="core-con.mkiv" level="document" name="spaceddigits"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> + <cd:interface file="i-userdata.xml"> + <cd:command category="structure" file="strc-usr.mkiv" level="style" name="defineuserdata"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupuserdata"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-usr.mkiv" level="style" name="setupuserdata"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="default"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="cd:key"> + <cd:constant type="cd:value"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-usr.mkiv" level="document" name="userdata" type="environment"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <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-usr.mkiv" level="style" name="defineuserdataalternative"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupuserdataalternative"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-usr.mkiv" level="style" name="setupuserdataalternative"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="renderingsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="cd:key"> + <cd:constant type="cd:value"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-usr.mkiv" level="style" name="getuserdata"/> + <cd:command category="structure" file="strc-usr.mkiv" level="style" name="getinlineuserdata"/> </cd:interface> <cd:interface file="i-variables.xml"> <cd:command file="core-env.mkiv" level="style" name="setvariables"> @@ -44971,7 +45231,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" level="system conditional" name="doifelsetypingfile"> + <cd:command category="verbatim conditional" file="buff-ver.mkiv" level="system" name="doifelsetypingfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -44984,7 +45244,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" level="system conditional" name="doiftypingfileelse"> + <cd:command category="verbatim conditional" file="buff-ver.mkiv" level="system" name="doiftypingfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -45284,19 +45544,19 @@ <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="makeup"/> - <cd:constant type="all"/> + <cd:constant type="reset"/> <cd:constant type="boxes"/> - <cd:constant type="line"/> - <cd:constant type="glyph"/> - <cd:constant type="fontkern"/> + <cd:constant type="all"/> <cd:constant type="hbox"/> <cd:constant type="vbox"/> <cd:constant type="vtop"/> <cd:constant type="kern"/> <cd:constant type="glue"/> <cd:constant type="penalty"/> + <cd:constant type="fontkern"/> <cd:constant type="strut"/> <cd:constant type="whatsit"/> + <cd:constant type="glyph"/> <cd:constant type="simple"/> <cd:constant type="simplehbox"/> <cd:constant type="simplevbox"/> @@ -45305,7 +45565,11 @@ <cd:constant type="math"/> <cd:constant type="italic"/> <cd:constant type="origin"/> - <cd:constant type="reset"/> + <cd:constant type="discretionary"/> + <cd:constant type="expansion"/> + <cd:constant type="line"/> + <cd:constant type="space"/> + <cd:constant type="depth"/> </cd:keywords> </cd:arguments> </cd:command> @@ -45568,7 +45832,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" name="unpacked" type="environment"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" 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"> @@ -45577,7 +45841,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="whitespace" file="spac-ver.mkiv" name="locallinecorrection" type="environment"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="locallinecorrection" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -47059,14 +47323,18 @@ </cd:command> <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcolumn" type="environment"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcolumn" type="environment" variant="name"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcell" type="environment"> <cd:arguments> <cd:keywords optional="yes"> diff --git a/tex/context/interface/mkiv/i-backend.xml b/tex/context/interface/mkiv/i-backend.xml index ff52eed7d..d0bdb4853 100644 --- a/tex/context/interface/mkiv/i-backend.xml +++ b/tex/context/interface/mkiv/i-backend.xml @@ -18,23 +18,23 @@ <cd:constant type="cd:file"/> </cd:parameter> <cd:parameter name="intent"> - <cd:constant type="Coated FOGRA39 (ISO 12647-2:2004)"/> + <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="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="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="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"/> diff --git a/tex/context/interface/mkiv/i-block.xml b/tex/context/interface/mkiv/i-block.xml index 0bd0ef51b..3416a96ee 100644 --- a/tex/context/interface/mkiv/i-block.xml +++ b/tex/context/interface/mkiv/i-block.xml @@ -63,6 +63,7 @@ <cd:constant type="-"/> <cd:constant type="cd:name"/> </cd:keywords> + <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> @@ -119,4 +120,10 @@ </cd:arguments> </cd:command> + <cd:command name="blockuservariable" level="document" category="structure" file="strc-blk.mkiv"> + <cd:arguments> + <cd:resolve name="argument-key"/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-buffer.xml b/tex/context/interface/mkiv/i-buffer.xml index 0c94b7828..f08cb8ca4 100644 --- a/tex/context/interface/mkiv/i-buffer.xml +++ b/tex/context/interface/mkiv/i-buffer.xml @@ -101,7 +101,7 @@ </cd:arguments> </cd:command> - <cd:command name="buffer" type="environment" generated="yes" variant="instance" lcategory="buffer" evel="document" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" generated="yes" variant="instance" category="buffer" level="document" file="buff-ini.mkiv"> <cd:sequence> <cd:instance value="buffer"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml index 80da11f3b..4dd76d0b3 100644 --- a/tex/context/interface/mkiv/i-color.xml +++ b/tex/context/interface/mkiv/i-color.xml @@ -263,7 +263,7 @@ </cd:arguments> </cd:command> - <cd:command name="transparent" type="environment" category="colors" file="colo-ini.mkiv"> + <cd:command name="transparent" type="environment" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> @@ -366,7 +366,7 @@ <cd:command name="color" type="environment" begin="save" end="restore" level="system" category="colors" file="colo-ini.mkiv"/> - <cd:command name="definepalet" category="colors" file="colo-ini.mkiv"> + <cd:command name="definepalet" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml index 9fdd209c0..b89bd5845 100644 --- a/tex/context/interface/mkiv/i-columns.xml +++ b/tex/context/interface/mkiv/i-columns.xml @@ -73,7 +73,7 @@ </cd:arguments> </cd:command> - <cd:command name="columnspan" type="environment" category="columns" file="page-mul.mkiv"> + <cd:command name="columnspan" type="environment" level="document" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumnspan"/> diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml index 787475e8b..de000148b 100644 --- a/tex/context/interface/mkiv/i-common-argument.xml +++ b/tex/context/interface/mkiv/i-common-argument.xml @@ -532,4 +532,4 @@ </cd:keywords> </cd:define> -</cd:interface> +</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 ba90de3be..a6884185f 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -315,6 +315,41 @@ <cd:constant type="de-AT"/> <cd:constant type="ru-iso9"/> <cd:constant type="ocs-scn"/> + <!-- + <cd:constant type="en"/> + <cd:constant type="nl"/> + <cd:constant type="fr"/> + <cd:constant type="de"/> + <cd:constant type="deo"/> + <cd:constant type="fi"/> + <cd:constant type="sl"/> + <cd:constant type="ru"/> + <cd:constant type="uk"/> + <cd:constant type="be"/> + <cd:constant type="bg"/> + <cd:constant type="cu"/> + <cd:constant type="pl"/> + <cd:constant type="cz"/> + <cd:constant type="cs"/> + <cd:constant type="sk"/> + <cd:constant type="hr"/> + <cd:constant type="sr"/> + <cd:constant type="no"/> + <cd:constant type="da"/> + <cd:constant type="sv"/> + <cd:constant type="is"/> + <cd:constant type="gr"/> + <cd:constant type="la"/> + <cd:constant type="it"/> + <cd:constant type="ro"/> + <cd:constant type="es"/> + <cd:constant type="pt"/> + <cd:constant type="lt"/> + <cd:constant type="hu"/> + <cd:constant type="et"/> + <cd:constant type="kr"/> + <cd:constant type="jp"/> + --> <cd:constant type="cd:language"/> </cd:define> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex ae92c7a6b..2f56f7357 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 da34d4517..01adac436 100644 --- a/tex/context/interface/mkiv/i-context.xml +++ b/tex/context/interface/mkiv/i-context.xml @@ -227,6 +227,7 @@ <cd:interfacefile filename="i-twopassdata.xml"/> <cd:interfacefile filename="i-typography.xml"/> <cd:interfacefile filename="i-unit.xml"/> + <cd:interfacefile filename="i-userdata.xml"/> <cd:interfacefile filename="i-variables.xml"/> <cd:interfacefile filename="i-verbatim.xml"/> <cd:interfacefile filename="i-version.xml"/> diff --git a/tex/context/interface/mkiv/i-delimitedtext.xml b/tex/context/interface/mkiv/i-delimitedtext.xml index c34052644..ce1767b1c 100644 --- a/tex/context/interface/mkiv/i-delimitedtext.xml +++ b/tex/context/interface/mkiv/i-delimitedtext.xml @@ -16,7 +16,10 @@ <cd:command name="setupdelimitedtext" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + <cd:constant type="cd:number" prefix="cd:name" method="range"/> + </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="before"> <cd:constant type="cd:command"/> diff --git a/tex/context/interface/mkiv/i-document.xml b/tex/context/interface/mkiv/i-document.xml index fcd9e040b..178f7e9fe 100644 --- a/tex/context/interface/mkiv/i-document.xml +++ b/tex/context/interface/mkiv/i-document.xml @@ -218,4 +218,34 @@ </cd:arguments> </cd:command> + <cd:command name="doifelsedocumentvariable" level="style" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="argument-key"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifdocumentvariableelse" level="style" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="argument-key"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifdocumentvariable" level="style" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="argument-key"/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifnotdocumentvariable" level="style" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="argument-key"/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml index 4b26b9e95..77a0f00a1 100644 --- a/tex/context/interface/mkiv/i-floats.xml +++ b/tex/context/interface/mkiv/i-floats.xml @@ -206,6 +206,7 @@ <cd:constant type="no"/> </cd:parameter> <!-- end root only --> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> @@ -495,6 +496,7 @@ <cd:constant type="cd:dimension"/> </cd:parameter> <cd:inherit name="setupcounter"/> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> @@ -508,6 +510,29 @@ </cd:arguments> </cd:command> + <!-- + + <cd:command name="definefloatframed" level="style" category="structure background" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfloatframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupfloatframed" level="style" category="structure background" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command name="placefloat" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="place"/> @@ -975,4 +1000,6 @@ </cd:arguments> </cd:command> + <cd:command name="splittext" type="environment" level="document" category="structure" file="tabl-tsp.mkiv"/> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml index 03bdb2a7e..721bfca63 100644 --- a/tex/context/interface/mkiv/i-fonts.xml +++ b/tex/context/interface/mkiv/i-fonts.xml @@ -340,7 +340,7 @@ </cd:arguments> </cd:command> - <cd:command name="subtractfeature" variant="direct" clevel="style" ategory="fonts" file="font-fea.mkvi"> + <cd:command name="subtractfeature" variant="direct" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -965,7 +965,7 @@ </cd:arguments> </cd:command> - <cd:command name="switchstyleonly" clevel="style" ategory="fonts" file="font-ini.mkiv"> + <cd:command name="switchstyleonly" level="style" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="rm"/> diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml index cf9ffda0a..5e96ba80d 100644 --- a/tex/context/interface/mkiv/i-framed.xml +++ b/tex/context/interface/mkiv/i-framed.xml @@ -57,21 +57,25 @@ <cd:parameter name="topframe"> <cd:constant type="on" default="yes"/> <cd:constant type="off"/> + <cd:constant type="small"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="bottomframe"> <cd:constant type="on" default="yes"/> <cd:constant type="off"/> + <cd:constant type="small"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="leftframe"> <cd:constant type="on" default="yes"/> <cd:constant type="off"/> + <cd:constant type="small"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="rightframe"> <cd:constant type="on" default="yes"/> <cd:constant type="off"/> + <cd:constant type="small"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="region"> @@ -88,8 +92,9 @@ <cd:constant type="on" default="yes"/> <cd:constant type="off"/> <cd:constant type="overlay"/> - <cd:constant type="none"/> + <cd:constant type="small"/> <cd:constant type="closed"/> + <cd:constant type="none"/> </cd:parameter> <cd:parameter name="background"> <cd:resolve name="value-background"/> @@ -133,6 +138,9 @@ <cd:constant type="broad" default="yes"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="minheight"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="align"> <cd:inherit name="setupalign"/> </cd:parameter> @@ -628,4 +636,12 @@ </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="doifelseframed" level="system" category="background rules"> + <cd:arguments> + <cd:csname/> + <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-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml index cc3c32f3d..31c215864 100644 --- a/tex/context/interface/mkiv/i-hspace.xml +++ b/tex/context/interface/mkiv/i-hspace.xml @@ -35,6 +35,7 @@ <cd:constant type="quotation"/> <cd:constant type="sentence"/> <cd:constant type="intersentence"/> + <cd:constant type="final"/> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-language.xml b/tex/context/interface/mkiv/i-language.xml index e682aec3d..de8835a79 100644 --- a/tex/context/interface/mkiv/i-language.xml +++ b/tex/context/interface/mkiv/i-language.xml @@ -64,6 +64,7 @@ </cd:parameter> <cd:parameter name="font"> <cd:constant type="auto"/> + <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="bidi"> <cd:constant type="left"/> @@ -177,6 +178,12 @@ </cd:arguments> </cd:command> + <cd:command name="language" type="environment" level="document" category="language" file="lang-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-language"/> + </cd:arguments> + </cd:command> + <cd:command name="mainlanguage" level="style" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml index 3d08d8b8d..f25e72f72 100644 --- a/tex/context/interface/mkiv/i-pagegrid.xml +++ b/tex/context/interface/mkiv/i-pagegrid.xml @@ -32,7 +32,10 @@ <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + <cd:constant type="cd:number" prefix="cd:name" method="range"/> + </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="n"> <cd:constant type="cd:number"/> @@ -75,7 +78,10 @@ <cd:command name="setupcolumnset" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + <cd:constant type="cd:number" prefix="cd:name" method="range"/> + </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="n"> <cd:constant type="cd:number"/> @@ -86,6 +92,7 @@ <cd:parameter name="nright"> <cd:constant type="cd:number"/> </cd:parameter> + <!-- begin of values which can be set for each column --> <cd:parameter name="width"> <cd:constant type="cd:dimension"/> <cd:constant type="auto"/> @@ -93,6 +100,7 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <!-- end of values which can be set for each column --> <cd:parameter name="lines"> <cd:constant type="cd:number"/> </cd:parameter> diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex f06288b82..231db10fe 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-ruby.xml b/tex/context/interface/mkiv/i-ruby.xml index 10bcff22e..4422029b8 100644 --- a/tex/context/interface/mkiv/i-ruby.xml +++ b/tex/context/interface/mkiv/i-ruby.xml @@ -22,6 +22,7 @@ <cd:constant type="top" default="yes"/> <cd:constant type="left"/> <cd:constant type="right"/> + <cd:constant type="none"/> </cd:parameter> <cd:parameter name="align"> <cd:constant type="auto"/> diff --git a/tex/context/interface/mkiv/i-startstop.xml b/tex/context/interface/mkiv/i-startstop.xml index 3df32a516..ba0abb0b7 100644 --- a/tex/context/interface/mkiv/i-startstop.xml +++ b/tex/context/interface/mkiv/i-startstop.xml @@ -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-system.xml b/tex/context/interface/mkiv/i-system.xml index e5aa28ea4..c8abff238 100644 --- a/tex/context/interface/mkiv/i-system.xml +++ b/tex/context/interface/mkiv/i-system.xml @@ -1840,6 +1840,22 @@ </cd:arguments> </cd:command> + <cd:command name="doifelseassignmentcs" level="system" file="syst-aux.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:csname/> + <cd:csname/> + </cd:arguments> + </cd:command> + + <cd:command name="doifassignmentelsecs" level="system" file="syst-aux.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:csname/> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command name="convertargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml index a7f94fcd2..d07b32ec1 100644 --- a/tex/context/interface/mkiv/i-tagging.xml +++ b/tex/context/interface/mkiv/i-tagging.xml @@ -25,7 +25,7 @@ </cd:arguments> </cd:command> - <cd:command name="element" type="environment" category="xml" file="strc-tag.mkiv"> + <cd:command name="element" type="environment" level="document" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="assignment-userdata-list-optional"/> diff --git a/tex/context/interface/mkiv/i-token.xml b/tex/context/interface/mkiv/i-token.xml index 129f472ba..09e2ad3d6 100644 --- a/tex/context/interface/mkiv/i-token.xml +++ b/tex/context/interface/mkiv/i-token.xml @@ -28,4 +28,35 @@ </cd:arguments> </cd:command> + <cd:command name="definetokenlist" level="style" file="toks-aux.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="tokenlist" type="environment" level="style" file="toks-aux.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="gettokenlist" level="style" file="toks-aux.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="resettokenlist" level="style" file="toks-aux.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="settokenlist" level="style" file="toks-aux.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-unit.xml b/tex/context/interface/mkiv/i-unit.xml index 9efa452eb..c8092a4ed 100644 --- a/tex/context/interface/mkiv/i-unit.xml +++ b/tex/context/interface/mkiv/i-unit.xml @@ -125,4 +125,16 @@ </cd:arguments> </cd:command> + <cd:command name="spaceddigitsmethod" level="style" category="symbols" file="core-con.mkiv"/> <!-- alternative methods : 1 default, 2 and 3 only when > 4 --> + + <cd:command name="spaceddigitssymbol" level="style" category="symbols" file="core-con.mkiv"/> <!-- extra splitter symbol : {,} --> + + <cd:command name="spaceddigitsseparator" level="style" category="symbols" file="core-con.mkiv"/><!-- separator symbol : {\Uchar{"2008}} --> + + <cd:command name="spaceddigits" level="document" category="symbols" file="core-con.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-userdata.xml b/tex/context/interface/mkiv/i-userdata.xml new file mode 100644 index 000000000..e9617f0bc --- /dev/null +++ b/tex/context/interface/mkiv/i-userdata.xml @@ -0,0 +1,85 @@ +<?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="defineuserdata" level="style" category="structure" file="strc-usr.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupuserdata"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupuserdata" level="style" category="structure" file="strc-usr.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="default"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="cd:key"> + <cd:constant type="cd:value"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="userdata" type="environment" level="document" category="structure" file="strc-usr.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="assignment-userdata-list-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="defineuserdataalternative" level="style" category="structure" file="strc-usr.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupuserdataalternative"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupuserdataalternative" level="style" category="structure" file="strc-usr.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="renderingsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="cd:key"> + <cd:constant type="cd:value"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="getuserdata" level="style" category="structure" file="strc-usr.mkiv"/> + + <cd:command name="getinlineuserdata" level="style" category="structure" file="strc-usr.mkiv"/> + +</cd:interface> diff --git a/tex/context/interface/mkiv/i-verbatim.xml b/tex/context/interface/mkiv/i-verbatim.xml index e8abc1f66..830b8bb11 100644 --- a/tex/context/interface/mkiv/i-verbatim.xml +++ b/tex/context/interface/mkiv/i-verbatim.xml @@ -321,7 +321,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetypingfile" category="verbatim" level="system conditional" file="buff-ver.mkiv"> + <cd:command name="doifelsetypingfile" category="verbatim conditional" level="system" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -329,7 +329,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftypingfileelse" category="verbatim" level="system conditional" file="buff-ver.mkiv"> + <cd:command name="doiftypingfileelse" category="verbatim conditional" level="system" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-visualizer.xml b/tex/context/interface/mkiv/i-visualizer.xml index cf9d22e22..81d02f4fb 100644 --- a/tex/context/interface/mkiv/i-visualizer.xml +++ b/tex/context/interface/mkiv/i-visualizer.xml @@ -112,19 +112,19 @@ <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="makeup" default="yes"/> - <cd:constant type="all"/> + <cd:constant type="reset"/> <cd:constant type="boxes"/> - <cd:constant type="line"/> - <cd:constant type="glyph"/> - <cd:constant type="fontkern"/> + <cd:constant type="all"/> <cd:constant type="hbox"/> <cd:constant type="vbox"/> <cd:constant type="vtop"/> <cd:constant type="kern"/> <cd:constant type="glue"/> <cd:constant type="penalty"/> + <cd:constant type="fontkern"/> <cd:constant type="strut"/> <cd:constant type="whatsit"/> + <cd:constant type="glyph"/> <cd:constant type="simple"/> <cd:constant type="simplehbox"/> <cd:constant type="simplevbox"/> @@ -133,7 +133,11 @@ <cd:constant type="math"/> <cd:constant type="italic"/> <cd:constant type="origin"/> - <cd:constant type="reset"/> + <cd:constant type="discretionary"/> + <cd:constant type="expansion"/> + <cd:constant type="line"/> + <cd:constant type="space"/> + <cd:constant type="depth"/> </cd:keywords> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-whitespace.xml b/tex/context/interface/mkiv/i-whitespace.xml index 83547fea5..a44b08f1d 100644 --- a/tex/context/interface/mkiv/i-whitespace.xml +++ b/tex/context/interface/mkiv/i-whitespace.xml @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="unpacked" type="environment" category="whitespace" file="spac-ver.mkiv"/> + <cd:command name="unpacked" type="environment" level="document" category="whitespace" file="spac-ver.mkiv"/> <cd:command name="linecorrection" type="environment" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="locallinecorrection" type="environment" category="whitespace" file="spac-ver.mkiv"> + <cd:command name="locallinecorrection" type="environment" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> diff --git a/tex/context/interface/mkiv/i-xtable.xml b/tex/context/interface/mkiv/i-xtable.xml index 5172f885f..7ee0df3f2 100644 --- a/tex/context/interface/mkiv/i-xtable.xml +++ b/tex/context/interface/mkiv/i-xtable.xml @@ -155,15 +155,33 @@ </cd:arguments> </cd:command> + <!-- + + <cd:command name="xcolumn" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupxtable"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + <cd:command name="xcolumn" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> + <cd:command name="xcolumn" 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="xcell" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> |