diff options
author | Hans Hagen <pragma@wxs.nl> | 2016-10-14 17:42:58 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-10-14 17:42:58 +0200 |
commit | d273e996892fcf539d67c9548c90d96c2877507a (patch) | |
tree | 94cde76afdd112bd384f03a908ff0371ef27b5c9 /tex/context/interface/mkiv/i-floats.xml | |
parent | 1964c078d21c5f1d19a84fa6ef5c038f8ee80652 (diff) | |
download | context-d273e996892fcf539d67c9548c90d96c2877507a.tar.gz |
2016-10-14 17:25:00
Diffstat (limited to 'tex/context/interface/mkiv/i-floats.xml')
-rw-r--r-- | tex/context/interface/mkiv/i-floats.xml | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml index 54d78adab..d53956355 100644 --- a/tex/context/interface/mkiv/i-floats.xml +++ b/tex/context/interface/mkiv/i-floats.xml @@ -12,6 +12,9 @@ <cd:inherit name="setupfloat"/> </cd:assignments> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-float"/> + </cd:instances> </cd:command> <cd:command name="definefloat" variant="name" file="strc-flt.mkvi"> @@ -20,6 +23,9 @@ <cd:resolve name="keyword-plural-optional"/> <cd:resolve name="keyword-singular-optional"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-float"/> + </cd:instances> </cd:command> <cd:command name="setupfloat" file="strc-flt.mkvi"> @@ -337,11 +343,7 @@ <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="chemical"/> - <cd:constant value="figure"/> - <cd:constant value="table"/> - <cd:constant value="intermezzo"/> - <cd:constant value="graphic"/> + <cd:resolve name="instance-float"/> </cd:instances> </cd:command> @@ -365,14 +367,21 @@ <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> <cd:instances> - <cd:constant value="chemical"/> - <cd:constant value="figure"/> - <cd:constant value="table"/> - <cd:constant value="intermezzo"/> - <cd:constant value="graphic"/> + <cd:resolve name="instance-float"/> </cd:instances> </cd:command> + <cd:command name="placefloat" generated="yes" variant="instance" file="strc-flt.mkvi"> + <cd:sequence> + <cd:string value="place"/> + <cd:instance/> + </cd:sequence> + <cd:arguments> + <cd:resolve name="assignment-floatdata-list-optional"/> + <cd:resolve name="assignment-userdata-list-optional"/> + </cd:arguments> + </cd:command> + <cd:command name="placefloat" type="environment" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> @@ -465,7 +474,9 @@ </cd:arguments> </cd:command> - <cd:command name="placefigure" file="strc-flt.mkvi"> + <!-- + + <cd:command file="strc-flt.mkvi" name="placefigure"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -474,6 +485,8 @@ </cd:arguments> </cd:command> + --> + <cd:command name="placefigure" type="environment" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="assignment-floatdata-list-optional"/> |