weasyprint 65.1__py3-none-any.whl → 67.0__py3-none-any.whl

weasyprint/layout/column.py

@@ -7,8 +7,8 @@ from .percent import percentage, resolve_percentages
 
 
 def columns_layout(context, box, bottom_space, skip_stack, containing_block,
-                   page_is_empty, absolute_boxes, fixed_boxes,
-                   adjoining_margins):
+                   page_is_empty, absolute_boxes, fixed_boxes, adjoining_margins,
+                   first_letter_style, first_line_style):
     """Lay out a multi-column ``box``."""
     from .block import (  # isort:skip
         block_box_layout, block_level_layout, block_level_width,
@@ -26,11 +26,11 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
         absolute_boxes = []
 
     box = box.copy_with_children(box.children)
-    box.position_y += collapse_margin(adjoining_margins) - box.margin_top
+    box.position_y += collapse_margin(adjoining_margins)
 
     # Set height if defined
     if height != 'auto' and height.unit != '%':
-        assert height.unit == 'px'
+        assert height.unit.lower() == 'px'
         height_defined = True
         empty_space = context.page_bottom - box.content_box_y() - height.value
         bottom_space = max(bottom_space, empty_space)
@@ -45,7 +45,7 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
         # 1em because in column context
         gap = style['font_size']
     else:
-        gap = percentage(style['column_gap'], box.width)
+        gap = percentage(style['column_gap'], box.style, box.width)
 
     # Define the number of columns and their widths
     if width == 'auto' and count != 'auto':
@@ -118,9 +118,9 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
             block.position_y = current_position_y
             new_child, resume_at, next_page, adjoining_margins, _, _ = (
                 block_level_layout(
-                    context, block, original_bottom_space, skip_stack,
-                    containing_block, page_is_empty, absolute_boxes,
-                    fixed_boxes, adjoining_margins))
+                    context, block, original_bottom_space, skip_stack, containing_block,
+                    page_is_empty, absolute_boxes, fixed_boxes, adjoining_margins,
+                    first_letter_style, first_line_style))
             skip_stack = None
             if new_child is None:
                 last_loop = True
@@ -171,8 +171,8 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
                     context, column_box,
                     context.page_bottom - current_position_y - height,
                     column_skip_stack, containing_block,
-                    page_is_empty or not balancing, [], [], [],
-                    discard=False, max_lines=None)
+                    page_is_empty or not balancing, [], [], [], first_letter_style,
+                    first_line_style, discard=False, max_lines=None)
                 if new_box is None:
                     # We didn't render anything, retry
                     column_skip_stack = {0: None}
@@ -190,20 +190,20 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
                         in_flow_children[-1].margin_height() +
                         in_flow_children[-1].position_y - current_position_y)
                     empty_space = height - consumed_height
+                    consumed_height -= in_flow_children[-1].margin_bottom
 
                     # Get the minimum size needed to render the next box
+                    next_box_height = 0
                     if column_skip_stack:
                         next_box = block_box_layout(
                             context, column_box, inf, column_skip_stack,
-                            containing_block, True, [], [], [],
-                            discard=False, max_lines=None)[0]
+                            containing_block, True, [], [], [], first_letter_style,
+                            first_line_style, discard=False, max_lines=None)[0]
                         for child in next_box.children:
                             if child.is_in_normal_flow():
                                 next_box_height = child.margin_height()
                                 break
                         remove_placeholders(context, [next_box], [], [])
-                    else:
-                        next_box_height = 0
                 else:
                     consumed_height = empty_space = next_box_height = 0
 
@@ -265,7 +265,6 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
                 if everything_fits:
                     # Everything fits, start expanding columns at the average
                     # of the column heights
-                    max_height -= last_footnotes_height
                     if (style['column_fill'] == 'balance' or
                             index < columns_and_blocks[-1][0]):
                         balancing = True
@@ -275,11 +274,6 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
                 else:
                     # Content overflows even at maximum height, stop now and
                     # let the columns continue on the next page
-                    height += footnote_area_heights[-1]
-                    if len(footnote_area_heights) > 2:
-                        last_footnotes_height = min(
-                            last_footnotes_height, footnote_area_heights[-1])
-                    height -= last_footnotes_height
                     stop_rendering = True
                     break
 
@@ -301,9 +295,10 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
                 column_box.position_x += i * (width + gap)
             new_child, column_skip_stack, column_next_page, _, _, _ = (
                 block_box_layout(
-                    context, column_box, bottom_space, skip_stack,
-                    containing_block, original_page_is_empty, absolute_boxes,
-                    fixed_boxes, None, discard=False, max_lines=None))
+                    context, column_box, bottom_space, skip_stack, containing_block,
+                    original_page_is_empty, absolute_boxes, fixed_boxes, None,
+                    first_letter_style, first_line_style, discard=False,
+                    max_lines=None))
             if new_child is None:
                 columns = []
                 break_page = True
@@ -337,7 +332,7 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
             break
 
     # Report footnotes above the defined footnotes height
-    _report_footnotes(context, last_footnotes_height)
+    _report_footnotes(context, footnote_area_heights[-1])
 
     if box.children and not new_children:
         # The box has children but none can be drawn, let's skip the whole box

weasyprint/layout/flex.py

@@ -20,7 +20,7 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
     from . import block
 
     # TODO: merge this with block_container_layout.
-    context.create_flex_formatting_context()
+    context.create_flex_formatting_context(box)
     resume_at = None
 
     is_start = skip_stack is None
@@ -172,6 +172,8 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
                     child.style['image_resolution'], child.style['font_size'])
                 if intrinsic_ratio and intrinsic_height:
                     transferred_size = intrinsic_height * intrinsic_ratio
+                    content_size = max(
+                        child.min_width, min(child.max_width, content_size))
             if specified_size != 'auto':
                 child.min_width = min(specified_size, content_size)
             elif transferred_size is not None:
@@ -183,12 +185,12 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             specified_size = child.height
             new_child = child.copy()
             new_child.style = child.style.copy()
-            if new_child.style['width'] == 'auto':
-                new_child_width = max_content_width(context, new_child)
-                new_child.style['width'] = Dimension(new_child_width, 'px')
             new_child.style['height'] = 'auto'
             new_child.style['min_height'] = Dimension(0, 'px')
             new_child.style['max_height'] = Dimension(inf, 'px')
+            if new_child.style['width'] == 'auto':
+                new_child_width = max_content_width(context, new_child)
+                new_child.style['width'] = Dimension(new_child_width, 'px')
             new_child = block.block_level_layout(
                 context, new_child, bottom_space, child_skip_stack, parent_box,
                 page_is_empty)[0]
@@ -200,6 +202,12 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
                     child.style['image_resolution'], child.style['font_size'])
                 if intrinsic_ratio and intrinsic_width:
                     transferred_size = intrinsic_width / intrinsic_ratio
+                    content_size = max(
+                        child.min_height, min(child.max_height, content_size))
+                elif not intrinsic_width:
+                    # TODO: wrongly set by block_level_layout, would be OK with
+                    # min_content_height.
+                    content_size = 0
             if specified_size != 'auto':
                 child.min_height = min(specified_size, content_size)
             elif transferred_size is not None:
@@ -211,7 +219,7 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             flex_basis = 'content'
         else:
             flex_basis = percent.percentage(
-                child.style['flex_basis'], available_main_space)
+                child.style['flex_basis'], child.style, available_main_space)
             if flex_basis == 'auto':
                 if (flex_basis := getattr(child, main)) == 'auto':
                     flex_basis = 'content'
@@ -242,17 +250,31 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             pass
         else:
             # 3.E Otherwise…
+            new_child = child.copy()
+            new_child.style = child.style.copy()
             if main == 'width':
-                child.flex_base_size = max_content_width(context, child, outer=False)
+                # … the item’s min and max main sizes are ignored.
+                new_child.style['min_width'] = Dimension(0, 'px')
+                new_child.style['max_width'] = Dimension(inf, 'px')
+
+                child.flex_base_size = max_content_width(
+                    context, new_child, outer=False)
                 child.main_outer_extra = (
                     max_content_width(context, child) - child.flex_base_size)
             else:
-                new_child = child.copy()
+                # … the item’s min and max main sizes are ignored.
+                new_child.style['min_height'] = Dimension(0, 'px')
+                new_child.style['max_height'] = Dimension(inf, 'px')
+
                 new_child.width = inf
-                new_child = block.block_level_layout(
+                new_child, _, _, adjoining_margins, _, _ = block.block_level_layout(
                     context, new_child, bottom_space, child_skip_stack, parent_box,
-                    page_is_empty, absolute_boxes, fixed_boxes)[0]
+                    page_is_empty, absolute_boxes, fixed_boxes)
                 if new_child:
+                    # As flex items margins never collapse (with other flex items or
+                    # with the flex container), we can add the adjoining margins to the
+                    # child height.
+                    new_child.height += block.collapse_margin(adjoining_margins)
                     child.flex_base_size = new_child.height
                     child.main_outer_extra = (
                         new_child.margin_height() - new_child.height)
@@ -430,7 +452,7 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
                 if not child.frozen:
                     min_size = getattr(child, f'min_{main}')
                     max_size = getattr(child, f'max_{main}')
-                    min_size = max(min_size , min(child.target_main_size, max_size))
+                    min_size = max(min_size, min(child.target_main_size, max_size))
                     if child.target_main_size < min_size:
                         child.adjustment = min_size - child.target_main_size
                         child.target_main_size = min_size
@@ -471,14 +493,16 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             new_child = child.copy()
             new_child, _, _, adjoining_margins, _, _ = block.block_level_layout_switch(
                 context, new_child, -inf, child_skip_stack, parent_box, page_is_empty,
-                absolute_boxes, fixed_boxes, [], discard, None)
+                absolute_boxes, fixed_boxes, adjoining_margins=[],
+                first_letter_style=None, first_line_style=None, discard=discard,
+                max_lines=None)
             child._baseline = find_in_flow_baseline(new_child) or 0
             if cross == 'height':
                 child.height = new_child.height
                 # As flex items margins never collapse (with other flex items or
                 # with the flex container), we can add the adjoining margins to the
-                # child bottom margin.
-                child.margin_bottom += block.collapse_margin(adjoining_margins)
+                # child height.
+                child.height += block.collapse_margin(adjoining_margins)
             else:
                 if child.width == 'auto':
                     min_width = min_content_width(context, child, outer=False)
@@ -591,9 +615,9 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
                 align_self = align_items
             if 'stretch' in align_self and child.style[cross] == 'auto':
                 cross_margins = (
-                    (child.margin_top, child.margin_bottom)
-                    if cross == 'height'
-                    else (child.margin_left, child.margin_right))
+                    (child.style['margin_top'], child.style['margin_bottom'])
+                    if cross == 'height' else
+                    (child.style['margin_left'], child.style['margin_right']))
                 if 'auto' not in cross_margins:
                     cross_size = line.cross_size
                     if cross == 'height':
@@ -690,6 +714,8 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             position_main += free_space / (len(line) + 1)
 
         growths = sum(child.style['flex_grow'] for child in children)
+        if box.style['direction'] == 'rtl' and main == 'width':
+            main_gap *= -1
         for i, (index, child) in enumerate(line):
             if i:
                 position_main += main_gap
@@ -733,8 +759,9 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             line.lower_baseline = line[0][1]._baseline if line else 0
         for index, child in line:
             cross_margins = (
-                (child.margin_top, child.margin_bottom) if cross == 'height'
-                else (child.margin_left, child.margin_right))
+                (child.style['margin_top'], child.style['margin_bottom'])
+                if cross == 'height' else
+                (child.style['margin_left'], child.style['margin_right']))
             auto_margins = sum([margin == 'auto' for margin in cross_margins])
             # If a flex item has auto cross-axis margins…
             if auto_margins:
@@ -755,14 +782,14 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
                     # If its outer cross size is less than the cross size…
                     extra_cross /= auto_margins
                     if cross == 'height':
-                        if child.margin_top == 'auto':
+                        if child.style['margin_top'] == 'auto':
                             child.margin_top = extra_cross
-                        if child.margin_bottom == 'auto':
+                        if child.style['margin_bottom'] == 'auto':
                             child.margin_bottom = extra_cross
                     else:
-                        if child.margin_left == 'auto':
+                        if child.style['margin_left'] == 'auto':
                             child.margin_left = extra_cross
-                        if child.margin_right == 'auto':
+                        if child.style['margin_right'] == 'auto':
                             child.margin_right = extra_cross
                 else:
                     # Otherwise…
@@ -815,9 +842,6 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
                                 margins += (
                                     child.border_left_width + child.border_right_width +
                                     child.padding_left + child.padding_right)
-                        # TODO: Don't set style width, find a way to avoid width
-                        # re-calculation after 16.
-                        child.style[cross] = Dimension(line.cross_size - margins, 'px')
         position_cross += line.cross_size
 
     # 15 Determine the flex container’s used cross size.
@@ -877,7 +901,8 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
                 # TODO: Don't use block_level_layout_switch.
                 new_child, child_resume_at = block.block_level_layout_switch(
                     context, child, bottom_space, child_skip_stack, box, page_is_empty,
-                    absolute_boxes, fixed_boxes, adjoining_margins=[], discard=discard,
+                    absolute_boxes, fixed_boxes, adjoining_margins=[],
+                    first_letter_style=None, first_line_style=None, discard=discard,
                     max_lines=None)[:2]
                 if new_child is None:
                     if resume_at:
@@ -912,6 +937,9 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             absolute_layout(
                 context, absolute_box, box, fixed_boxes, bottom_space, skip_stack=None)
 
+    for child in box.children:
+        block.relative_positioning(child, (box.width, box.height))
+
     # TODO: Use real algorithm, see https://www.w3.org/TR/css-flexbox-1/#flex-baselines.
     if isinstance(box, boxes.InlineFlexBox):
         if main == 'width':  # and main text direction is horizontal

weasyprint/layout/float.py

@@ -1,5 +1,7 @@
 """Layout for floating boxes."""
 
+from math import inf
+
 from ..formatting_structure import boxes
 from .min_max import handle_min_max_width
 from .percent import resolve_percentages, resolve_position_percentages
@@ -56,13 +58,11 @@ def float_layout(context, box, containing_block, absolute_boxes, fixed_boxes,
         table_wrapper_width(context, box, (cb_width, cb_height))
 
     if isinstance(box, boxes.BlockContainerBox):
-        context.create_block_formatting_context()
         box, resume_at, _, _, _, _ = block_container_layout(
-            context, box, bottom_space=bottom_space,
-            skip_stack=skip_stack, page_is_empty=True,
-            absolute_boxes=absolute_boxes, fixed_boxes=fixed_boxes,
-            adjoining_margins=None, discard=False, max_lines=None)
-        context.finish_block_formatting_context(box)
+            context, box, bottom_space=bottom_space, skip_stack=skip_stack,
+            page_is_empty=True, absolute_boxes=absolute_boxes, fixed_boxes=fixed_boxes,
+            adjoining_margins=None, first_letter_style=None, first_line_style=None,
+            discard=False, max_lines=None)
     elif isinstance(box, boxes.FlexContainerBox):
         box, resume_at, _, _, _ = flex_layout(
             context, box, bottom_space=bottom_space,
@@ -115,9 +115,14 @@ def find_float_position(context, box, containing_block):
 
 def get_clearance(context, box, collapsed_margin=0):
     """Return None if there is no clearance, otherwise the clearance value."""
+    # Box should be after shape that’s broken on this page.
+    for broken_shape in context.broken_out_of_flow:
+        if broken_shape.is_floated():
+            if box.style['clear'] in (broken_shape.style['float'], 'both'):
+                return inf
+    # Hypothetical position is the position of the top border edge
     clearance = None
     hypothetical_position = box.position_y + collapsed_margin
-    # Hypothetical position is the position of the top border edge
     for excluded_shape in context.excluded_shapes:
         if box.style['clear'] in (excluded_shape.style['float'], 'both'):
             y, h = excluded_shape.position_y, excluded_shape.margin_height()