diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml')
-rw-r--r-- | Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml | 262 |
1 files changed, 48 insertions, 214 deletions
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml index 7714e5ccc23..a29fc7b9d50 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml @@ -239,7 +239,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupfloatcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -363,7 +363,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -372,7 +372,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaptions" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -383,7 +383,7 @@ --> - <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -452,9 +452,6 @@ <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> - <cd:parameter name="headcommand"> - <cd:constant type="cd:command"/> - </cd:parameter> <cd:parameter name="inbetween"> <cd:constant type="cd:command"/> </cd:parameter> @@ -505,13 +502,17 @@ <cd:parameter name="maxwidth"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> <cd:inherit name="setupcounter"/> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaptions" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -520,9 +521,33 @@ </cd:arguments> </cd:command> + <cd:command name="placefloatcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="title"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="bookmark"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="marking"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="list"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + </cd:assignments> + <cd:resolve name="assignment-userdata-list-optional"/> + </cd:arguments> + </cd:command> + <!-- - <cd:command name="definefloatframed" level="style" category="structure background" file="strc-flt.mkvi"> + <cd:command name="definefloatframed" level="style" category="structure" keywords="background" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -534,7 +559,7 @@ --> - <cd:command name="setupfloatframed" level="style" category="structure background" file="strc-flt.mkvi"> + <cd:command name="setupfloatframed" level="style" category="structure" keywords="background" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -642,244 +667,48 @@ </cd:arguments> </cd:command> - <cd:command name="doifelserightpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifelserightpagefloat" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifrightpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifrightpagefloatelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelseoddpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifelseoddpagefloat" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifoddpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifoddpagefloatelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemainfloatbody" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifelsemainfloatbody" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifmainfloatbodyelse" level="system" category="structure conditional" file="strc-flt.mkvi"> + <cd:command name="doifmainfloatbodyelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <!-- - - <cd:command name="placefigure" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placefigure" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="figuretext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistoffigures" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistoffigures" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placetable" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placetable" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tabletext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistoftables" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistoftables" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placegraphic" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placegraphic" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="graphictext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistofgraphics" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistofgraphics" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placeintermezzo" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placeintermezzo" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="intermezzotext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistofintermezzi" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistofintermezzi" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="placechemical" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> - - <cd:command name="placechemical" type="environment" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="placelistofchemicals" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="completelistofchemicals" level="document" category="structure" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> - <cd:command name="setuplocalfloats" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes"> @@ -914,7 +743,7 @@ <cd:command name="forcelocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="setupfloatsplitting" level="style" category="structure counter" file="tabl-tsp.mkiv"> + <cd:command name="setupfloatsplitting" level="style" category="structure" keywords="counter" file="tabl-tsp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -947,7 +776,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotinsidesplitfloat" level="system" category="structure conditional" file="tabl-tsp.mkiv"> + <cd:command name="doifnotinsidesplitfloat" level="system" category="structure" keywords="conditional" file="tabl-tsp.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> </cd:arguments> @@ -999,6 +828,11 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="width"> + <cd:constant type="fit" default="yes"/> + <cd:constant type="frame"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> |