diff options
Diffstat (limited to 'tex/context/base/mkiv/strc-flt.mkvi')
| -rw-r--r-- | tex/context/base/mkiv/strc-flt.mkvi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tex/context/base/mkiv/strc-flt.mkvi b/tex/context/base/mkiv/strc-flt.mkvi index a1289bf1d..5daf2b44d 100644 --- a/tex/context/base/mkiv/strc-flt.mkvi +++ b/tex/context/base/mkiv/strc-flt.mkvi @@ -1068,8 +1068,9 @@ \def\floatcaptionattribute {\iflocation - %\ifnofloatnumber - %\else + \ifx\currentfloatattribute\empty + % safeguard, can be samepage too + \else \ifnofloatcaption \else \ifinsidesplitfloat @@ -1081,7 +1082,7 @@ attr \destinationattribute \currentfloatattribute \fi \fi - %\fi + \fi \fi} \newconditional\usesamefloatnumber @@ -1144,7 +1145,7 @@ \glet\currentfloatsynchronize\m_strc_counters_last_registered_synchronize \fi % - \global\setfalse\usesamefloatnumber % one shot + \iftrialtypesetting\else\global\setfalse\usesamefloatnumber\fi % one shot % check float box \strc_floats_set_natural_dimensions\nextbox \global\setbox\floatbox\vbox{\floatparameter\c!command{\box\nextbox}}% can be anything so no pack @@ -1170,6 +1171,7 @@ \strc_floats_get_box \global\insidefloatfalse} + \newdimen\availablefloatwidth \newdimen\availablefloatheight |