Merge pull request #2853 from jurriaan/fix-float-clear-after-page-break

Fix cleared float layout after page breaks

Author: liZe

tests/draw/test_float.py

@@ -871,6 +871,44 @@ def test_float_split_clear(assert_pixels):
         <article>aa</article>''')
 
 
+@assert_no_logs
+def test_float_split_clear_float(assert_pixels):
+    assert_pixels('''
+        BBBB
+        BBBB
+        BBBB
+        BBBB
+        BBBB
+        BBBB
+        BBBB
+        BBBB
+        BBBB
+        BBBB
+        rrrr
+        rrrr
+    ''', '''
+        <style>
+            @page {
+                size: 4px;
+            }
+            body {
+                color: red;
+                font: 2px / 1 weasyprint;
+            }
+            div {
+                color: blue;
+                float: left;
+            }
+            article {
+                clear: left;
+                float: left;
+                text-decoration: underline;
+            }
+        </style>
+        <div>bb bb bb bb bb</div>
+        <article>aa</article>''')
+
+
 @assert_no_logs
 def test_float_split_clear_empty(assert_pixels):
     assert_pixels('''

weasyprint/layout/float.py

@@ -1,6 +1,6 @@
 """Layout for floating boxes."""
 
-from math import inf
+from sys import maxsize
 
 from ..formatting_structure import boxes
 from .min_max import handle_min_max_width
@@ -135,7 +135,7 @@ def clear(clear_value, float_value):
     for broken_shape in context.broken_out_of_flow:
         if broken_shape.is_floated():
             if clear(box.style['clear'], broken_shape.style['float']):
-                return inf
+                return maxsize
     # Hypothetical position is the position of the top border edge
     clearance = None
     hypothetical_position = box.position_y + collapsed_margin
@@ -155,7 +155,7 @@ def avoid_collisions(context, box, containing_block, outer=True):
     box_height = box.margin_height() if outer else box.border_height()
 
     if box.border_height() == 0 and box.is_floated():
-        return 0, 0, containing_block.width
+        return 0, position_y, containing_block.width
 
     left_keywords = ['left']
     right_keywords = ['right']