diff options
author | Hans Hagen <pragma@wxs.nl> | 2012-01-05 19:27:32 +0100 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2012-01-05 19:27:32 +0100 |
commit | c1d888aa68857ae06aff4ab7695e38486a12a6d6 (patch) | |
tree | 0d363d8fbf910426c2cf767a40291a31a9e4e00f /tex/context/base/strc-flt.mkvi | |
parent | 95f21824e1d6461c67f7c2c34e2bf149f79c8a48 (diff) | |
download | context-c1d888aa68857ae06aff4ab7695e38486a12a6d6.tar.gz |
beta 2011.11.24 15:52
Diffstat (limited to 'tex/context/base/strc-flt.mkvi')
-rw-r--r-- | tex/context/base/strc-flt.mkvi | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi index ed5215dce..22585b465 100644 --- a/tex/context/base/strc-flt.mkvi +++ b/tex/context/base/strc-flt.mkvi @@ -514,7 +514,10 @@ \def\float_begin_text_group {\begingroup\let\float_end_group\relax} \def\float_end_text_group {\endgroup} -% implemenation +% implementation + +\ifdefined\page_margin_float_before \else \let\page_margin_float_before \relax \fi +\ifdefined\page_margin_float_set_hsize \else \let\page_margin_float_set_hsize\relax \fi \def\flushfloatslist {\v!left,\v!right,\v!inner,\v!outer,% @@ -537,14 +540,10 @@ {\doifcommonelse\floatlocation\flushfloatslist\doflushfloats\donothing}% % but which should be done before using box \floatbox \fi - \ifmarginblocks - \doifinset\v!margin\floatlocation\endgraf - \fi + \page_margin_float_before % todo: each float handler gets a before \global\insidefloattrue \dostarttagged\t!float\currentfloat - \ifmarginblocks - \doifinset\v!margin\floatlocation{\hsize\@@mbwidth}% - \fi + \page_margin_float_set_hsize % todo: each float handler gets a set_hsize \the\everyinsidefloat \float_analyze_variables_one \dostarttagged\t!floatcontent\empty @@ -1878,7 +1877,7 @@ \def\sometopfloat [#1]{\someelsefloat[#1]\nonoindentation} \def\somebottomfloat [#1]{\someelsefloat[#1]} \def\someautofloat [#1]{\someelsefloat[#1]} -\def\somemarginfloat [#1]{\somenextfloat[#1]\nonoindentation} +\def\somemarginfloat [#1]{\page_margin_process_float{#1}\nonoindentation} \def\someinleftmarginfloat [#1]{\somesidefloat[#1]} \def\someinrightmarginfloat[#1]{\somesidefloat[#1]} \def\someinleftedgefloat [#1]{\somesidefloat[#1]} |