diff options
| author | Hans Hagen <pragma@wxs.nl> | 2018-01-24 12:00:59 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2018-01-24 12:00:59 +0100 |
| commit | 7ce2f30f31421eb46d07ff65cbf9fcbda1d6612a (patch) | |
| tree | cb78bde46cd0939d74075a8047ec8d9bf0210a4a /tex/context/base/mkiv/page-sid.mkiv | |
| parent | 35a569ef13b42755e7469cf93d3e4982e12252d6 (diff) | |
| download | context-7ce2f30f31421eb46d07ff65cbf9fcbda1d6612a.tar.gz | |
2018-01-24 10:57:00
Diffstat (limited to 'tex/context/base/mkiv/page-sid.mkiv')
| -rw-r--r-- | tex/context/base/mkiv/page-sid.mkiv | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/tex/context/base/mkiv/page-sid.mkiv b/tex/context/base/mkiv/page-sid.mkiv index e8f2b03a4..46e4cd073 100644 --- a/tex/context/base/mkiv/page-sid.mkiv +++ b/tex/context/base/mkiv/page-sid.mkiv @@ -204,7 +204,13 @@ \def\page_sides_flush_floats_text {\par - \ifdim\dimexpr\d_page_sides_vsize-\d_page_sides_bottomskip-\pagetotal\relax>\zeropoint % -\pagedepth + \ifdim\dimexpr + \d_page_sides_vsize + \ifnum\c_anch_backgrounds_text_level>\plusone + -\d_page_sides_bottomskip + \fi + -\pagetotal + \relax>\zeropoint % -\pagedepth \page_sides_flush_floats_progress \page_sides_flush_floats_after_none \fi @@ -271,7 +277,14 @@ \forgetall \offinterlineskip \doloop - {\scratchdimen\dimexpr\d_page_sides_vsize-\d_page_sides_bottomskip-\pagetotal-\pagedepth\relax + {\scratchdimen\dimexpr + \d_page_sides_vsize + \ifnum\c_anch_backgrounds_text_level>\plusone + -\d_page_sides_bottomskip + \fi + -\pagetotal + -\pagedepth + \relax \ifdim\scratchdimen>\onepoint % good enough, if we change it it will become a threshold \ifnum\recurselevel>\plushundred % safeguard, sort of deadcycles \exitloop @@ -863,10 +876,10 @@ %D We need to hook it into the other otr's. This code will be adapted once we rename %D the callers. We use \type {\def} as they can be redefined! Some will become obsolete -\def\checksidefloat {\page_sides_check_floats} -\def\flushsidefloats {\page_sides_flush_floats_text} -\def\flushsidefloatsafterpar{\page_sides_flush_floats_after_par} -\def\forgetsidefloats {\page_sides_forget_floats} -%def\synchronizesidefloats {\page_sides_synchronize_floats} +\unexpanded\def\checksidefloat {\page_sides_check_floats} +\unexpanded\def\flushsidefloats {\page_sides_flush_floats_text} +\unexpanded\def\flushsidefloatsafterpar{\page_sides_flush_floats_after_par} +\unexpanded\def\forgetsidefloats {\page_sides_forget_floats} +%unexpanded\def\synchronizesidefloats {\page_sides_synchronize_floats} \protect \endinput |