diff options
| author | Marius <mariausol@gmail.com> | 2011-09-05 14:00:14 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2011-09-05 14:00:14 +0300 |
| commit | 55115d779b08fbd8970bd6e580cc255d7ab23ba6 (patch) | |
| tree | 09e7d5d0788d55e8da94e3ee4b96b79ca942aeee /tex/context/base/strc-flt.mkiv | |
| parent | 7094c38b1390494cbac47a173433e238768a7c0f (diff) | |
| download | context-55115d779b08fbd8970bd6e580cc255d7ab23ba6.tar.gz | |
beta 2011.09.05 12:54
Diffstat (limited to 'tex/context/base/strc-flt.mkiv')
| -rw-r--r-- | tex/context/base/strc-flt.mkiv | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/tex/context/base/strc-flt.mkiv b/tex/context/base/strc-flt.mkiv index 98fa0fed6..96287a24a 100644 --- a/tex/context/base/strc-flt.mkiv +++ b/tex/context/base/strc-flt.mkiv @@ -600,8 +600,8 @@ {\edef\floatlocation{\floatparameter\c!default}} {\edef\floatlocation{#2}}% \doifinsetelse\v!split{#2} - {\normalexpanded{\noexpand\dodocomplexsplitfloat[\currentfloat][\floatlocation]}} - {\normalexpanded{\noexpand\dodocomplexplacefloat[\currentfloat][\floatlocation]}}} + {\normalexpanded{\dodocomplexsplitfloat[\currentfloat][\floatlocation]}} + {\normalexpanded{\dodocomplexplacefloat[\currentfloat][\floatlocation]}}} \unexpanded\def\dodocomplexsplitfloat[#1][#2][#3]#4% {\splitfloat{\dodocomplexplacefloat[#1][#2][#3]{#4}}} @@ -788,9 +788,22 @@ \let\currentfloatattribute\empty % to be checked \def\floatcaptionattribute - {\iflocation \ifnofloatnumber \else \ifnofloatcaption \else \ifinsidesplitfloat \else - attr \destinationattribute \currentfloatattribute - \fi \fi \fi \fi} + {\iflocation + \ifnofloatnumber + \else + \ifnofloatcaption + \else + \ifinsidesplitfloat + \ifconditional\splitfloatfirstdone + \else + attr \destinationattribute \currentfloatattribute + \fi + \else + attr \destinationattribute \currentfloatattribute + \fi + \fi + \fi + \fi} \newconditional\usesamefloatnumber |