summaryrefslogtreecommitdiff
path: root/tex/context/base/mkiv/page-sid.mkiv
diff options
context:
space:
mode:
Diffstat (limited to 'tex/context/base/mkiv/page-sid.mkiv')
-rw-r--r--tex/context/base/mkiv/page-sid.mkiv13
1 files changed, 10 insertions, 3 deletions
diff --git a/tex/context/base/mkiv/page-sid.mkiv b/tex/context/base/mkiv/page-sid.mkiv
index 303b77af2..afaf18231 100644
--- a/tex/context/base/mkiv/page-sid.mkiv
+++ b/tex/context/base/mkiv/page-sid.mkiv
@@ -403,7 +403,8 @@
\endgroup
\else
\forcestrutdepth
- \fi}
+ \fi
+ \page_otr_command_set_vsize} % new
\def\page_sides_flush_floats
{\par
@@ -689,7 +690,8 @@
% \stoptext
\def\page_sides_analyse_progress
- {\d_page_sides_progress\d_page_sides_vsize
+ {%\page_otr_command_set_vsize % this is new, otherwise topfloats are not taken into account
+ \d_page_sides_progress\d_page_sides_vsize
\ifconditional\c_page_sides_flag
\advance\d_page_sides_progress-\d_page_sides_page_total
\global\setfalse\c_page_sides_flag
@@ -704,7 +706,12 @@
\def\page_sides_analyse_space
{\global\settrue\c_page_sides_flag
- \page_sides_force_depth
+\ifdim\pagegoal=\maxdimen
+ \pagegoal\textheight
+\fi
+\ifdim\pagetotal<\zeropoint
+ \pagetotal\textheight
+\fi
\global\d_page_sides_page_total \pagetotal % global
\ifnum\c_page_sides_float_type<\plusfour
\global\d_page_sides_width \zeropoint