diff options
| author | Hans Hagen <pragma@wxs.nl> | 2017-07-27 17:53:52 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2017-07-27 17:53:52 +0200 |
| commit | ab56ea38d2f4f5b521ef097bac92812f6070ef55 (patch) | |
| tree | e5f2ba9e66f1b1ef8f7b32f91aed0d744a14a0da /tex/context/base/mkiv/strc-flt.mkvi | |
| parent | f7bfb1deb04d4ad101dbabf4d635d33cd98aa0a1 (diff) | |
| download | context-ab56ea38d2f4f5b521ef097bac92812f6070ef55.tar.gz | |
2017-07-27 16:23:00
Diffstat (limited to 'tex/context/base/mkiv/strc-flt.mkvi')
| -rw-r--r-- | tex/context/base/mkiv/strc-flt.mkvi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tex/context/base/mkiv/strc-flt.mkvi b/tex/context/base/mkiv/strc-flt.mkvi index 5e31a2714..4323b70da 100644 --- a/tex/context/base/mkiv/strc-flt.mkvi +++ b/tex/context/base/mkiv/strc-flt.mkvi @@ -540,7 +540,7 @@ \def\strc_floats_place_indeed[#location][#reference]#caption% {\strc_floats_reset_variables - \edef\floatlocation{#location}% + \edef\floatlocation{\ifexporting\v!here\else#location\fi}% \ifx\floatlocation\empty \edef\floatlocation{\floatparameter\c!default}% beware of a clash between alignment locations \fi @@ -592,7 +592,7 @@ \setexpandedfloatparameter\c!bottomoffset{\floatcaptionparameter\c!bottomoffset}% \setexpandedfloatparameter\c!freeregion {\floatcaptionparameter\c!freeregion}% \def\m_strc_floats_saved_userdata{#2}% - \edef\floatlocation{\floatcaptionparameter\c!location}% + \edef\floatlocation{\ifexporting\v!here\else\floatcaptionparameter\c!location\fi}% \setfloatcaptionparameter\c!location{\savedfloatlocation}% not expanded \ifx\floatlocation\empty \edef\floatlocation{\floatparameter\c!default}% @@ -1097,6 +1097,7 @@ % already be set at this point \processcommacommand[\floatlocation]\strc_floats_check_extra_actions_step \ifx\extrafloatlocation\empty \else + % maybe not when exporting \edef\floatlocation{\extrafloatlocation,\floatlocation}% \setfloatmethodvariables\floatlocation \fi}} @@ -1246,7 +1247,7 @@ \global\floatwidth \wd\floatbox \global\floatheight \ht\floatbox % forget about the depth \global\floattextwidth\dimexpr\hsize-\floatwidth-\rootfloatparameter\c!margin\relax - \edef\floatlocation{\floatlocationmethod}% to be sure .. why + \edef\floatlocation{\ifexporting\v!here\else\floatlocationmethod\fi}% to be sure .. why \doifelseinset\v!tall\floatlocationmethod {\floattextheight\dimexpr\pagegoal-\pagetotal-\bigskipamount\relax % ugly, this bigskip \ifdim\floattextheight>\textheight |