diff options
| author | Marius <mariausol@gmail.com> | 2011-09-20 01:00:13 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2011-09-20 01:00:13 +0300 |
| commit | d4278c635c647dbd58fcfec08a6f5342198ef3c9 (patch) | |
| tree | 542106967b675223b71181e8a77d51964ea88f48 /tex/context/base/strc-flt.mkiv | |
| parent | 23d49db944011bca3c1b0812fd5f3d354ed33c41 (diff) | |
| download | context-d4278c635c647dbd58fcfec08a6f5342198ef3c9.tar.gz | |
beta 2011.09.19 23:43
Diffstat (limited to 'tex/context/base/strc-flt.mkiv')
| -rw-r--r-- | tex/context/base/strc-flt.mkiv | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tex/context/base/strc-flt.mkiv b/tex/context/base/strc-flt.mkiv index 50a893c67..739e81c80 100644 --- a/tex/context/base/strc-flt.mkiv +++ b/tex/context/base/strc-flt.mkiv @@ -128,8 +128,8 @@ \appendtoks \let\currentfloat\currentfloatcaption - \dostructurecountersetup\currentfloat\floatcaptionparameter - \docheckstructurecountersetup\currentfloat + \dostructurecountersetup\currentfloatcaption\floatcaptionparameter + \docheckstructurecountersetup\currentfloatcaption \to \everysetupfloatcaption %D Definitions: @@ -197,8 +197,6 @@ \newif\ifnofloatnumber \newif\ifemptyfloatcaption -\def\getcaptionparameters{\getparameters[\??kj\currentfloat]} - \installstructurelistprocessor{float}{\usestructurelistprocessor{number+title}} \unexpanded\def\thecurrentfloatnumbersuffix @@ -266,7 +264,7 @@ \fi \letgvalue{@fl@r@#1}\relax}% nils \setgvalue{@fl@t@#1}% - {\preparefullnumber{\??kj#1}{\getvalue{@fl@n@#1}}\preparednumber + {\preparefullnumber{\??kj#1}{\getvalue{@fl@n@#1}}\preparednumber % !!!!!!!!!!!!!!!!!!!!!!!!!!! wrong \begingroup \dosetfloatcaptionattributes\c!style\c!color \begingroup @@ -480,8 +478,8 @@ \unexpanded\def\docomplexplacefloat[#1][#2]% [#3]#4% {\edef\currentfloat{#1}% - \let\currentfloatcaption\currentfloat \doifnothing\currentfloat{\let\currentfloat\v!figure}% hack + \let\currentfloatcaption\currentfloat \doifelsenothing{#2} {\edef\floatlocation{\floatparameter\c!default}} {\edef\floatlocation{#2}}% @@ -707,7 +705,7 @@ \else \dostructurecountercomponent {float}% - \getcaptionparameters + \setupcurrentfloatcaption \floatcaptionparameter \detokenizedfloatcaptionparameter \relax |