diff options
| author | Luigi Scarso <luigi.scarso@gmail.com> | 2019-02-22 23:11:47 +0000 |
|---|---|---|
| committer | Luigi Scarso <luigi.scarso@gmail.com> | 2019-02-22 23:11:47 +0000 |
| commit | 5c6357cdb820b4f628d036ba7b2248f221d50c0b (patch) | |
| tree | 6365552f2737faaffe63a395272da242ee2c4f03 /Master/texmf-dist/tex/context/interface/mkiv | |
| parent | b4568bc71e054f3d1fd6404b45d2322631778284 (diff) | |
ConTeXt version 2019.02.22 19:35
git-svn-id: svn://tug.org/texlive/trunk@50086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/interface/mkiv')
71 files changed, 6525 insertions, 327 deletions
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml b/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml index 4cfb3c7fec4..73af42a963d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml @@ -780,6 +780,7 @@ <cd:constant type="global"/> <cd:constant default="yes" type="public"/> <cd:constant type="private"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> @@ -793,6 +794,7 @@ <cd:constant type="global"/> <cd:constant type="public"/> <cd:constant default="yes" type="private"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> @@ -864,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"/> @@ -1444,9 +1446,31 @@ <cd:parameter name="after"> <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="alternative"> + <cd:constant default="yes" type="paragraph"/> + <cd:constant type="text"/> + </cd:parameter> <cd:parameter name="inner"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + </cd:parameter> <cd:parameter name="style"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> @@ -1467,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"> @@ -1537,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"> @@ -1571,6 +1607,7 @@ <cd:constant method="range" prefix="cd:section" type="cd:section"/> <cd:constant method="range" prefix="cd:section" type="*"/> <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> </cd:parameter> <cd:parameter name="sectionblock"> <cd:constant type="yes"/> @@ -1885,6 +1922,17 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="linebox"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="shiftbox"> + <cd:arguments> + <cd:dimension/> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command file="supp-box.mkiv" level="system" name="inlinedbox"> <cd:arguments> <cd:content/> @@ -2975,6 +3023,10 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="strip"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -2993,7 +3045,7 @@ </cd:command> <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="getbuffer"> <cd:arguments> - <cd:keywords optional="yes"> + <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> @@ -3012,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> @@ -3740,6 +3792,13 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="textormathchars"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="characters" file="char-ini.mkiv" level="style" name="chardescription"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -3796,9 +3855,35 @@ </cd:arguments> </cd:command> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="resetcharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="nocharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setcharacteraligndetail"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + <cd:constant method="apply" prefix="number" type="cd:text"/> + <cd:constant method="apply" prefix="text" type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="alignmentcharacter"/> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="characteralign" type="environment"> <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupcharacteralign"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="characteralign" type="environment" variant="argument"> + <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> <cd:constant method="apply" prefix="number" type="cd:text"/> @@ -3811,6 +3896,31 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="style" name="setupcharacteralign"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="leftwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="leftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="rightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="character"> + <cd:constant type="cd:text"/> + <cd:constant method="apply" prefix="number" type="cd:text"/> + <cd:constant method="apply" prefix="text" type="cd:text"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setfirstpasscharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setsecondpasscharacteralign"/> </cd:interface> <cd:interface file="i-characterspacing.xml"> <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="definecharacterspacing"> @@ -4681,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"/> @@ -4787,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"/> @@ -5111,10 +5221,10 @@ <cd:constant type="no"/> </cd:parameter> <cd:parameter name="align"> - <cd:constant type="setupalign"/> + <cd:inherit type="setupalign"/> </cd:parameter> <cd:parameter name="tolerance"> - <cd:constant type="setuptolerance"/> + <cd:inherit type="setuptolerance"/> </cd:parameter> <cd:parameter name="blank"> <cd:inherit name="blank"/> @@ -5147,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"/> @@ -5654,6 +5764,16 @@ <cd:csname/> </cd:arguments> </cd:command> + <cd:command file="mult-aux.mkiv" level="system" name="installmacrostack"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + <cd:command file="mult-aux.mkiv" level="system" name="installglobalmacrostack"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-comment.xml"> <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="definecomment"> @@ -6627,6 +6747,7 @@ <cd:constant method="range" prefix="cd:section" type="cd:section"/> <cd:constant method="range" prefix="cd:section" type="*"/> <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> </cd:parameter> <cd:parameter name="numberorder"> <cd:constant type="reverse"/> @@ -7211,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"> @@ -7458,6 +7580,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -7541,6 +7664,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -7958,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"> @@ -8054,7 +8227,7 @@ <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant type="cd:number"/> + <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="alternative"> <cd:constant default="yes" type="normal"/> @@ -8191,6 +8364,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant default="yes" type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -8274,6 +8448,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -9537,6 +9715,21 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="fillupto"> + <cd:arguments> + <cd:keywords> + <cd:constant type="sym"/> + <cd:constant type="symbol"/> + <cd:constant type="rule"/> + <cd:constant type="width"/> + <cd:constant type="space"/> + <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="rules" file="spac-flr.mkiv" level="style" name="checkedfiller"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -10099,10 +10292,10 @@ <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="ntop"> - <cd:constant type="cd:dimension"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="nbottom"> - <cd:constant type="cd:dimension"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="step"> <cd:constant type="small"/> @@ -10118,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> @@ -10131,7 +10325,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupfloatcaption"> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -10153,6 +10347,7 @@ <cd:constant type="low"/> <cd:constant type="high"/> <cd:constant type="grid"/> + <cd:constant type="lines"/> <cd:constant type="overlay"/> <cd:constant type="inner"/> <cd:constant type="outer"/> @@ -10192,6 +10387,13 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="headstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> @@ -10247,26 +10449,27 @@ <cd:constant type="cd:dimension"/> </cd:parameter> <cd:inherit name="setupcounter"/> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaptions"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> + <cd:inherit name="setupcaption"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaptions"> + <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="setupfloatcaption"/> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> @@ -10930,6 +11133,53 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="style" name="definefacingfloat"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfacingfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="style" name="setupfacingfloat"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="document" name="facingfloat" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd: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"> @@ -11201,12 +11451,20 @@ <cd:constant type="cd:number"/> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="target"> + <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:parameter name="method"> + <cd:constant type="lowercase"/> + <cd:constant type="uppercase"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -11461,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"/> @@ -11575,6 +11833,45 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifelsefontfeature"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doiffontfeatureelse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifunknownfontfeature"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doaddfeature"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> @@ -12119,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"/> @@ -13273,6 +13570,9 @@ <cd:constant type="-"/> <cd:constant type="cd:reference"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula" type="environment"> @@ -13311,6 +13611,9 @@ <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placesubformula"> @@ -13320,6 +13623,9 @@ <cd:constant type="-"/> <cd:constant type="cd:reference"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat" level="document" name="formulanumber"> @@ -13535,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"> @@ -13566,6 +13876,8 @@ <cd:constant default="yes" type="on"/> <cd:constant type="off"/> <cd:constant type="overlay"/> + <cd:constant type="small"/> + <cd:constant type="closed"/> <cd:constant type="none"/> </cd:parameter> <cd:parameter name="background"> @@ -13613,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> @@ -14055,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"> @@ -14360,6 +14686,16 @@ <cd:constant type="no"/> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="transform"> + <cd:constant default="yes" type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="userpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="ownerpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -14678,6 +15014,20 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="overlayimage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="clippedoverlayimage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-grid.xml"> <cd:command category="layout" file="page-grd.mkiv" level="document" name="showgrid"> @@ -14694,6 +15044,7 @@ <cd:constant default="yes" type="right"/> <cd:constant type="left"/> <cd:constant type="outer"/> + <cd:constant type="inner"/> <cd:constant default="yes" type="columns"/> </cd:keywords> </cd:arguments> @@ -14924,6 +15275,12 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="rulecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -15151,6 +15508,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> @@ -15189,10 +15547,12 @@ <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="thinspace"/> <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negthinspace"/> <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="enspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negenspace"/> <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="style" name="negemspace"/> <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="dotfskip"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -16457,6 +16817,7 @@ <cd:constant type="paper"/> <cd:constant type="attachment"/> <cd:constant type="layer"/> + <cd:constant type="title"/> </cd:parameter> <cd:parameter name="copies"> <cd:constant type="cd:number"/> @@ -17890,6 +18251,40 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="defineperiodkerning"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupperiodkerning"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setupperiodkerning"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setperiodkerning"> + <cd:arguments> + <cd:keywords> + <cd:constant type="reset"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="resetperiodkerning"/> </cd:interface> <cd:interface file="i-label.xml"> <cd:command category="structure" file="strc-lab.mkiv" level="style" name="definelabel"> @@ -17994,6 +18389,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant default="yes" type="intext"/> <cd:constant type="cd:name"/> @@ -18078,6 +18474,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -18361,6 +18761,9 @@ <cd:parameter name="date"> <cd:inherit name="currentdate"/> </cd:parameter> + <cd:parameter name="time"> + <cd:inherit name="currenttime"/> + </cd:parameter> <cd:parameter name="patterns"> <cd:constant type="cd:file"/> </cd:parameter> @@ -18385,6 +18788,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"/> @@ -18517,6 +18921,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> @@ -19120,6 +19531,7 @@ </cd:parameter> <cd:parameter name="cropoffset"> <cd:constant type="cd:dimension"/> + <cd:constant type="auto"/> </cd:parameter> <cd:parameter name="trimoffset"> <cd:constant type="cd:dimension"/> @@ -19313,7 +19725,7 @@ </cd:command> <cd:command category="layout" file="page-run.mkiv" level="document" name="showmargins"/> <cd:command category="layout" file="page-spr.mkiv" level="document" name="spread" type="environment"/> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelsetopofpage"> + <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doifelsetopofpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19323,7 +19735,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doiftopofpageelse"> + <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doiftopofpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19334,6 +19746,107 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-linefiller.xml"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefiller"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="location"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant default="yes" type="both"/> + </cd:parameter> + <cd:parameter name="scope"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant default="yes" type="local"/> + <cd:constant type="global"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="height"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="depth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="threshold"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="textstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="textcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="mp"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefillers"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="linefiller" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setlinefiller"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-linenumber.xml"> <cd:command category="structure" file="page-lin.mkvi" level="style" name="definelinenumbering"> <cd:arguments> @@ -19825,7 +20338,6 @@ <cd:parameter name="width"> <cd:constant type="fit"/> <cd:constant type="broad"/> - <cd:constant type="auto"/> <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="height"> @@ -20022,6 +20534,7 @@ <cd:constant method="range" prefix="cd:section" type="cd:section"/> <cd:constant method="range" prefix="cd:section" type="*"/> <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> </cd:parameter> <cd:parameter name="pageprefixconnector"> <cd:constant type="cd:command"/> @@ -20152,7 +20665,7 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -20162,7 +20675,55 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:parameter name="criterium"> + <cd:constant default="yes" type="local"/> + <cd:constant type="intro"/> + <cd:constant type="reference"/> + <cd:constant method="range" prefix="cd:sectionblock" type="reference"/> + <cd:constant type="all"/> + <cd:constant method="range" prefix="cd:sectionblock" type="all"/> + <cd:constant type="text"/> + <cd:constant method="range" prefix="cd:sectionblock" type="text"/> + <cd:constant type="current"/> + <cd:constant method="range" prefix="cd:sectionblock" type="current"/> + <cd:constant type="here"/> + <cd:constant type="previous"/> + <cd:constant method="range" prefix="cd:sectionblock" type="previous"/> + <cd:constant type="component"/> + <cd:constant type="cd:section"/> + <cd:constant method="range" prefix="cd:sectionblock" type="cd:section"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="extras"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="order"> + <cd:constant type="command"/> + <cd:constant type="all"/> + <cd:constant type="title"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant default="yes" type="b"/> + <cd:constant type="c"/> + <cd:constant type="d"/> + <cd:constant type="e"/> + <cd:constant type="f"/> + <cd:constant type="g"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="command"/> + <cd:constant type="none"/> + <cd:constant type="interactive"/> + <cd:constant type="paragraph"/> + <cd:constant type="horizontal"/> + <cd:constant type="vertical"/> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -20172,7 +20733,7 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -20183,7 +20744,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -20197,7 +20758,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -20211,7 +20772,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -21617,6 +22178,7 @@ <cd:parameter name="align"> <cd:constant default="yes" type="l2r"/> <cd:constant type="r2l"/> + <cd:constant type="righttoleft"/> </cd:parameter> <cd:parameter name="bidi"> <cd:constant type="yes"/> @@ -21692,6 +22254,17 @@ <cd:parameter name="ampersand"> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="collapsing"> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant default="yes" type="3"/> + <cd:constant type="none"/> + <cd:constant type="reset"/> + </cd:parameter> + <cd:parameter name="kernpairs"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -22302,6 +22875,9 @@ <cd:parameter name="method"> <cd:constant type="auto"/> </cd:parameter> + <cd:parameter name="size"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="factor"> <cd:constant type="none"/> <cd:constant type="auto"/> @@ -22558,6 +23134,14 @@ <cd:constant value="mathmatrix"/> </cd:instances> </cd:command> + <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix"> + <cd:sequence> + <cd:variable value="mathmatrix"/> + </cd:sequence> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="mathematics tables" file="math-ali.mkiv" level="document" name="matrices" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -24807,6 +25391,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -25165,6 +25753,7 @@ </cd:command> <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="postponenotes"/> <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="flushnotes"/> + <cd:command category="structure notes" file="strc-not.mkvi" name="postponingnotes" type="environment"/> <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifelsenoteonsamepage"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -26052,6 +26641,81 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-pagecolumns.xml"> + <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="definepagecolumns"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="setuppagecolumns"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="separator"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="direction"> + <cd:constant default="yes" type="normal"/> + <cd:constant type="reverse"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="blank"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment" variant="name"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" generated="yes" level="document" name="pagecolumns" type="environment" variant="instance"> + <cd:sequence> + <cd:instance value="pagecolumns"/> + </cd:sequence> + </cd:command> + </cd:interface> <cd:interface file="i-pagecomment.xml"> <cd:command category="pdf" file="page-com.mkiv" level="style" name="setuppagecomment"> <cd:arguments> @@ -26118,7 +26782,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagegrid.xml"> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26127,14 +26791,15 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnset"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> + <cd:constant method="range" prefix="cd:name" type="cd:number"/> </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -26173,43 +26838,27 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="pagegrid" type="environment" variant="example"> + <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="columnset" type="environment" variant="example"> <cd:sequence> - <cd:variable value="pagegrid"/> + <cd:variable value="columnset"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegrid" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnset" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="setpagegrid"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="c"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="r"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="option"> - <cd:constant default="yes" type="none"/> - </cd:parameter> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetspan"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26218,11 +26867,11 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetspan"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26248,24 +26897,24 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegridspan" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnsetspan" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="pagegridspanwidth"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="columnsetspanwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetarea"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26274,11 +26923,11 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridarea"/> + <cd:inherit name="setupcolumnsetarea"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetarea"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26318,7 +26967,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridareatext"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetareatext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26328,7 +26977,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridlines"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetlines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26344,7 +26993,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridstart"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetstart"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26840,6 +27489,18 @@ </cd:command> </cd:interface> <cd:interface file="i-pagestate.xml"> + <cd:command file="spac-pag.mkiv" level="system" name="signalrightpage"/> + <cd:command file="spac-pag.mkiv" level="system" name="doifelserightpage"> + <cd: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 file="spac-pag.mkiv" level="system" name="rightpageorder"/> <cd:command file="core-dat.mkiv" level="system" name="definepagestate"> <cd:arguments> <cd:keywords> @@ -26899,19 +27560,65 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="core-dat.mkiv" level="system" name="pagestaterealpageorder"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="core-dat.mkiv" level="system" name="autopagestaterealpage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="core-dat.mkiv" level="system" name="setautopagestaterealpageno"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="core-dat.mkiv" level="system" name="autopagestaterealpageorder"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-pagemarks.xml"> - <cd:command file="page-lay.mkiv" level="style" name="markpage"> + <cd:command file="page-ini.mkiv" level="style" name="markpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords optional="yes"> + <cd:keywords list="yes" optional="yes"> <cd:constant method="none" prefix="cd:sign" type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="page-lay.mkiv" level="style" name="doifelsemarkedpage"> + <cd:command file="page-ini.mkiv" level="style" name="markedpages"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="page-ini.mkiv" level="style" name="markpages" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="conditional" file="page-ini.mkiv" level="style" name="doifelsemarkedpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32655,6 +33362,7 @@ <cd:constant method="range" prefix="cd:section" type="cd:section"/> <cd:constant method="range" prefix="cd:section" type="*"/> <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> </cd:parameter> <cd:parameter name="numberconversion"> <cd:constant type="cd:name"/> @@ -32831,6 +33539,10 @@ <cd:constant type="all"/> <cd:constant type="packed"/> </cd:parameter> + <cd:parameter name="check"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> <cd:constant type="text"/> @@ -32865,6 +33577,7 @@ <cd:constant method="range" prefix="cd:section" type="cd:section"/> <cd:constant method="range" prefix="cd:section" type="*"/> <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> </cd:parameter> <cd:parameter name="pageprefixconnector"> <cd:constant type="cd:command"/> @@ -32970,6 +33683,12 @@ <cd:parameter name="pagecolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="n"> <cd:constant type="cd:number"/> </cd:parameter> @@ -33034,6 +33753,10 @@ <cd:constant default="yes" type="no"/> <cd:constant type="all"/> </cd:parameter> + <cd:parameter name="check"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> <cd:constant type="text"/> @@ -33068,6 +33791,7 @@ <cd:constant method="range" prefix="cd:section" type="cd:section"/> <cd:constant method="range" prefix="cd:section" type="*"/> <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> </cd:parameter> <cd:parameter name="pageprefixconnector"> <cd:constant type="cd:command"/> @@ -33173,6 +33897,12 @@ <cd:parameter name="pagecolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="n"> <cd:constant type="cd:number"/> </cd:parameter> @@ -33740,6 +34470,89 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-ruby.xml"> + <cd:command category="fonts" file="typo-rub.mkiv" level="style" name="defineruby"> + <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="setupruby"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="fonts" file="typo-rub.mkiv" level="style" name="setupruby"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="location"> + <cd:constant 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"/> + <cd:constant type="flushleft"/> + <cd:constant default="yes" type="middle"/> + <cd:constant type="flushright"/> + </cd:parameter> + <cd:parameter name="stretch"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="hoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="voffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </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="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="fonts" file="typo-rub.mkiv" level="document" name="ruby"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </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:command category="fonts" file="typo-rub.mkiv" level="document" name="ruby" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-scale.xml"> <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="definescale"> <cd:arguments> @@ -33786,6 +34599,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -33793,6 +34607,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -33800,6 +34615,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -33925,6 +34741,32 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setlocalscript"> + <cd:arguments> + <cd:keywords> + <cd:constant type="hangul"/> + <cd:constant type="hanzi"/> + <cd:constant type="nihongo"/> + <cd:constant type="ethiopic"/> + <cd:constant type="thai"/> + <cd:constant type="test"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setglobalscript"> + <cd:arguments> + <cd:keywords> + <cd:constant type="hangul"/> + <cd:constant type="hanzi"/> + <cd:constant type="nihongo"/> + <cd:constant type="ethiopic"/> + <cd:constant type="thai"/> + <cd:constant type="test"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="language" file="scrp-ini.mkvi" level="system" name="resetscript"/> <cd:command category="language" file="scrp-ini.mkvi" name="script" type="environment"> <cd:arguments> @@ -34026,6 +34868,7 @@ <cd:constant method="range" prefix="cd:section" type="cd:section"/> <cd:constant method="range" prefix="cd:section" type="*"/> <cd:constant method="range" prefix="cd:section" type="all"/> + <cd:constant type="current"/> </cd:parameter> <cd:parameter name="referenceprefix"> <cd:constant type="+"/> @@ -34928,6 +35771,16 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="core-env.mkiv" level="system" name="copysetups"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command file="core-env.mkiv" level="system" name="showsetupsdefinition"> <cd:arguments> <cd:keywords> @@ -35688,10 +36541,7 @@ <cd:variable value="startstop"/> </cd:sequence> </cd:command> - <cd:command category="structure" file="core-sys.mkiv" level="document" name="startstop" type="environment"> - <cd:sequence> - <cd:string value=""/> - </cd:sequence> + <cd:command category="structure" file="core-sys.mkiv" level="document" name="" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -35907,6 +36757,7 @@ </cd:arguments> </cd:command> <cd:command file="spac-ver.mkiv" level="system" name="setfontstrut"/> + <cd:command file="spac-ver.mkiv" level="system" name="settightstrut"/> <cd:command file="spac-ver.mkiv" level="system" name="setcapstrut"/> <cd:command file="spac-ver.mkiv" level="system" name="setnostrut"/> <cd:command file="spac-ver.mkiv" level="document" name="showstruts"/> @@ -36084,6 +36935,11 @@ <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="font"> + <cd:constant type="cd:font"/> + </cd:parameter> + </cd:assignments> </cd:arguments> </cd:command> <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="setupsymbolset"> @@ -37719,6 +38575,13 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="syst-aux.mkiv" level="system" name="firstinlist"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="cd:command"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="dogetcommacommandelement"> <cd:arguments> <cd:keywords delimiters="none"> @@ -38653,7 +39516,7 @@ </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="increment" variant="argument"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -38666,7 +39529,7 @@ </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="decrement" variant="argument"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -38870,6 +39733,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"> @@ -41112,6 +41993,36 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoif"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifnot"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifelse"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command file="syst-lua.mkiv" level="system" name="expdoifelsecommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> @@ -41391,6 +42302,74 @@ <cd:constant type="grid"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="blank"> + <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="packed"/> + <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:parameter> + <cd:parameter name="headstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="background"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="foregroundstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="foregroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="align"> <cd:constant type="left"/> <cd:constant type="middle"/> @@ -41556,7 +42535,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"/> @@ -41631,6 +42610,13 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="xml" file="strc-tag.mkiv" level="style" name="ignoretagsinexport"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-textbackground.xml"> <cd:command category="background" file="anch-bck.mkiv" level="style" name="definetextbackground"> @@ -42043,7 +43029,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42055,7 +43041,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42067,7 +43053,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42079,7 +43065,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42091,7 +43077,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42511,6 +43497,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"> @@ -43240,6 +44264,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"> @@ -44106,7 +45232,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"/> @@ -44119,7 +45245,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"/> @@ -44419,19 +45545,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"/> @@ -44440,7 +45566,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> @@ -44449,6 +45579,8 @@ <cd:command file="trc-vis.mkiv" level="document" name="showglyphs"/> <cd:command file="trc-vis.mkiv" level="document" name="showfontkerns"/> <cd:command file="trc-vis.mkiv" level="document" name="showfontitalics"/> + <cd:command file="trc-vis.mkiv" level="document" name="showglyphdata"/> + <cd:command file="trc-vis.mkiv" level="document" name="showfontexpansion"/> <cd:command file="trc-vis.mkiv" level="system" name="setvisualizerfont"> <cd:arguments> <cd:keywords optional="yes"> @@ -44565,6 +45697,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"/> @@ -44653,6 +45786,20 @@ <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="smallskip"/> <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="medskip"/> <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="bigskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="checkedblank"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="prerollblank"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-whitespace.xml"> <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupwhitespace"> @@ -44686,7 +45833,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"> @@ -44695,7 +45842,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"/> @@ -44703,6 +45850,7 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ver.mkiv" level="system" name="forgetparskip"/> </cd:interface> <cd:interface file="i-xml.xml"> <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmain"> @@ -45671,6 +46819,45 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifatt"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:string/> + <cd:string/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifnotatt"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:string/> + <cd:string/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelseatt"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:string/> + <cd:string/> + <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="xml" file="lxml-ini.mkiv" level="style" name="xmldoifselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -46057,6 +47244,25 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="aligncharacter"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="alignmentleftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentrightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentleftwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentrightwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentcharacter"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> @@ -46116,6 +47322,20 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcolumn" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupxtable"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcolumn" type="environment" variant="name"> + <cd: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/Master/texmf-dist/tex/context/interface/mkiv/i-attribute.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-attribute.xml index 96a680e1929..0ea4ce7c0d5 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-attribute.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-attribute.xml @@ -30,6 +30,7 @@ <cd:constant type="global"/> <cd:constant type="public" default="yes"/> <cd:constant type="private"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> @@ -42,6 +43,7 @@ <cd:constant type="global"/> <cd:constant type="public"/> <cd:constant type="private" default="yes"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-backend.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-backend.xml index 5db77b5bdd1..d0bdb485346 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-backend.xml +++ b/Master/texmf-dist/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"/> @@ -86,4 +86,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-block.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-block.xml index fa526250641..3416a96ee81 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-block.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-block.xml @@ -24,9 +24,25 @@ <cd:parameter name="after"> <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="alternative"> + <cd:constant type="paragraph" default="yes"/> + <cd:constant type="text"/> + </cd:parameter> <cd:parameter name="inner"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:resolve name="value-alignsimple"/> + </cd:parameter> <cd:parameter name="style"> <cd:resolve name="value-style"/> </cd:parameter> @@ -47,6 +63,7 @@ <cd:constant type="-"/> <cd:constant type="cd:name"/> </cd:keywords> + <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> @@ -103,4 +120,10 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <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/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml index dd5c3052928..e89be4fd06c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml @@ -246,6 +246,19 @@ </cd:arguments> </cd:command> + <cd:command name="linebox" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="shiftbox" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:dimension/> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="inlinedbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> @@ -1128,4 +1141,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-buffer.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-buffer.xml index 2ec89f57103..f08cb8ca447 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-buffer.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-buffer.xml @@ -65,6 +65,10 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="strip"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -81,7 +85,7 @@ <cd:command name="getbuffer" level="document" category="buffer" file="buff-ini.mkiv"> <cd:arguments> - <cd:resolve name="keyword-buffer-optional"/> + <cd:resolve name="keyword-buffer-list-optional"/> </cd:arguments> </cd:command> @@ -97,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/Master/texmf-dist/tex/context/interface/mkiv/i-character.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-character.xml index c391836d5df..61d6a32a677 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-character.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-character.xml @@ -87,6 +87,12 @@ </cd:arguments> </cd:command> + <cd:command name="textormathchars" level="style" category="characters fonts" file="char-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-character"/> + </cd:arguments> + </cd:command> + <cd:command name="chardescription" level="style" category="characters" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> @@ -141,4 +147,4 @@ <cd:command name="textplus" level="document" category="characters" file="enco-ini.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-characteralign.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-characteralign.xml index 3e9f81722d1..b95ff8487b3 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-characteralign.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-characteralign.xml @@ -24,10 +24,33 @@ <cd:command name="resetcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> + <cd:command name="nocharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> + + <cd:command name="setcharacteraligndetail" level="system" category="alignment" file="typo-tal.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + <cd:constant type="cd:text" prefix="number" method="apply"/> + <cd:constant type="cd:text" prefix="text" method="apply"/> + </cd:keywords> + <cd:resolve name="argument-dimension"/> + <cd:resolve name="argument-dimension"/> + </cd:arguments> + </cd:command> + <cd:command name="alignmentcharacter" level="system" category="alignment" file="typo-tal.mkiv"/> <cd:command name="characteralign" type="environment" category="alignment" level="system" file="typo-tal.mkiv"> <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupcharacteralign"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="characteralign" type="environment" variant="argument" category="alignment" level="system" file="typo-tal.mkiv"> + <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> <cd:constant type="cd:text" prefix="number" method="apply"/> @@ -42,4 +65,32 @@ </cd:arguments> </cd:command> + <cd:command name="setupcharacteralign" level="style" category="alignment" file="typo-tal.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="leftwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="leftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="rightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="character"> + <cd:constant type="cd:text"/> + <cd:constant type="cd:text" prefix="number" method="apply"/> + <cd:constant type="cd:text" prefix="text" method="apply"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setfirstpasscharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> + + <cd:command name="setsecondpasscharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> + </cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-color.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-color.xml index 80da11f3b66..4dd76d0b3af 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-color.xml +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml index 9fdd209c0b9..bbc022ac67a 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml @@ -34,10 +34,10 @@ <cd:constant type="no"/> </cd:parameter> <cd:parameter name="align"> - <cd:constant type="setupalign"/> + <cd:inherit type="setupalign"/> </cd:parameter> <cd:parameter name="tolerance"> - <cd:constant type="setuptolerance"/> + <cd:inherit type="setuptolerance"/> </cd:parameter> <cd:parameter name="blank"> <cd:inherit name="blank"/> @@ -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"/> @@ -108,4 +108,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-commandhandler.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-commandhandler.xml index 40da525f339..6accac8657b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-commandhandler.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-commandhandler.xml @@ -311,4 +311,16 @@ </cd:arguments> </cd:command> + <cd:command name="installmacrostack" level="system" file="mult-aux.mkiv"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + + <cd:command name="installglobalmacrostack" level="system" file="mult-aux.mkiv"> + <cd:arguments> + <cd:csname/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-keyword.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-keyword.xml index 97ac50caadf..8469dab2f85 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-keyword.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-keyword.xml @@ -792,4 +792,21 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... [...] --> + <!-- --> + <!-- * SCRIPT --> + + <cd:define name="keyword-script"> + <cd:keywords> + <cd:constant type="hangul"/> + <cd:constant type="hanzi"/> + <cd:constant type="nihongo"/> + <cd:constant type="ethiopic"/> + <cd:constant type="thai"/> + <cd:constant type="test"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:define> + </cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml index c362779c4c4..a6884185ff2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml @@ -100,6 +100,7 @@ <cd:constant type="cd:section" prefix="cd:section" method="range"/> <cd:constant type="*" prefix="cd:section" method="range"/> <cd:constant type="all" prefix="cd:section" method="range"/> + <cd:constant type="current"/> </cd:define> <!-- numbersegments = ... --> @@ -314,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> @@ -683,4 +719,55 @@ <cd:constant type="cd:name"/> </cd:define> + <!-- blank --> + + <cd:define name="value-blank"> + <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="packed"/> + <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:define> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf b/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf Binary files differindex 39538aa7bcd..7f468c41699 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml index ba09abcbae4..01adac436e1 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml @@ -116,6 +116,7 @@ <cd:interfacefile filename="i-language.xml"/> <cd:interfacefile filename="i-layer.xml"/> <cd:interfacefile filename="i-layout.xml"/> + <cd:interfacefile filename="i-linefiller.xml"/> <cd:interfacefile filename="i-linenumber.xml"/> <cd:interfacefile filename="i-lines.xml"/> <cd:interfacefile filename="i-linetable.xml"/> @@ -151,6 +152,7 @@ <cd:interfacefile filename="i-output.xml"/> <cd:interfacefile filename="i-overlay.xml"/> <cd:interfacefile filename="i-pagebreak.xml"/> + <cd:interfacefile filename="i-pagecolumns.xml"/> <cd:interfacefile filename="i-pagecomment.xml"/> <cd:interfacefile filename="i-pagefigure.xml"/> <cd:interfacefile filename="i-pagegrid.xml"/> @@ -187,6 +189,7 @@ <cd:interfacefile filename="i-renderingwindow.xml"/> <cd:interfacefile filename="i-replacement.xml"/> <cd:interfacefile filename="i-rotatation.xml"/> + <cd:interfacefile filename="i-ruby.xml"/> <cd:interfacefile filename="i-scale.xml"/> <cd:interfacefile filename="i-script.xml"/> <cd:interfacefile filename="i-section.xml"/> @@ -224,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"/> @@ -234,4 +238,4 @@ <cd:interfacefile filename="i-xml.xml"/> <cd:interfacefile filename="i-xtable.xml"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-contextname.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-contextname.xml new file mode 100644 index 00000000000..3e289f3f5ca --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-contextname.xml @@ -0,0 +1,2353 @@ +<?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="quotedbl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texthash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdollar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textpercent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textampersand" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotesingle" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcomma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texthyphen" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textperiod" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textslash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textat" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessJ" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbackslash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textasciicircum" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textunderscore" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="idotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbraceleft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbraceright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textasciitilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="nobreakspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="exclamdown" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textsterling" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcurrency" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textyen" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbrokenbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="sectionmark" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="copyright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ordfeminine" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="leftguillemot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textlognot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="softhyphen" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="registered" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdegree" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textpm" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="twosuperior" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threesuperior" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textmu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="paragraphmark" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="periodcentered" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onesuperior" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ordmasculine" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rightguillemot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onequarter" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onehalf" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threequarter" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="questiondown" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Agrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Aacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Atilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Aring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="AEligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ccedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Egrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Eacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Igrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Iacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Icircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Idiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Eth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ograve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Oacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Otilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textmultiply" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ostroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ugrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ucircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Yacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Thorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ssharp" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="agrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="atilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aeligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ccedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="egrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="eacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="igrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="iacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="icircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="idiaeresis" level="document" category="characters" file="char-def.lua"/> + + comment="contextname=eth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ograve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="otilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdiv" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ostroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ugrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ucircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="yacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="thorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ydiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Amacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="amacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Aogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Cacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ccircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ccircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Cdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ccaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ccaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Emacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="emacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ebreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ebreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Edotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="edotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Eogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="eogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Hcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Hstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Itilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="itilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Imacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="imacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ibreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ibreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Iogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="iogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Idotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="IJligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ijligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Jcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="jcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Kcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="kcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="kkra" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ldotmiddle" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ldotmiddle" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Nacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="nacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ncommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ncommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ncaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ncaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="napostrophe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Neng" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="neng" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Omacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="omacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Obreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="obreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="OEligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oeligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Racute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="racute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Rcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Rcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Sacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="sacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Scircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="scircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Scedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="scedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Scaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="scaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Tcedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tcedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Tcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Tstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Utilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="utilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Umacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="umacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ubreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ubreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Wcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="wcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ycircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ycircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ydiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="slong" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="bstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Bhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Chook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="chook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dafrican" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Schwa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Fhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ghook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Istroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Khook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="khook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Phook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="phook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Thook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="thook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Yhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="yhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="DZcaronligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dzcaronligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dzcaronligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="LJligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ljligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ljligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="NJligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Njligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="njligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Icaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="icaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ucaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ucaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresisacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresisacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresiscaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresiscaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresisgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresisgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adotaccentmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adotaccentmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="AEmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aemacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Kcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="kcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Oogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Oogonekmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oogonekmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="jcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="DZligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dzligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dzligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Aringacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aringacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="AEacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aeacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ostrokeacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ostrokeacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ainvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ainvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Edoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="edoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Einvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="einvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Idoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="idoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Iinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="iinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Oinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Rdoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rdoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Rinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Scommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="scommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Tcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Hcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dcurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Otildemacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="otildemacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odotaccentmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odotaccentmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ymacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ymacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lcurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ncurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tcurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessj" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Astroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Cstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="bhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ccurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="schwa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="schwahook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessjstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texttilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texthungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbottomdot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbottomcomma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greektonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlpha" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekBeta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekGamma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekDelta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilon" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekZeta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekTheta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIota" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekKappa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekLambda" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekMu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekNu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekXi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekPi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekRho" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekSigma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekTau" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilon" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekPhi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekChi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekPsi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmega" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadialytika" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondialytika" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalpha" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekbeta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekgamma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdelta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilon" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekzeta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greektheta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiota" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekkappa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeklambda" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekmu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeknu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekxi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekrho" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekfinalsigma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeksigma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greektau" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilon" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekphi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekchi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomega" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytika" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicrontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekthetaalt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekphialt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpialt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekkoppa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekstigma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdigamma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeknumkoppa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeksampi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekrhoalt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeksigmalunate" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonalt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekSigmalunate" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYO" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicGJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDZE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicLJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicNJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicTSHE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUSHRT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDZHE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicB" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicV" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicG" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicD" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZ" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicISHRT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicK" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicL" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicM" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicN" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicO" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicP" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicR" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicS" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicU" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicF" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSHCH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicHRDSN" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicERY" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSFTSN" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEREV" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYU" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillica" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicb" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicv" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicg" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicd" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillice" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczh" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicz" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillici" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicishrt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillick" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicm" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillico" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicp" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicr" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillics" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillict" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicf" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillich" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicch" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicsh" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicshch" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillichrdsn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicery" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicsftsn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicerev" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicya" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyo" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicdje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicgje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicie" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicdze" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliclje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicnje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillictshe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicigrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicushrt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicdzhe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOMEGA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicomega" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYAT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyat" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliceiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicLITTLEYUS" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliclittleyus" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicLITTLEYUSiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliclittleyusiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicBIGYUS" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicbigyus" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicBIGYUSiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicbigyusiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKSI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicksi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPSI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicpsi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicFITA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicfita" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIZHITSA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicizhitsa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIZHITSAdoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicizhitsadoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUK" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicuk" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOMEGAround" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicomegaround" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOMEGAtitlo" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicomegatitlo" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKOPPA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickoppa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicTITLO" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPALATALIZATION" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDASIAPNEUMATA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPSILIPNEUMATA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicISHRTtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicishrttail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSEMISOFT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicsemisoft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicERtick" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicertick" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicGHEupturn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicgheupturn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicGHEstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicghestroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicGHEmidhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicghemidhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZHEdescender" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczhedescender" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZDSC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczdsc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKADC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickadc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKAvertstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickavertstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKAstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickastroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKAbashkir" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickabashkir" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicENDC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicendc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicENGHE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicenghe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPEmidhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicpemidhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicHA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicha" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSDSC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicsdsc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicTEDC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillictedc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYstr" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicystr" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYstrstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicystrstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicHADC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillichadc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicTETSE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillictetse" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEDC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchedc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEvertstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchevertstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSHHA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicshha" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliccheabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEDCabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchedcabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPALOCHKA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZHEbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczhebreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKAhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickahook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicELtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliceltail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicENhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicenhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicENtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicentail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEkhakassian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchekhakassian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEMtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicemtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicAbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicabreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicAdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicadiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicAE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicae" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicebreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSCHWA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicschwa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSCHWAdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicschwadiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZHEdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczhediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZEdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDZEabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicdzeabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicImacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicimacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicidiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicodiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicObarred" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicobarred" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicObarreddiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicobarreddiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicumacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicudiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUdoubleacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicudoubleacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYERUdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyerudiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewAlef" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewBet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewGimel" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewDalet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewHe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewVav" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewZayin" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewHet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewTet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewYod" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewKaffinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewKaf" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewLamed" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewMemfinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewMem" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewNunfinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewNun" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewSamekh" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewAyin" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewPefinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewPe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewTsadifinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewTsadi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewQof" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewResh" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewShin" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewTav" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ahook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ahook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abreveacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abreveacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abrevegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abrevegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abrevehook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abrevehook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abrevetilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abrevetilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abrevedotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abrevedotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Edotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="edotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ehook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ehook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Etilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="etilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ihook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ihook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Idotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="idotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohornacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohornacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohorngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohorngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohornhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohornhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohorntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohorntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohorndotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohorndotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhornacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhornacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhorngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhorngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhornhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhornhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhorntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhorntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhorndotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhorndotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ygrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ygrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ydotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ydotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Yhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="yhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ytilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ytilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilonpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilonpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilonpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicrondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicrondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicrondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicronpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicronpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicronpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotaoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphavrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphamacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubtonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphavrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphamacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekCoronis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekprosgegrammeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdialytikaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubtonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilonvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotavrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotamacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytikavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytikaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotavrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotamacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonvrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondialytikavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekrhopsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekrhodasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondialytikaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilonvrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilonmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilonvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekRhodasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdialytikavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubtonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicronvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="enspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="emspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threeperemspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fourperemspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="sixperemspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="figurespace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="punctuationspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="breakablethinspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hairspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zerowidthspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zwnj" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zwj" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textminus" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="endash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="emdash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texthorizontalbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quoteleft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quoteright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotesinglebase" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotedblleft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotedblright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotedblbase" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdag" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textddag" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbullet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textellipsis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="narrownobreakspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="perthousand" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="guilsingleleft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="guilsingleright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textfraction" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="medspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdong" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texteuro" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcelsius" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textnumero" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcircledP" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="trademark" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textounce" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textohm" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textmho" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textkelvin" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textAngstrom" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onethird" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="twothirds" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onefifth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="twofifths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threefifths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fourfifths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onesixth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fivesixths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oneeighth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threeeighths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fiveeighths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="seveneighths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanIII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanIV" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanV" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanVI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanVII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanVIII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanIX" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanX" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanXI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanXII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanL" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanD" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanM" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romani" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romaniii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romaniv" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanv" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanvi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanvii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanviii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanix" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanx" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanxi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanxii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romand" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanm" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="carriagereturn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ideographicspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ideographichalffillspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ffligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="filigature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="flligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ffiligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fflligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="stligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zerowidthnobreakspace" level="document" category="characters" file="char-def.lua"/> + +</cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-delimitedtext.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-delimitedtext.xml index c34052644f3..ce1767b1c48 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-delimitedtext.xml +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/interface/mkiv/i-description.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-description.xml index f2cf33e82b6..9d71bd1a109 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-description.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-description.xml @@ -55,6 +55,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -129,6 +130,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- end construction values --> </cd:assignments> </cd:arguments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-document.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-document.xml index fcd9e040b67..178f7e9fec5 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-document.xml +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/interface/mkiv/i-effect.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-effect.xml index d20a62cd40b..b71306fff0b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-effect.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-effect.xml @@ -26,7 +26,7 @@ <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant type="cd:number"/> + <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="alternative"> <cd:constant type="normal" default="yes"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-enumeration.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-enumeration.xml index 149f4f61307..0f286b8b531 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-enumeration.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-enumeration.xml @@ -101,6 +101,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top" default="yes"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -175,6 +176,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- end construction values --> <cd:inherit name="setupcounter"/> </cd:assignments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-file.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-file.xml index df649e8e080..bf12e5825f1 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-file.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-file.xml @@ -407,4 +407,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-filler.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-filler.xml index 69cc37fca68..d9a43378e07 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-filler.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-filler.xml @@ -99,6 +99,20 @@ </cd:arguments> </cd:command> + <cd:command name="fillupto" level="style" category="rules" file="spac-flr.mkiv"> + <cd:arguments> + <cd:keywords> + <cd:constant type="sym"/> + <cd:constant type="symbol"/> + <cd:constant type="rule"/> + <cd:constant type="width"/> + <cd:constant type="space"/> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + <cd:command name="checkedfiller" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -207,4 +221,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml index 8c20035682d..7fc3a6cffcc 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml index 0ecb99c16aa..77a0f00a1b6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml @@ -186,10 +186,10 @@ <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="ntop"> - <cd:constant type="cd:dimension"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="nbottom"> - <cd:constant type="cd:dimension"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="step"> <cd:constant type="small"/> @@ -206,6 +206,7 @@ <cd:constant type="no"/> </cd:parameter> <!-- end root only --> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> @@ -231,9 +232,151 @@ </cd:arguments> </cd:command> + <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"> + <cd:parameter name="suffix"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="suffixseparator"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="suffixstopper"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="low"/> + <cd:constant type="high"/> + <cd:constant type="grid"/> + <cd:constant type="lines"/> + <cd:constant type="overlay"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="hang"/> + <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> + <cd:parameter name="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="numbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="textcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="spacebefore"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceafter"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="headstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="headseparator"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </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="topoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="bottomoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="number"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + <cd:constant type="none"/> + </cd:parameter> + <cd:parameter name="group"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="leftmargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="innermargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="outermargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="width"> + <cd:constant type="fit" default="yes"/> + <cd:constant type="max"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="minwidth"> + <cd:constant type="fit" default="yes"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <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"> + <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="setupfloatcaption" level="style" category="structure fonts counter" 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"> @@ -253,6 +396,7 @@ <cd:constant type="low"/> <cd:constant type="high"/> <cd:constant type="grid"/> + <cd:constant type="lines"/> <cd:constant type="overlay"/> <cd:constant type="inner"/> <cd:constant type="outer"/> @@ -292,7 +436,12 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> - <!-- headstyle headcolor headseparator --> + <cd:parameter name="headstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> @@ -347,24 +496,39 @@ <cd:constant type="cd:dimension"/> </cd:parameter> <cd:inherit name="setupcounter"/> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <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:inherit name="setupcaption"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <!-- + + <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="setupfloatcaption"/> + <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> @@ -796,4 +960,46 @@ </cd:arguments> </cd:command> + <cd:command name="definefacingfloat" level="style" category="structure" file="page-ffl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfacingfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupfacingfloat" level="style" category="structure" file="page-ffl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="facingfloat" type="environment" level="document" category="structure" file="page-ffl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="splittext" type="environment" level="document" category="structure" file="tabl-tsp.mkiv"/> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fonts.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fonts.xml index 1e6e169a4f9..721bfca6313 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-fonts.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fonts.xml @@ -31,12 +31,20 @@ <cd:constant type="cd:number"/> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="target"> + <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:parameter name="method"> + <cd:constant type="lowercase"/> + <cd:constant type="uppercase"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -332,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> @@ -421,7 +429,6 @@ <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifcurrentfonthasfeatureelse" level="system" category="fonts conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> @@ -430,6 +437,29 @@ </cd:arguments> </cd:command> + <cd:command name="doifelsefontfeature" level="system" category="fonts conditional" file="font-fea.mkvi"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + <cd:command name="doiffontfeatureelse" level="system" category="fonts conditional" file="font-fea.mkvi"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifunknownfontfeature" level="system" category="fonts conditional" file="font-fea.mkvi"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + <cd:command name="doaddfeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name-list"/> @@ -935,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/Master/texmf-dist/tex/context/interface/mkiv/i-formula.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-formula.xml index 07127a6297c..72693fb6cc7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-formula.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-formula.xml @@ -274,6 +274,7 @@ <cd:command name="placeformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> @@ -303,12 +304,14 @@ <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> <cd:command name="placesubformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml index a4667dd2ec9..5e96ba80d2e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-framed.xml +++ b/Master/texmf-dist/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,6 +92,8 @@ <cd:constant type="on" default="yes"/> <cd:constant type="off"/> <cd:constant type="overlay"/> + <cd:constant type="small"/> + <cd:constant type="closed"/> <cd:constant type="none"/> </cd:parameter> <cd:parameter name="background"> @@ -132,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> @@ -627,4 +636,12 @@ </cd:arguments> </cd:command> + <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/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml index d90be9e7bb9..a71291a2a60 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml @@ -236,6 +236,16 @@ <!-- only passed by the system: --> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="transform"> + <cd:constant type="auto" default="yes"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="userpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="ownerpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -524,4 +534,16 @@ </cd:arguments> </cd:command> + <cd:command name="overlayimage" level="style" category="graphics" file="pack-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="clippedoverlayimage" level="style" category="graphics" file="pack-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + </cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-grid.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-grid.xml index bd96388f348..9b072127bf4 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-grid.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-grid.xml @@ -18,6 +18,7 @@ <cd:constant type="right" default="yes"/> <cd:constant type="left"/> <cd:constant type="outer"/> + <cd:constant type="inner"/> <cd:constant type="columns" default="yes"/> </cd:keywords> </cd:arguments> @@ -174,6 +175,12 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="rulecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -186,4 +193,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-hspace.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-hspace.xml index c1626e7b193..31c21586487 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-hspace.xml +++ b/Master/texmf-dist/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> @@ -92,6 +93,8 @@ <cd:command name="enspace" level="style" category="whitespace" file="spac-hor.mkiv"/> + <cd:command name="negenspace" level="style" category="whitespace" file="spac-hor.mkiv"/> + <cd:command name="enskip" level="style" category="whitespace" file="spac-hor.mkiv"/> <cd:command name="quad" level="style" category="whitespace" file="spac-hor.mkiv"/> @@ -100,6 +103,8 @@ <cd:command name="emspace" level="style" category="whitespace" file="spac-hor.mkiv"/> + <cd:command name="negemspace" level="style" category="whitespace" file="spac-hor.mkiv"/> + <cd:command name="dotfskip" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> @@ -162,4 +167,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml index bf26cd96257..7ead396b843 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml @@ -47,6 +47,7 @@ <cd:constant type="paper"/> <cd:constant type="attachment"/> <cd:constant type="layer"/> + <cd:constant type="title"/> </cd:parameter> <cd:parameter name="copies"> <cd:constant type="cd:number"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-kerning.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-kerning.xml index b45e916f2b2..64a2513b960 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-kerning.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-kerning.xml @@ -90,4 +90,36 @@ </cd:arguments> </cd:command> + <cd:command name="defineperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupperiodkerning"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:arguments> + <cd:keywords> + <cd:constant type="reset"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="resetperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"/> + </cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-label.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-label.xml index a09360aa722..a1d36ef4364 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-label.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-label.xml @@ -101,6 +101,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="intext" default="yes"/> <cd:constant type="cd:name"/> @@ -176,6 +177,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- end construction values --> <cd:inherit name="setupcounter"/> </cd:assignments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-language.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-language.xml index 35706132103..de8835a790a 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-language.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-language.xml @@ -37,6 +37,9 @@ <cd:parameter name="date"> <cd:inherit name="currentdate"/> </cd:parameter> + <cd:parameter name="time"> + <cd:inherit name="currenttime"/> + </cd:parameter> <cd:parameter name="patterns"> <cd:constant type="cd:file"/> </cd:parameter> @@ -61,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"/> @@ -174,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/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml index 19b233988c9..4370cc4f558 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml @@ -197,6 +197,7 @@ </cd:parameter> <cd:parameter name="cropoffset"> <cd:constant type="cd:dimension"/> + <cd:constant type="auto"/> </cd:parameter> <cd:parameter name="trimoffset"> <cd:constant type="cd:dimension"/> @@ -367,14 +368,14 @@ <cd:command name="spread" type="environment" level="document" category="layout" file="page-spr.mkiv"/> - <cd:command name="doifelsetopofpage" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doifelsetopofpage" level="system" category="layout conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiftopofpageelse" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doiftopofpageelse" level="system" category="layout conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-linefiller.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-linefiller.xml new file mode 100644 index 00000000000..ab53e64b028 --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-linefiller.xml @@ -0,0 +1,105 @@ +<?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="definelinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuplinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="location"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="both" default="yes"/> + </cd:parameter> + <cd:parameter name="scope"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="local" default="yes"/> + <cd:constant type="global"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="height"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="depth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="threshold"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <!-- cd:parameter name="method"> + <cd:constant type="cd:number"/> + </cd:parameter --> + <cd:parameter name="textstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="textcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="mp"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuplinefillers" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="linefiller" type="environment" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setlinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-list.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-list.xml index 8d4863dd28f..a3ae226767e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-list.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-list.xml @@ -55,7 +55,9 @@ <cd:parameter name="width"> <cd:constant type="fit"/> <cd:constant type="broad"/> - <cd:constant type="auto"/> + <!-- + <cd:constant type="auto"/> + --> <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="height"> @@ -386,7 +388,7 @@ <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-list-list"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -395,7 +397,55 @@ <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:parameter name="criterium"> + <cd:constant type="local" default="yes"/> + <cd:constant type="intro"/> + <cd:constant type="reference"/> + <cd:constant type="reference" prefix="cd:sectionblock" method="range"/> + <cd:constant type="all"/> + <cd:constant type="all" prefix="cd:sectionblock" method="range"/> + <cd:constant type="text"/> + <cd:constant type="text" prefix="cd:sectionblock" method="range"/> + <cd:constant type="current"/> + <cd:constant type="current" prefix="cd:sectionblock" method="range"/> + <cd:constant type="here"/> + <cd:constant type="previous"/> + <cd:constant type="previous" prefix="cd:sectionblock" method="range"/> + <cd:constant type="component"/> + <cd:constant type="cd:section"/> + <cd:constant type="cd:section" prefix="cd:sectionblock" method="range"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="extras"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="order"> + <cd:constant type="command"/> + <cd:constant type="all"/> + <cd:constant type="title"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant type="b" default="yes"/> + <cd:constant type="c"/> + <cd:constant type="d"/> + <cd:constant type="e"/> + <cd:constant type="f"/> + <cd:constant type="g"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="command"/> + <cd:constant type="none"/> + <cd:constant type="interactive"/> + <cd:constant type="paragraph"/> + <cd:constant type="horizontal"/> + <cd:constant type="vertical"/> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -404,7 +454,7 @@ <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -416,7 +466,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -431,7 +481,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -446,7 +496,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml index af9d87cb80c..ae8fa1c3e4c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml @@ -35,6 +35,7 @@ <cd:parameter name="align"> <cd:constant type="l2r" default="yes"/> <cd:constant type="r2l"/> + <cd:constant type="righttoleft"/> </cd:parameter> <cd:parameter name="bidi"> <cd:constant type="yes"/> @@ -109,6 +110,17 @@ <cd:parameter name="ampersand"> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="collapsing"> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant type="3" default="yes"/> + <cd:constant type="none"/> + <cd:constant type="reset"/> + </cd:parameter> + <cd:parameter name="kernpairs"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -499,4 +511,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml index 76151fae4c4..5e1abec2b64 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml @@ -43,6 +43,9 @@ <cd:parameter name="method"> <cd:constant type="auto"/> </cd:parameter> + <cd:parameter name="size"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="factor"> <cd:constant type="none"/> <cd:constant type="auto"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathmatrix.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathmatrix.xml index bd1452cdca6..581a6928ac7 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathmatrix.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathmatrix.xml @@ -90,6 +90,15 @@ --> + <cd:command name="mathmatrix" generated="yes" level="document" category="mathematics tables" file="math-ali.mkiv"> + <cd:sequence> + <cd:variable value="mathmatrix"/> + </cd:sequence> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="matrices" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathname.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathname.xml new file mode 100644 index 00000000000..63dab099192 --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathname.xml @@ -0,0 +1,1091 @@ +<?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="mathhash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mathdollar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mathpercent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mathampersand" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lparent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rparent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ast" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mathhyphen" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="colon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lt" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gt" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="backslash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Hat" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="grave" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lbrace" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rbrace" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="yen" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="S" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ddot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="pm" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="acute" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="P" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="centerdot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="times" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eth" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="div" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lambdabar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="hat" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="check" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="breve" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ring" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="tilde" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="widehat" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="widetilde" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="not" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Alpha" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Beta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Gamma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Delta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Epsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Zeta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Eta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Theta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Iota" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Kappa" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Lambda" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Mu" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Nu" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Xi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Omicron" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Pi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Rho" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Sigma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Tau" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Upsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Phi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Chi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Psi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Omega" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="alpha" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="beta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gamma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="delta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varepsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="zeta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="theta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="iota" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="kappa" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lambda" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mu" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nu" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="xi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="omicron" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="pi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rho" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varsigma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sigma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="tau" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varphi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="chi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="psi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="omega" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varTheta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="phi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varpi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="digamma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varkappa" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="epsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="backepsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bullet" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="prime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="doubleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="tripleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="reversedprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="reverseddoubleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="reversedtripleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="quadrupleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="invisibletimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="positivesign" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="negativesign" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vec" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dddot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigsquare" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigdiamond" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="actuarial" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="complexes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Eulerconst" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Plankconst" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Im" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ell" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="naturalnumbers" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="wp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="primes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rationals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Re" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="reals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="integers" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ohm" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mho" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="turnediota" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Angstrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Finv" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="aleph" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="beth" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gimel" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="daleth" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Game" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sansLturned" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sansLmirrored" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Yup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="differentialD" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="differentiald" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="exponentiale" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="imaginaryi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="imaginaryj" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="PropertyLine" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upand" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="uparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="updownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nwarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="searrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="swarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftwavearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightwavearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheadleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheaduparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheadrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheaddownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mapsup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mapsto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mapsdown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="updownarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="hookleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="hookrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="looparrowleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="looparrowright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downzigzagarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Lsh" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Rsh" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Ldsh" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Rdsh" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="linefeed" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="carriagereturn" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curvearrowleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curvearrowright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="barovernorthwestarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="barleftarrowrightarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftharpoonup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftharpoondown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upharpoonleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightharpoonup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightharpoondown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downharpoonright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downharpoonleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightleftarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="updownarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftleftarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upuparrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightrightarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downdownarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightharpoons" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightleftharpoons" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nLeftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nLeftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nRightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Leftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Uparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Downarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Leftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Updownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Nwarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Nearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Searrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Swarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Lleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Rrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nHuparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nHdownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftdasharrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="updasharrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downdasharrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="barleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="whitearrowupfrombar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circleonrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downuparrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightthreearrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="forall" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="complement" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="partial" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="exists" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nexists" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="emptyset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nabla" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="in" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="prod" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="coprod" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sum" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dotplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="diagup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="diagdown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ast" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circ" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="propto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="infty" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="angle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="measuredangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sphericalangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="divides" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nparallel" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="cap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="cup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oint" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oiint" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oiiint" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="intclockwise" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ointclockwise" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ointctrclockwise" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="therefore" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="because" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="colon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="squaredots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dotminus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="minuscolon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="backsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="wr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="simeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsimeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="approxnEq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="approx" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="napprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="approxeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="asymp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Bumpeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="doteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="fallingdotseq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="risingdotseq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="colonequals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="equalscolon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqcirc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="wedgeeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="veeeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="stareq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="triangleq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="definedeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="measuredeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="questionedeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="equiv" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nequiv" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="geqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ll" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gg" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="between" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nasymp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ngtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nleq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ngeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lesssim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtrsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nlesssim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ngtrsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lessgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtrless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nlessgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ngtrless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="prec" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succ" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="preccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succcurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nprec" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsucc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsubset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsupset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subsetneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supsetneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="uplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsubset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsupset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqcap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqcup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ominus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="otimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oslash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="odot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledcirc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledast" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledequals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circleddash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="boxplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="boxminus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="boxtimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="boxdot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dashv" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="top" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="models" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vDash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Vdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Vvdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="VDash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvDash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVDash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="multimap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="intercal" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="veebar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="barwedge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigwedge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigvee" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigcap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigcup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="diamond" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="star" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="divideontimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ltimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rtimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftthreetimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightthreetimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curlyvee" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curlywedge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Subset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Supset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="pitchfork" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lessdot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtrdot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lesseqgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtreqless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curlyeqprec" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curlyeqsucc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="npreccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsucccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsqsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsqsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsubsetneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsupsetneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lnsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gnsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precnsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succnsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ntriangleright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ntriangleleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ntrianglelefteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ntrianglerighteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vdots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="cdots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="udots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ddots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lceil" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rceil" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lfloor" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rfloor" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ulcorner" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="urcorner" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="llcorner" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lrcorner" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="frown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="smile" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lmoustache" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rmoustache" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="overbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="underbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="overparent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="underparent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="overbrace" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="underbrace" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledR" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledS" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacksquare" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacktriangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacktriangleright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="triangleright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacktriangledown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacktriangleleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="triangleleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lozenge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigcirc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigstar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="spadesuit" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="heartsuit" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="diamondsuit" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="clubsuit" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacklozenge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="flat" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="natural" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sharp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="checkmark" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="maltese" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="llbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rrbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="langle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="llangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rrangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lgroup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rgroup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longmapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longmapsto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longmapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longmapsto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longrightsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Mapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Mapsto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Uuparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Ddownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dashedleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dashedrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dottedrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheadrightarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nwsearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="neswarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lhooknwarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rhooknearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lhooksearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rhookswarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigodot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigoplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigotimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigudot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="biguplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigsqcap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigsqcup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigtimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="amalg" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="coloncolonequals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqeqeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leqslant" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="geqslant" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lessapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtrapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lnapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gnapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lesseqqgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtreqqless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqslantless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqslantgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="preceq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="preceqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succeqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precnapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succnapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subseteqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supseteqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subsetneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supsetneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="backprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="imath" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="jmath" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vartheta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varkappa" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varrho" level="document" category="character mathematics" file="char-def.lua"/> + +</cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-narrow.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-narrow.xml index 5133b63020e..a229a2112bd 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-narrow.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-narrow.xml @@ -75,7 +75,7 @@ <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> <cd:constant type="reverse"/> - </cd:keywords> + </cd:keywords> </cd:arguments> </cd:command> @@ -100,7 +100,7 @@ <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> <cd:constant type="reverse"/> - </cd:keywords> + </cd:keywords> </cd:arguments> </cd:command> @@ -118,7 +118,7 @@ <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> <cd:constant type="reverse"/> - </cd:keywords> + </cd:keywords> </cd:arguments> </cd:command> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml index 9bcf43d5b6e..03e53a0e3f5 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml @@ -183,6 +183,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- end construction values --> <cd:inherit name="setupcounter"/> </cd:assignments> @@ -467,6 +471,8 @@ <cd:command name="flushnotes" level="style" category="structure notes" file="strc-not.mkvi"/> + <cd:command name="postponingnotes" type="environment" category="structure notes" 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"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagecolumns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagecolumns.xml new file mode 100644 index 00000000000..07ab20abba8 --- /dev/null +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagecolumns.xml @@ -0,0 +1,90 @@ +<?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="definepagecolumns" level="style" category="structure layout" file="page-pcl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuppagecolumns" level="style" category="structure layout" file="page-pcl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="separator"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="direction"> + <cd:constant type="normal" default="yes"/> + <cd:constant type="reverse"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <!-- + <cd:parameter name="maxheight"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="step"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + --> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="blank"> + <cd:inherit name="blank"/> + </cd:parameter> + <!-- + <cd:parameter name="profile"> + <cd:inherit name="setprofile"/> + </cd:parameter> + --> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="pagecolumns" type="environment" variant="name" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="pagecolumns" type="environment" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="pagecolumns" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:sequence> + <cd:instance value="pagecolumns"/> + </cd:sequence> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml index 8e53ef8fc7f..f25e72f7255 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml @@ -4,19 +4,84 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagegrid" level="style" category="layout" 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"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegrid"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="definecolumnset" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + <cd:constant type="cd:number" prefix="cd:name" method="range"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="nleft"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="nright"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="width"> + <cd:constant type="cd:dimension"/> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="lines"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="maxheight"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="direction"> + <cd:constant type="normal" default="yes"/> + <cd:constant type="reverse"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <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"/> @@ -27,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"/> @@ -34,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> @@ -55,57 +122,121 @@ </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> + <cd:sequence> + <cd:variable value="pagegrid"/> + </cd:sequence> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegrid"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <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"> + <cd:inherit name="setuppagegrid"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="columnset" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> <cd:sequence> - <cd:variable value="pagegrid"/> + <cd:variable value="columnset"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="columnset" type="environment" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setpagegrid" level="document" category="layout" file="page-cst.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="c"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="r"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="option"> - <cd:constant type="none" default="yes"/> - <!-- + <!-- + + <cd:command name="setpagegrid" level="document" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="c"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="r"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="option"> + <cd:constant type="none" default="yes"/> <cd:constant type="wide"/> - --> - </cd:parameter> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + </cd:parameter> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + + <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"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegridspan"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> - <cd:command name="definepagegridspan" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="definecolumnsetspan" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setuppagegridspan" level="style" category="layout" 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"> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </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="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetspan" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -129,32 +260,111 @@ </cd:arguments> </cd:command> - <cd:command name="pagegridspan" type="environment" level="document" category="layout" 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"> + <cd:inherit name="setuppagegridspan"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="columnsetspan" type="environment" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="pagegridspanwidth" level="style" category="layout" 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="columnsetspanwidth" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="definepagegridarea" level="style" category="layout" 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"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegridarea"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="definecolumnsetarea" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridarea"/> + <cd:inherit name="setupcolumnsetarea"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setuppagegridarea" level="style" category="layout" 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"> + <cd:parameter name="state"> + <cd:constant type="start"/> + <cd:constant type="stop" default="yes"/> + <cd:constant type="repeat"/> + </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="nx"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="ny"> + <cd:constant type="cd:number"/> + </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="clipoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetarea" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -192,14 +402,38 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridareatext" level="style" category="layout" 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="setupcolumnsetareatext" 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" level="style" category="layout" 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"/> + <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetlines" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -208,7 +442,20 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridstart" level="style" category="layout" 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"/> + <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetstart" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagemarks.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagemarks.xml index 036f518b99e..4d41bbfdd2a 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagemarks.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagemarks.xml @@ -4,16 +4,28 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="markpage" level="style" file="page-lay.mkiv"> + <cd:command name="markpage" level="style" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> - <cd:keywords optional="yes"> + <cd:keywords list="yes" 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:command name="markedpages" level="style" file="page-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="markpages" type="environment" level="style" file="page-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifelsemarkedpage" level="style" category="conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagestate.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagestate.xml index 941068399fe..e705ba7e715 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagestate.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagestate.xml @@ -4,6 +4,17 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + <cd:command name="signalrightpage" level="system" file="spac-pag.mkiv"/> + + <cd:command name="doifelserightpage" level="system" file="spac-pag.mkiv"> + <cd:arguments> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="rightpageorder" level="system" file="spac-pag.mkiv"/> + <cd:command name="definepagestate" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> @@ -56,4 +67,32 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="pagestaterealpageorder" level="system" file="core-dat.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="autopagestaterealpage" level="system" file="core-dat.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="setautopagestaterealpageno" level="system" file="core-dat.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="autopagestaterealpageorder" level="system" file="core-dat.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf b/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf Binary files differindex ee6712cfd09..a0a875e51a6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-register.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-register.xml index 4d8010559c7..7ba3a0f7c8e 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-register.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-register.xml @@ -49,6 +49,10 @@ <cd:constant type="all"/> <cd:constant type="packed"/> </cd:parameter> + <cd:parameter name="check"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> <cd:constant type="text"/> @@ -162,6 +166,12 @@ <cd:parameter name="pagecolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="n"> <cd:constant type="cd:number"/> </cd:parameter> @@ -215,6 +225,10 @@ <cd:constant type="no" default="yes"/> <cd:constant type="all"/> </cd:parameter> + <cd:parameter name="check"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> <cd:constant type="text"/> @@ -328,6 +342,12 @@ <cd:parameter name="pagecolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="n"> <cd:constant type="cd:number"/> </cd:parameter> @@ -544,7 +564,7 @@ </cd:keywords> <cd:index list="yes"/> </cd:arguments> - </cd:command> + </cd:command> <cd:command name="stopregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> @@ -664,4 +684,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-ruby.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-ruby.xml index 10bcff22e12..4422029b80c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-ruby.xml +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/interface/mkiv/i-scale.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-scale.xml index 3d26ed76fa0..36a46479e9d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-scale.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-scale.xml @@ -44,6 +44,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -51,6 +52,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -58,6 +60,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-script.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-script.xml index 9af0174921e..affa2658bf1 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-script.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-script.xml @@ -47,15 +47,19 @@ <cd:command name="setscript" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> - <cd:keywords> - <cd:constant type="hangul"/> - <cd:constant type="hanzi"/> - <cd:constant type="nihongo"/> - <cd:constant type="ethiopic"/> - <cd:constant type="thai"/> - <cd:constant type="test"/> - <cd:constant type="cd:name"/> - </cd:keywords> + <cd:resolve name="keyword-script"/> + </cd:arguments> + </cd:command> + + <cd:command name="setlocalscript" level="style" category="language" file="scrp-ini.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-script"/> + </cd:arguments> + </cd:command> + + <cd:command name="setglobalscript" level="style" category="language" file="scrp-ini.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-script"/> </cd:arguments> </cd:command> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml index f3cf13d3e7b..b4229d5fd7f 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml @@ -518,4 +518,4 @@ <cd:command name="headsetupspacing" level="system" category="structure" file="strc-ren.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-setups.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-setups.xml index df7281e74ed..a3773e8f77d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-setups.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-setups.xml @@ -64,6 +64,13 @@ </cd:arguments> </cd:command> + <cd:command name="copysetups" level="system" file="core-env.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + <cd:command name="showsetupsdefinition" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> @@ -221,4 +228,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-startstop.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-startstop.xml index c7780488c0c..ba0abb0b7d8 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-startstop.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-startstop.xml @@ -57,10 +57,32 @@ </cd:sequence> </cd:command> - <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> + <!-- + + Variant 1: <cd:string value="zero width space"/> + + <cd:command name="startstop" type="environment" level="document" category="structure" file="core-sys.mkiv"> + <cd:sequence> + <cd:string value=""/> + </cd:sequence> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + </cd:arguments> + </cd:command> + + Variant 2: <cd:delimiter name="stop"/> + + <cd:command name="start" level="document" category="structure" file="core-sys.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="string-content"/> + <cd:delimiter name="stop"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="" type="environment" level="document" category="structure" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-strut.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-strut.xml index 0653dd21426..d686d6ee0d2 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-strut.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-strut.xml @@ -52,6 +52,8 @@ <cd:command name="setfontstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="settightstrut" level="system" file="spac-ver.mkiv"/> + <cd:command name="setcapstrut" level="system" file="spac-ver.mkiv"/> <cd:command name="setnostrut" level="system" file="spac-ver.mkiv"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml index 123e98cbf2c..498684cad77 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml @@ -119,6 +119,11 @@ <cd:command name="symbolset" type="environment" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="font"> + <cd:constant type="cd:font"/> + </cd:parameter> + </cd:assignments> </cd:arguments> </cd:command> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-system.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-system.xml index 44def10e077..c8abff23827 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-system.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-system.xml @@ -1007,6 +1007,12 @@ </cd:arguments> </cd:command> + <cd:command name="firstinlist" level="system" file="syst-aux.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-command-list"/> + </cd:arguments> + </cd:command> + <cd:command name="dogetcommacommandelement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-number"/> @@ -1641,7 +1647,7 @@ <cd:command name="increment" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -1656,7 +1662,7 @@ <cd:command name="decrement" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -1834,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"/> @@ -3601,6 +3623,31 @@ </cd:arguments> </cd:command> + <cd:command name="expandeddoif" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="expandeddoifnot" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="expandeddoifelse" 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="expdoifelsecommon" level="system" file="syst-lua.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> @@ -3643,4 +3690,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-tabulation.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-tabulation.xml index 3efc34f42ef..6768b9b4cf6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-tabulation.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-tabulation.xml @@ -38,6 +38,27 @@ <cd:constant type="grid"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="blank"> + <cd:resolve name="value-blank"/> + </cd:parameter> + <cd:parameter name="headstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="background"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="foregroundstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="foregroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="align"> <cd:constant type="left"/> <cd:constant type="middle"/> @@ -276,4 +297,4 @@ --> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-tagging.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-tagging.xml index 3e0d49d8063..d07b32ec1e0 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-tagging.xml +++ b/Master/texmf-dist/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"/> @@ -72,4 +72,10 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file + <cd:command name="ignoretagsinexport" level="style" category="xml" file="strc-tag.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml index bd1b128b38c..f0f515fbc2c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml @@ -165,6 +165,75 @@ </cd:arguments> </cd:command> + <!-- + + <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupheader" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuptext" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupfooter" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupbottom" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> @@ -173,7 +242,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -186,7 +255,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -199,7 +268,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -212,7 +281,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -225,7 +294,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-token.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-token.xml index 129f472ba1a..09e2ad3d6df 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-token.xml +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/interface/mkiv/i-unit.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-unit.xml index 9efa452ebc5..c8092a4ed2b 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-unit.xml +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/interface/mkiv/i-userdata.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-userdata.xml new file mode 100644 index 00000000000..e9617f0bc18 --- /dev/null +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml index e8abc1f66a8..830b8bb110d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-verbatim.xml +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/interface/mkiv/i-visualizer.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-visualizer.xml index daaad28cd3d..81d02f4fbaf 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-visualizer.xml +++ b/Master/texmf-dist/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> @@ -148,6 +152,10 @@ <cd:command name="showfontitalics" level="document" file="trc-vis.mkiv"/> + <cd:command name="showglyphdata" level="document" file="trc-vis.mkiv"/> + + <cd:command name="showfontexpansion" level="document" file="trc-vis.mkiv"/> + <cd:command name="setvisualizerfont" level="system" file="trc-vis.mkiv"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> @@ -156,4 +164,4 @@ <cd:command name="resetvisualizers" level="system" file="trc-vis.mkiv"/> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml index ce6d5ac083a..5e970d317c6 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml @@ -24,52 +24,7 @@ <cd:command name="vspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <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="packed"/> - <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:resolve name="value-blank"/> </cd:keywords> </cd:arguments> </cd:command> @@ -121,51 +76,7 @@ <cd:command name="blank" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <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:resolve name="value-blank"/> </cd:keywords> </cd:arguments> </cd:command> @@ -213,4 +124,20 @@ <cd:command name="bigskip" level="system" category="whitespace" file="spac-ver.mkiv"/> + <cd:command name="checkedblank" level="system" category="whitespace" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="prerollblank" level="system" category="whitespace" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-whitespace.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-whitespace.xml index f1a8ce84e3c..a44b08f1d9c 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-whitespace.xml +++ b/Master/texmf-dist/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"/> @@ -59,4 +59,6 @@ </cd:arguments> </cd:command> + <cd:command name="forgetparskip" category="alignment" level="system" file="spac-ver.mkiv"/> + </cd:interface>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-xml.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-xml.xml index d09913f7c8d..1786e1bf60d 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-xml.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-xml.xml @@ -664,6 +664,34 @@ </cd:arguments> </cd:command> + <cd:command name="xmldoifatt" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:string/> + <cd:string/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmldoifnotatt" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:string/> + <cd:string/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmldoifelseatt" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:string/> + <cd:string/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + <cd:command name="xmldoifselfempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-xtable.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-xtable.xml index c921e1a8d64..7ee0df3f28f 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-xtable.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-xtable.xml @@ -77,6 +77,25 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="aligncharacter"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="alignmentleftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentrightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentleftwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentrightwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentcharacter"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> @@ -136,6 +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: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"/> @@ -244,4 +290,4 @@ <cd:command name="currentxtablecolumn" level="system" category="tables" file="tabl-xtb.mkvi"/> -</cd:interface>
\ No newline at end of file +</cd:interface> |