diff options
| author | Hans Hagen <pragma@wxs.nl> | 2020-03-30 14:22:51 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2020-03-30 14:22:51 +0200 |
| commit | 8dcafbcc0fbdde27cf480584450516602daacd42 (patch) | |
| tree | e86361c3ded314bfa4be74fba251e187b6fdfe67 | |
| parent | dd8e1bab358884db6ba3f2373f515fbcc991e5ee (diff) | |
| download | context-8dcafbcc0fbdde27cf480584450516602daacd42.tar.gz | |
2020-03-30 13:35:00
61 files changed, 795 insertions, 126 deletions
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf Binary files differindex 7c2f664f6..a6812e4d4 100644 --- a/doc/context/documents/general/qrcs/setup-cs.pdf +++ b/doc/context/documents/general/qrcs/setup-cs.pdf diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf Binary files differindex 09a121ef8..dd5fcd0ec 100644 --- a/doc/context/documents/general/qrcs/setup-de.pdf +++ b/doc/context/documents/general/qrcs/setup-de.pdf diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf Binary files differindex a877fa0ea..018ee8cb5 100644 --- a/doc/context/documents/general/qrcs/setup-en.pdf +++ b/doc/context/documents/general/qrcs/setup-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf Binary files differindex c5dfbf669..016dba0e9 100644 --- a/doc/context/documents/general/qrcs/setup-fr.pdf +++ b/doc/context/documents/general/qrcs/setup-fr.pdf diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf Binary files differindex dcafda14a..3a524f19b 100644 --- a/doc/context/documents/general/qrcs/setup-it.pdf +++ b/doc/context/documents/general/qrcs/setup-it.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf Binary files differindex 8e2ac2e84..baed19f6f 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf Binary files differindex f37ea8a16..b8c6dc9a0 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-de.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-de.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf Binary files differindex 780de3834..6fd501306 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf Binary files differindex 2cb281421..07f811e16 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf Binary files differindex 75f597483..add6455f1 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-it.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-it.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf Binary files differindex 039c02bd3..7b2067e76 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf Binary files differindex 4f49185b5..ec5a25a85 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf Binary files differindex e10326750..bd81d3aff 100644 --- a/doc/context/documents/general/qrcs/setup-nl.pdf +++ b/doc/context/documents/general/qrcs/setup-nl.pdf diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf Binary files differindex 36f50680a..b786bc00e 100644 --- a/doc/context/documents/general/qrcs/setup-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-ro.pdf diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 4696ef82d..9e160f8a5 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2020.03.28 14:31} +\newcontextversion{2020.03.30 13:25} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 67825f040..e7bef3b85 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2020.03.28 14:31} +\edef\contextversion{2020.03.30 13:25} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii index de8778e45..89fe3e80c 100644 --- a/tex/context/base/mkii/mult-fr.mkii +++ b/tex/context/base/mkii/mult-fr.mkii @@ -907,7 +907,10 @@ \setinterfaceconstant{keys}{keys} \setinterfaceconstant{keyword}{motcle} \setinterfaceconstant{label}{etiquette} +\setinterfaceconstant{labelalternative}{labelalternative} +\setinterfaceconstant{labelcolor}{labelcolor} \setinterfaceconstant{labeloffset}{labeloffset} +\setinterfaceconstant{labelstyle}{labelstyle} \setinterfaceconstant{language}{language} \setinterfaceconstant{last}{last} \setinterfaceconstant{lastnamesep}{lastnamesep} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 1a9e445f8..94532ba65 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.03.28 14:31} +\newcontextversion{2020.03.30 13:25} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 81451a832..3d3a283aa 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.03.28 14:31} +\edef\contextversion{2020.03.30 13:25} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index 9bfa4f862..713359122 100644 --- a/tex/context/base/mkiv/context.mkxl +++ b/tex/context/base/mkiv/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.03.28 14:31} +\edef\contextversion{2020.03.30 13:25} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/mlib-svg.lua b/tex/context/base/mkiv/mlib-svg.lua index 9fd1da44e..2a1b476ae 100644 --- a/tex/context/base/mkiv/mlib-svg.lua +++ b/tex/context/base/mkiv/mlib-svg.lua @@ -520,13 +520,18 @@ local colorcomponents, withcolor, thecolor, usedcolors do local p_splitcolor = P("#") * C(p_hexdigit*p_hexdigit)^1 / function(r,g,b) - return "rgb", - tonumber(r or 0, 16) / 255 or 0, - tonumber(g or 0, 16) / 255 or 0, - tonumber(b or 0, 16) / 255 or 0 + if not r then + return "gray", 0 + elseif not (g and b) then + return "gray", tonumber(r or "0", 16) / 255 or 0 + else + return "rgb", + tonumber(r or "0", 16) / 255 or 0, + tonumber(g or "0", 16) / 255 or 0, + tonumber(b or "0", 16) / 255 or 0 + end end - + - P("rgb") * p_a + + P("rgb") * p_a * p_left * (p_fraction + p_separator)^-3 * (p_absolute + p_separator)^0 * p_right / function(r,g,b,a) return "rgb", r or 0, g or 0, b or 0, a or false end diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index 1e22aaa86..174a50cc6 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -8602,6 +8602,18 @@ return { ["labeloffset"]={ ["en"]="labeloffset", }, + ["labelalternative"]={ + ["en"]="labelalternative", + ["nl"]="labelvariant", + }, + ["labelstyle"]={ + ["en"]="labelstyle", + ["nl"]="labelletter", + }, + ["labelcolor"]={ + ["en"]="labelcolor", + ["nl"]="labelkleur", + }, ["language"]={ ["en"]="language", }, diff --git a/tex/context/base/mkiv/pack-rul.mkxl b/tex/context/base/mkiv/pack-rul.mkxl index 2bd768bd0..8131c3fc5 100644 --- a/tex/context/base/mkiv/pack-rul.mkxl +++ b/tex/context/base/mkiv/pack-rul.mkxl @@ -247,7 +247,7 @@ \s!depth \d_framed_target_dp \relax} -\def\ntg-context@ntg.nllled_box_radius +\def\pack_framed_filled_box_radius {\edef\p_framed_backgroundradius{\framedparameter\c!backgroundradius}% \ifzeropt\dimexpr\p_framed_backgroundradius\relax % just in case of .x\bodyfontsize \pack_framed_filled_box_normal diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 1705970ae..5602a9210 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex 3e12e0677..ad08f813a 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/strc-ref.lua b/tex/context/base/mkiv/strc-ref.lua index c85b3338a..fb4d22807 100644 --- a/tex/context/base/mkiv/strc-ref.lua +++ b/tex/context/base/mkiv/strc-ref.lua @@ -2615,6 +2615,17 @@ implement { -- } implement { + name = "askedreference", + public = true, + actions = function() + local actions = references.currentset + if actions then + context("[p=%s,r=%s]",actions.prefix or "",actions.reference) + end + end +} + +implement { name = "referencerealpage", actions = function() local actions = references.currentset diff --git a/tex/context/base/mkiv/strc-ref.mkvi b/tex/context/base/mkiv/strc-ref.mkvi index e774117fa..42327686b 100644 --- a/tex/context/base/mkiv/strc-ref.mkvi +++ b/tex/context/base/mkiv/strc-ref.mkvi @@ -737,6 +737,29 @@ \def\dummyreference{{\tttf ??}} \def\emptyreference{{\tttf !!}} +\installtextracker + {structures.referencing.show} + {\let\strc_references_dummy\strc_references_dummy_yes} + {\let\strc_references_dummy\strc_references_dummy_nop} + +\def\strc_references_dummy_nop + {\dummyreference} + +\def\strc_references_dummy_yes + {\dummyreference + \margindata + [\referencingparameter\c!labelalternative]% alternative? + [\c!style=\referencingparameter\c!labelstyle, + \c!color=\referencingparameter\c!labelcolor] + {\askedreference}} + +\let\strc_references_dummy\strc_references_dummy_nop + +\setupreferencing + [\c!labelalternative=\v!inleft, + \c!labelcolor=darkred, + \c!labelstyle=\smallinfofont] + %D To prevent repetitive messages concerning a reference being defined, we set such %D an unknown reference to an empty one after the first encounter. %D @@ -971,9 +994,9 @@ \def\strc_references_get_reference[#key][#label]% #key = number page title text default realpage ... {\ifsecondargument - \doifelsereferencefound{#label}{\clf_filterreference{#key}}\dummyreference + \doifelsereferencefound{#label}{\clf_filterreference{#key}}\strc_references_dummy \else - \dummyreference + \strc_references_dummy \fi} \let\ref\getreference @@ -1143,12 +1166,12 @@ \unexpanded\def\atpage[#label]% todo {\doifcheckedpagestate{#label}% - {\goto{\labeltext \v!precedingpage }[#label]}% - {\goto{\labeltext \v!hencefore }[#label]}% + {\goto{\labeltext\v!precedingpage}[#label]}% + {\goto{\labeltext\v!hencefore}[#label]}% {\ignorespaces}% - {\goto{\labeltext \v!hereafter }[#label]}% - {\goto{\labeltext \v!followingpage }[#label]}% - {\goto{\labeltexts\v!page\dummyreference}[#label]}} + {\goto{\labeltext\v!hereafter}[#label]}% + {\goto{\labeltext\v!followingpage}[#label]}% + {\goto{\labeltexts\v!page\strc_references_dummy}[#label]}} % Someone requested this but in retrospect didn't need it so we keep it as example. % Beware: a node is injected which is why we add ignorespaces! @@ -1262,7 +1285,7 @@ % inefficient: double resolve \doifelsereferencefound{#label} % we need to resolve the text {\goto{\referencesequence}[#label]} - {\let\currentreferencecontent\dummyreference + {\let\currentreferencecontent\strc_references_dummy \goto{\referencesequence}[#label]}% \strc_references_stop_goto} diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml index 8ba741a60..326a34d10 100644 --- a/tex/context/interface/mkii/keys-fr.xml +++ b/tex/context/interface/mkii/keys-fr.xml @@ -913,7 +913,10 @@ <cd:constant name='keys' value='keys'/> <cd:constant name='keyword' value='motcle'/> <cd:constant name='label' value='etiquette'/> + <cd:constant name='labelalternative' value='labelalternative'/> + <cd:constant name='labelcolor' value='labelcolor'/> <cd:constant name='labeloffset' value='labeloffset'/> + <cd:constant name='labelstyle' value='labelstyle'/> <cd:constant name='language' value='language'/> <cd:constant name='last' value='last'/> <cd:constant name='lastnamesep' value='lastnamesep'/> diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index 0ebeb7d87..33ee652e1 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -1190,6 +1190,10 @@ <cd:parameter name="right"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="repeat"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -1467,13 +1471,7 @@ <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="align"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant type="middle"/> - <cd:constant type="flushleft"/> - <cd:constant type="flushright"/> - <cd:constant type="inner"/> - <cd:constant type="outer"/> + <cd:inherit name="setupalign"/> </cd:parameter> <cd:parameter name="style"> <cd:constant type="cd:style"/> @@ -4668,6 +4666,9 @@ <cd:parameter name="v"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="w"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="x"> <cd:constant type="cd:number"/> </cd:parameter> @@ -7731,6 +7732,16 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="structure" file="strc-des.mkvi" level="style" name="setupdescriptions"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupdescription"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command category="structure" file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example"> <cd:sequence> <cd:variable value="description"/> @@ -10484,9 +10495,6 @@ <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> - <cd:parameter name="headcommand"> - <cd:constant type="cd:command"/> - </cd:parameter> <cd:parameter name="inbetween"> <cd:constant type="cd:command"/> </cd:parameter> @@ -10538,6 +10546,10 @@ <cd:parameter name="maxwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> <cd:inherit name="setupframed"/> </cd:assignments> @@ -11739,6 +11751,7 @@ </cd:parameter> <cd:parameter name="dimensions"> <cd:constant type="cd:number"/> + <cd:constant type="strut"/> </cd:parameter> <cd:parameter name="boundingbox"> <cd:constant type="yes"/> @@ -12366,6 +12379,20 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setupbodyfontenvironment"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords> + <cd:constant type="default"/> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="definebodyfontenvironment"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command category="fonts" file="font-fil.mkvi" level="system" name="processbodyfontenvironmentlist"> <cd:arguments> <cd:csname/> @@ -14154,6 +14181,22 @@ <cd:parameter name="orientation"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="anchoring"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="xanchor"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="yanchor"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -15110,6 +15153,14 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="graphics buffer" file="grph-fig.mkiv" level="document" name="typesetbufferonly"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="*"/> + <cd:constant type="cd:buffer"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="graphics structure" file="grph-fig.mkiv" level="style" name="definetypesetting"> <cd:arguments> <cd:keywords> @@ -16063,7 +16114,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-imp.mkiv" level="system" name="invokepageheandler"> + <cd:command category="layout" file="page-imp.mkiv" level="system" name="invokepagehandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> @@ -17918,6 +17969,7 @@ <cd:constant type="inmargin"/> <cd:constant type="atmargin"/> <cd:constant type="intext"/> + <cd:constant type="headintext"/> <cd:constant type="loose"/> <cd:constant type="fit"/> <cd:constant type="nofit"/> @@ -18071,6 +18123,9 @@ <cd:parameter name="grid"> <cd:inherit name="definegridsnapping"/> </cd:parameter> + <cd:parameter name="packcriterium"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -18136,6 +18191,7 @@ <cd:constant type="inmargin"/> <cd:constant type="atmargin"/> <cd:constant type="intext"/> + <cd:constant type="headintext"/> <cd:constant type="loose"/> <cd:constant type="fit"/> <cd:constant type="nofit"/> @@ -18289,6 +18345,9 @@ <cd:parameter name="grid"> <cd:inherit name="definegridsnapping"/> </cd:parameter> + <cd:parameter name="packcriterium"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -20327,6 +20386,7 @@ <cd:constant type="nc"/> <cd:constant type="sp"/> <cd:constant type="in"/> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> @@ -24264,6 +24324,18 @@ <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> </cd:parameter> + <cd:parameter name="lt"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rt"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="lb"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rb"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -25804,7 +25876,7 @@ </cd:command> </cd:interface> <cd:interface file="i-naturaltable.xml"> - <cd:command category="tables" file="tabl-ntb.mkiv" level="style" name="setupTABLE"> + <cd:command category="tables" file="tabl-ntb.mkxl" level="style" name="setupTABLE"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="r"/> @@ -25924,14 +25996,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLE" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLE" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupTABLE"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEnested" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TD" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TD" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -25959,77 +26038,77 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TR" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TR" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TC" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TC" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TX" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TX" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TY" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TY" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TH" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TH" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TN" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TN" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEhead" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEhead" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEnext" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEnext" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEbody" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEbody" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEfoot" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEfoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="style" name="defineTABLEsetup"> + <cd:command category="tables" file="tabl-ntb.mkxl" level="style" name="defineTABLEsetup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26039,49 +26118,49 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TDs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TDs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TRs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TRs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLE" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLE" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEhead" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLEhead" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEnext" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLEnext" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEbody" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLEbody" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEfoot" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLEfoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -27158,6 +27237,102 @@ </cd:command> <cd:command category="layout" file="page-fac.mkiv" level="document" name="opposite" type="environment"/> </cd:interface> + <cd:interface file="i-orientation.xml"> + <cd:command category="alignment" file="pack-ori.mkxl" level="style" name="defineorientation"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuporientation"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-ori.mkxl" level="style" name="setuporientation"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="orientation"> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant default="yes" type="normal"/> + </cd:parameter> + <cd:parameter name="horizontal"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant default="yes" type="normal"/> + </cd:parameter> + <cd:parameter name="vertical"> + <cd:constant type="line"/> + <cd:constant type="top"/> + <cd:constant type="middle"/> + <cd:constant type="bottom"/> + <cd:constant default="yes" type="normal"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-ori.mkxl" level="system" name="theorientation"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="pack-ori.mkxl" level="system" name="autoorientation"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="conditional" file="pack-ori.mkxl" level="system" name="doifelseorientation"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-ornament.xml"> <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="collector"> <cd:arguments> @@ -28462,6 +28637,16 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="spac-pag.mkiv" level="system" name="doifrightpageelse"> + <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> @@ -33942,7 +34127,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="system" name="docheckedpagestate"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifcheckedpagestate"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -34357,6 +34542,13 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencepagestate"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencepagedetail"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencerealpage"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencecolumnnumber"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="tracedpagestate"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="markreferencepage"/> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="referencesymbol"/> </cd:interface> <cd:interface file="i-regime.xml"> <cd:command category="language" file="regi-ini.mkiv" level="system" name="currentregime"/> @@ -36014,7 +36206,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-rep.mkiv" level="style" name="setreplacement"> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="setreplacements"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -36022,9 +36214,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-rep.mkiv" level="style" name="resetreplacement"/> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="resetreplacements"/> </cd:interface> - <cd:interface file="i-rotatation.xml"> + <cd:interface file="i-rotation.xml"> <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="mirror"> <cd:arguments> <cd:content/> @@ -37982,6 +38174,12 @@ <cd:parameter name="synonymcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -38374,7 +38572,7 @@ <cd:command file="supp-box.mkiv" level="system" name="strutwd"/> <cd:command file="supp-box.mkiv" level="system" name="struthtdp"/> <cd:command file="supp-box.mkiv" level="system" name="strutgap"/> - <cd:command file="spac-ver.mkiv" level="style" name="setupstruts"> + <cd:command file="spac-ver.mkiv" level="style" name="setupstrut"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="yes"/> @@ -38775,6 +38973,21 @@ <cd:parameter name="synonymcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="left"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="right"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -43762,6 +43975,15 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command file="core-sys.mkiv" level="style" name="setupsystem"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-systemlog.xml"> <cd:command file="core-sys.mkiv" level="system" name="systemlog"> @@ -43866,7 +44088,7 @@ <cd:command category="tables" file="tabl-tab.mkiv" level="style" name="setuptables"> <cd:arguments> <cd:assignments list="yes"> - <cd:parameter name="text"> + <cd:parameter name="textwidth"> <cd:constant type="cd:dimension"/> <cd:constant type="max"/> </cd:parameter> @@ -44665,10 +44887,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="rightstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> @@ -44676,6 +44911,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44685,6 +44923,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44729,10 +44970,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="rightstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> @@ -44740,6 +44994,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44749,6 +45006,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44793,10 +45053,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="rightstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> @@ -44804,6 +45077,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44813,6 +45089,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44857,10 +45136,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="rightstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> @@ -44868,6 +45160,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44877,6 +45172,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44921,10 +45219,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="rightstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> @@ -44932,6 +45243,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -44941,6 +45255,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -44985,10 +45302,23 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="rightstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> @@ -44996,6 +45326,9 @@ <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -45005,6 +45338,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -49087,6 +49423,10 @@ <cd:constant type="yes"/> <cd:constant type="no"/> </cd:parameter> + <cd:parameter name="entities"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-bar.xml b/tex/context/interface/mkiv/i-bar.xml index fb120d05b..a90e6bfd2 100644 --- a/tex/context/interface/mkiv/i-bar.xml +++ b/tex/context/interface/mkiv/i-bar.xml @@ -78,6 +78,10 @@ <cd:parameter name="right"> <cd:constant type="cd:text"/> </cd:parameter> + <cd:parameter name="repeat"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-block.xml b/tex/context/interface/mkiv/i-block.xml index 3416a96ee..dbc64e888 100644 --- a/tex/context/interface/mkiv/i-block.xml +++ b/tex/context/interface/mkiv/i-block.xml @@ -41,7 +41,7 @@ <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="align"> - <cd:resolve name="value-alignsimple"/> + <cd:inherit name="setupalign"/> </cd:parameter> <cd:parameter name="style"> <cd:resolve name="value-style"/> diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml index 4dd76d0b3..6a4042ae8 100644 --- a/tex/context/interface/mkiv/i-color.xml +++ b/tex/context/interface/mkiv/i-color.xml @@ -73,6 +73,9 @@ <cd:parameter name="v"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="w"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="x"> <cd:constant type="cd:number"/> </cd:parameter> diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml index da821c516..89ce1904b 100644 --- a/tex/context/interface/mkiv/i-common-argument.xml +++ b/tex/context/interface/mkiv/i-common-argument.xml @@ -554,4 +554,15 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... {...} --> + <!-- --> + <!-- * ORIENTATION --> + + <cd:define name="argument-orientation"> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-orientation"/> + </cd:keywords> + </cd:define> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml index 253a03ccf..d34e1fc7d 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -781,6 +781,8 @@ <cd:constant type="cd:name"/> </cd:define> + <!-- leftfence --> + <cd:define name="value-leftfence"> <!-- <cd:constant type="||"/> @@ -839,6 +841,8 @@ <cd:constant type="cd:character"/> </cd:define> + <!-- rightfence --> + <cd:define name="value-rightfence"> <!-- <cd:constant type="||"/> @@ -897,4 +901,17 @@ <cd:constant type="cd:character"/> </cd:define> + <!-- orientation --> + + <cd:define name="value-orientation"> + <cd:constant type="normal"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="cd:name"/> + </cd:define> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex a877fa0ea..018ee8cb5 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml index 53741ad55..17ef0636a 100644 --- a/tex/context/interface/mkiv/i-context.xml +++ b/tex/context/interface/mkiv/i-context.xml @@ -147,6 +147,7 @@ <cd:interfacefile filename="i-object.xml"/> <cd:interfacefile filename="i-offset.xml"/> <cd:interfacefile filename="i-opposite.xml"/> + <cd:interfacefile filename="i-orientation.xml"/> <cd:interfacefile filename="i-ornament.xml"/> <cd:interfacefile filename="i-output.xml"/> <cd:interfacefile filename="i-overlay.xml"/> @@ -187,7 +188,7 @@ <cd:interfacefile filename="i-register.xml"/> <cd:interfacefile filename="i-renderingwindow.xml"/> <cd:interfacefile filename="i-replacement.xml"/> - <cd:interfacefile filename="i-rotatation.xml"/> + <cd:interfacefile filename="i-rotation.xml"/> <cd:interfacefile filename="i-ruby.xml"/> <cd:interfacefile filename="i-scale.xml"/> <cd:interfacefile filename="i-script.xml"/> diff --git a/tex/context/interface/mkiv/i-conversion.xml b/tex/context/interface/mkiv/i-conversion.xml index b97b63806..80db79cad 100644 --- a/tex/context/interface/mkiv/i-conversion.xml +++ b/tex/context/interface/mkiv/i-conversion.xml @@ -649,8 +649,10 @@ </cd:arguments> </cd:command> - <cd:command name="actualyear" level="style" category="system" file="core-con.mkiv" /> - <cd:command name="actualmonth" level="style" category="system" file="core-con.mkiv" /> - <cd:command name="actualday" level="style" category="system" file="core-con.mkiv" /> + <cd:command name="actualyear" level="style" category="system" file="core-con.mkiv"/> + + <cd:command name="actualmonth" level="style" category="system" file="core-con.mkiv"/> + + <cd:command name="actualday" level="style" category="system" file="core-con.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-description.xml b/tex/context/interface/mkiv/i-description.xml index 9d71bd1a1..aa66532a0 100644 --- a/tex/context/interface/mkiv/i-description.xml +++ b/tex/context/interface/mkiv/i-description.xml @@ -139,18 +139,14 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupdescriptions" level="style" category="structure" file="strc-des.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupdescription"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupdescriptions" level="style" category="structure" file="strc-des.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupdescription"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command name="description" type="environment" generated="yes" variant="example" level="document" category="structure" file="strc-des.mkvi"> <cd:sequence> @@ -183,4 +179,4 @@ </cd:arguments> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml index 7714e5ccc..b37953746 100644 --- a/tex/context/interface/mkiv/i-floats.xml +++ b/tex/context/interface/mkiv/i-floats.xml @@ -452,9 +452,6 @@ <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> - <cd:parameter name="headcommand"> - <cd:constant type="cd:command"/> - </cd:parameter> <cd:parameter name="inbetween"> <cd:constant type="cd:command"/> </cd:parameter> @@ -505,6 +502,10 @@ <cd:parameter name="maxwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> <cd:inherit name="setupcounter"/> <cd:inherit name="setupframed"/> </cd:assignments> diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml index 721bfca63..a6d826c41 100644 --- a/tex/context/interface/mkiv/i-fonts.xml +++ b/tex/context/interface/mkiv/i-fonts.xml @@ -210,6 +210,7 @@ </cd:parameter> <cd:parameter name="dimensions"> <cd:constant type="cd:number"/> + <cd:constant type="strut"/> </cd:parameter> <cd:parameter name="boundingbox"> <cd:constant type="yes"/> @@ -745,22 +746,18 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupbodyfontenvironment" level="style" category="fonts" file="font-ini.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:keywords> - <cd:constant type="default"/> - <cd:constant type="cd:dimension"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="definebodyfontenvironment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupbodyfontenvironment" level="style" category="fonts" file="font-ini.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:keywords> + <cd:constant type="default"/> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="definebodyfontenvironment"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command name="processbodyfontenvironmentlist" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml index 5e96ba80d..e76e29368 100644 --- a/tex/context/interface/mkiv/i-framed.xml +++ b/tex/context/interface/mkiv/i-framed.xml @@ -225,6 +225,15 @@ <cd:constant type="cd:color"/> </cd:parameter> --> + <cd:parameter name="anchoring"> + <cd:resolve name="value-orientation"/> + </cd:parameter> + <cd:parameter name="xanchor"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="yanchor"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml index 924616474..7bd3fb9bc 100644 --- a/tex/context/interface/mkiv/i-graphics.xml +++ b/tex/context/interface/mkiv/i-graphics.xml @@ -490,6 +490,15 @@ </cd:arguments> </cd:command> + <cd:command name="typesetbufferonly" level="document" category="graphics buffer" file="grph-fig.mkiv"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="*"/> + <cd:constant type="cd:buffer"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command name="definetypesetting" level="style" category="graphics structure" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> diff --git a/tex/context/interface/mkiv/i-imposition.xml b/tex/context/interface/mkiv/i-imposition.xml index 98fdcf253..68ba5893d 100644 --- a/tex/context/interface/mkiv/i-imposition.xml +++ b/tex/context/interface/mkiv/i-imposition.xml @@ -11,7 +11,7 @@ </cd:arguments> </cd:command> - <cd:command name="invokepageheandler" level="system" category="layout" file="page-imp.mkiv"> + <cd:command name="invokepagehandler" level="system" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml index a3271d12f..fe183a723 100644 --- a/tex/context/interface/mkiv/i-itemgroup.xml +++ b/tex/context/interface/mkiv/i-itemgroup.xml @@ -194,7 +194,7 @@ <cd:parameter name="packcriterium"> <cd:constant type="cd:number"/> </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:define> @@ -254,6 +254,7 @@ <cd:constant type="inmargin"/> <cd:constant type="atmargin"/> <cd:constant type="intext"/> + <cd:constant type="headintext"/> <cd:constant type="loose"/> <cd:constant type="fit"/> <cd:constant type="nofit"/> @@ -380,7 +381,10 @@ <cd:parameter name="grid"> <cd:inherit name="definegridsnapping"/> </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:parameter name="packcriterium"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:define> diff --git a/tex/context/interface/mkiv/i-layout.xml b/tex/context/interface/mkiv/i-layout.xml index 0d256e967..ff5a0e57b 100644 --- a/tex/context/interface/mkiv/i-layout.xml +++ b/tex/context/interface/mkiv/i-layout.xml @@ -364,6 +364,7 @@ <cd:constant type="nc"/> <cd:constant type="sp"/> <cd:constant type="in"/> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> @@ -386,4 +387,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathstackers.xml b/tex/context/interface/mkiv/i-mathstackers.xml index 561936b9c..3875f2c4c 100644 --- a/tex/context/interface/mkiv/i-mathstackers.xml +++ b/tex/context/interface/mkiv/i-mathstackers.xml @@ -105,6 +105,18 @@ <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> </cd:parameter> + <cd:parameter name="lt"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rt"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="lb"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rb"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-naturaltable.xml b/tex/context/interface/mkiv/i-naturaltable.xml index ac9ea9383..d005810a0 100644 --- a/tex/context/interface/mkiv/i-naturaltable.xml +++ b/tex/context/interface/mkiv/i-naturaltable.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupTABLE" level="style" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="setupTABLE" level="style" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="r"/> @@ -123,7 +123,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLE" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -131,7 +131,15 @@ </cd:arguments> </cd:command> - <cd:command name="TD" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnested" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupTABLE"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="TD" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -160,7 +168,7 @@ </cd:arguments> </cd:command> - <cd:command name="TR" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TR" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -168,7 +176,7 @@ </cd:arguments> </cd:command> - <cd:command name="TC" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TC" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -176,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="TX" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TX" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -184,7 +192,7 @@ </cd:arguments> </cd:command> - <cd:command name="TY" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TY" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -192,7 +200,7 @@ </cd:arguments> </cd:command> - <cd:command name="TH" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TH" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -200,7 +208,7 @@ </cd:arguments> </cd:command> - <cd:command name="TN" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TN" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -208,7 +216,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEhead" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -216,7 +224,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEnext" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -224,7 +232,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEbody" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -232,7 +240,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEfoot" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -240,7 +248,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineTABLEsetup" level="style" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="defineTABLEsetup" level="style" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -249,19 +257,19 @@ </cd:arguments> </cd:command> - <cd:command name="TDs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TDs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TRs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TRs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TABLE" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -269,7 +277,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEhead" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -277,7 +285,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEnext" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -285,7 +293,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEbody" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -293,7 +301,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEfoot" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" level="document" category="tables" file="tabl-ntb.mkxl"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> diff --git a/tex/context/interface/mkiv/i-orientation.xml b/tex/context/interface/mkiv/i-orientation.xml new file mode 100644 index 000000000..3731d65ba --- /dev/null +++ b/tex/context/interface/mkiv/i-orientation.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:command name="defineorientation" level="style" category="alignment" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuporientation"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuporientation" level="style" category="alignment" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="orientation"> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="normal" default="yes"/> + </cd:parameter> + <cd:parameter name="horizontal"> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="normal" default="yes"/> + </cd:parameter> + <cd:parameter name="vertical"> + <cd:constant type="line"/> + <cd:constant type="top"/> + <cd:constant type="middle"/> + <cd:constant type="bottom"/> + <cd:constant type="normal" default="yes"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="theorientation" level="system" category="alignment" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="argument-orientation"/> + </cd:arguments> + </cd:command> + + <cd:command name="autoorientation" level="system" category="alignment" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="argument-orientation"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifelseorientation" level="system" category="conditional" file="pack-ori.mkxl"> + <cd:arguments> + <cd:resolve name="argument-orientation"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + +</cd:interface> diff --git a/tex/context/interface/mkiv/i-pagestate.xml b/tex/context/interface/mkiv/i-pagestate.xml index e705ba7e7..68f98e0f0 100644 --- a/tex/context/interface/mkiv/i-pagestate.xml +++ b/tex/context/interface/mkiv/i-pagestate.xml @@ -13,6 +13,13 @@ </cd:arguments> </cd:command> + <cd:command name="doifrightpageelse" 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"> diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 9d01bdf5e..affc21f56 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/context/interface/mkiv/i-references.xml b/tex/context/interface/mkiv/i-references.xml index 1e3e3466d..0c8407b42 100644 --- a/tex/context/interface/mkiv/i-references.xml +++ b/tex/context/interface/mkiv/i-references.xml @@ -264,7 +264,7 @@ </cd:arguments> </cd:command> - <cd:command name="docheckedpagestate" level="system" category="references" file="strc-ref.mkvi"> + <cd:command name="doifcheckedpagestate" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-command"/> @@ -563,4 +563,18 @@ </cd:arguments> </cd:command> + <cd:command name="referencepagestate" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="referencepagedetail" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="referencerealpage" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="referencecolumnnumber" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="tracedpagestate" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="markreferencepage" level="style" category="references" file="strc-ref.mkvi"/> + + <cd:command name="referencesymbol" level="style" category="references" file="strc-ref.mkvi"/> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-replacement.xml b/tex/context/interface/mkiv/i-replacement.xml index 1cee232db..851d2b773 100644 --- a/tex/context/interface/mkiv/i-replacement.xml +++ b/tex/context/interface/mkiv/i-replacement.xml @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="setreplacement" level="style" category="language" file="lang-rep.mkiv"> + <cd:command name="setreplacements" level="style" category="language" file="lang-rep.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -21,6 +21,6 @@ </cd:arguments> </cd:command> - <cd:command name="resetreplacement" level="style" category="language" file="lang-rep.mkiv"/> + <cd:command name="resetreplacements" level="style" category="language" file="lang-rep.mkiv"/> </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-rotation.xml b/tex/context/interface/mkiv/i-rotation.xml new file mode 100644 index 000000000..7bfb9b2de --- /dev/null +++ b/tex/context/interface/mkiv/i-rotation.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:command name="mirror" level="document" category="graphics" file="grph-trf.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="setuprotate" level="style" category="graphics" file="grph-trf.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="location"> + <cd:constant type="fit"/> + <cd:constant type="broad"/> + <cd:constant type="depth"/> + <cd:constant type="high"/> + <cd:constant type="middle"/> + <cd:constant type="default"/> + <cd:constant type="normal"/> + </cd:parameter> + <cd:parameter name="rotation"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="rotate" level="document" category="graphics" file="grph-trf.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuprotate"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="dorotatebox" level="system" category="graphics" file="grph-trf.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sort.xml b/tex/context/interface/mkiv/i-sort.xml index 5a263ab97..6858fd90e 100644 --- a/tex/context/interface/mkiv/i-sort.xml +++ b/tex/context/interface/mkiv/i-sort.xml @@ -74,6 +74,12 @@ <cd:parameter name="synonymcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-strut.xml b/tex/context/interface/mkiv/i-strut.xml index d686d6ee0..6e566fe72 100644 --- a/tex/context/interface/mkiv/i-strut.xml +++ b/tex/context/interface/mkiv/i-strut.xml @@ -14,7 +14,7 @@ <cd:command name="strutgap" level="system" file="supp-box.mkiv"/> - <cd:command name="setupstruts" level="style" file="spac-ver.mkiv"> + <cd:command name="setupstrut" level="style" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-strut"/> diff --git a/tex/context/interface/mkiv/i-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml index 3e3e1c027..d2a966f15 100644 --- a/tex/context/interface/mkiv/i-synonym.xml +++ b/tex/context/interface/mkiv/i-synonym.xml @@ -76,6 +76,21 @@ <cd:parameter name="synonymcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="left"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="right"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-system.xml b/tex/context/interface/mkiv/i-system.xml index c8abff238..d00ebc01a 100644 --- a/tex/context/interface/mkiv/i-system.xml +++ b/tex/context/interface/mkiv/i-system.xml @@ -3690,4 +3690,14 @@ </cd:arguments> </cd:command> + <cd:command name="setupsystem" level="style" file="core-sys.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-table.xml b/tex/context/interface/mkiv/i-table.xml index e59a9ca97..b4a4e7dde 100644 --- a/tex/context/interface/mkiv/i-table.xml +++ b/tex/context/interface/mkiv/i-table.xml @@ -58,7 +58,7 @@ <cd:command name="setuptables" level="style" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:assignments list="yes"> - <cd:parameter name="text"> + <cd:parameter name="textwidth"> <cd:constant type="cd:dimension"/> <cd:constant type="max"/> </cd:parameter> diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml index f13d88021..eb6f79ec8 100644 --- a/tex/context/interface/mkiv/i-texts.xml +++ b/tex/context/interface/mkiv/i-texts.xml @@ -43,15 +43,30 @@ <cd:parameter name="after"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="lefttext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="middletext"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="righttext"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="leftstyle"> <cd:resolve name="value-style"/> </cd:parameter> + <cd:parameter name="middlestyle"> + <cd:resolve name="value-style"/> + </cd:parameter> <cd:parameter name="rightstyle"> <cd:resolve name="value-style"/> </cd:parameter> <cd:parameter name="leftcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="middlecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="rightcolor"> <cd:constant type="cd:color"/> </cd:parameter> @@ -61,6 +76,9 @@ <cd:parameter name="leftwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="middlewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:parameter name="rightwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> diff --git a/tex/context/interface/mkiv/i-xml.xml b/tex/context/interface/mkiv/i-xml.xml index 1786e1bf6..e460aa22a 100644 --- a/tex/context/interface/mkiv/i-xml.xml +++ b/tex/context/interface/mkiv/i-xml.xml @@ -921,6 +921,10 @@ <cd:constant type="yes"/> <cd:constant type="no"/> </cd:parameter> + <cd:parameter name="entities"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 59f0dd066..7cc1f0ecb 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 2020-03-28 14:31 +-- merge date : 2020-03-30 13:25 do -- begin closure to overcome local limits and interference |