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

weasyprint/layout/__init__.py

@@ -229,24 +229,22 @@ class LayoutContext:
         self.font_config = font_config
         self.counter_style = counter_style
         self.target_collector = target_collector
-        self._excluded_shapes_lists = []
+        self._excluded_shapes_root_boxes = []
+        self._excluded_shapes = {}
         self.footnotes = []
         self.page_footnotes = {}
         self.current_page_footnotes = []
         self.reported_footnotes = []
         self.current_footnote_area = None  # Not initialized yet
-        self.excluded_shapes = None  # Not initialized yet
         self.page_bottom = None
-        self.string_set = defaultdict(lambda: defaultdict(lambda: []))
-        self.running_elements = defaultdict(lambda: defaultdict(lambda: []))
+        self.string_set = defaultdict(lambda: defaultdict(list))
+        self.running_elements = defaultdict(lambda: defaultdict(list))
         self.current_page = None
         self.forced_break = False
         self.broken_out_of_flow = {}
         self.in_column = False
 
         # Cache
-        self.strut_layouts = {}
-        self.font_features = {}
         self.tables = {}
         self.dictionaries = {}
 
@@ -259,34 +257,39 @@ class LayoutContext:
         # The 1e-9 value comes from PEP 485.
         return position_y > bottom * (1 + 1e-9)
 
-    def create_block_formatting_context(self):
-        self.excluded_shapes = []
-        self._excluded_shapes_lists.append(self.excluded_shapes)
+    @property
+    def excluded_shapes(self):
+        return self._excluded_shapes[self._excluded_shapes_root_boxes[-1]]
 
-    def finish_block_formatting_context(self, root_box):
+    @excluded_shapes.setter
+    def excluded_shapes(self, excluded_shapes):
+        self._excluded_shapes[self._excluded_shapes_root_boxes[-1]] = excluded_shapes
+
+    def create_block_formatting_context(self, root_box=None, new_list=None):
+        assert root_box not in self._excluded_shapes_root_boxes
+        self._excluded_shapes_root_boxes.append(root_box)
+        if root_box not in self._excluded_shapes:
+            self._excluded_shapes[root_box] = [] if new_list is None else new_list
+
+    def finish_block_formatting_context(self, root_box=None):
         # See https://www.w3.org/TR/CSS2/visudet.html#root-height
-        if root_box.style['height'] == 'auto' and self.excluded_shapes:
+        if root_box and root_box.style['height'] == 'auto' and self.excluded_shapes:
             box_bottom = root_box.content_box_y() + root_box.height
             max_shape_bottom = max([
                 shape.position_y + shape.margin_height()
                 for shape in self.excluded_shapes] + [box_bottom])
             root_box.height += max_shape_bottom - box_bottom
-        self._excluded_shapes_lists.pop()
-        if self._excluded_shapes_lists:
-            self.excluded_shapes = self._excluded_shapes_lists[-1]
-        else:
-            self.excluded_shapes = None
+        self._excluded_shapes.pop(self._excluded_shapes_root_boxes.pop())
 
-    def create_flex_formatting_context(self):
-        self.excluded_shapes = FakeList()
-        self._excluded_shapes_lists.append(self.excluded_shapes)
+    def create_flex_formatting_context(self, root_box):
+        self.create_block_formatting_context(root_box, FakeList())
 
     def finish_flex_formatting_context(self, root_box):
-        self._excluded_shapes_lists.pop()
-        if self._excluded_shapes_lists:
-            self.excluded_shapes = self._excluded_shapes_lists[-1]
-        else:
-            self.excluded_shapes = None
+        self.finish_block_formatting_context(root_box)
+
+    def add_broken_out_of_flow(self, new_box, box, containing_block, resume_at):
+        self.broken_out_of_flow[new_box] = (
+            box, containing_block, self._excluded_shapes_root_boxes[-1], resume_at)
 
     def get_string_set_for(self, page, name, keyword='first'):
         """Resolve value of string function."""
@@ -389,10 +392,13 @@ class LayoutContext:
             if not self.in_column:
                 self.page_bottom -= footnote_area.margin_height()
             last_child = footnote_area.children[-1]
-            overflow = (
-                last_child.position_y + last_child.margin_height() >
+            last_child_bottom = (
+                last_child.position_y + last_child.margin_height() -
+                last_child.margin_bottom)
+            footnote_area_bottom = (
                 footnote_area.position_y + footnote_area.margin_height() -
                 footnote_area.margin_bottom)
+            overflow = last_child_bottom > footnote_area_bottom
             return overflow
         else:
             self.current_footnote_area.height = 0

weasyprint/layout/absolute.py

@@ -67,7 +67,9 @@ def absolute_width(box, context, cb_x, cb_y, cb_width, cb_height):
         available_width = cb_width - (
             paddings_borders + box.margin_left + box.margin_right)
         box.width = shrink_to_fit(context, box, available_width)
-        if not ltr:
+        if box.is_outside_marker:
+            translate_box_width = ltr
+        elif not ltr:
             translate_box_width = True
             translate_x = default_translate_x + available_width
     elif box.left != 'auto' and box.right != 'auto' and box.width != 'auto':
@@ -200,7 +202,8 @@ def absolute_block(context, box, containing_block, fixed_boxes, bottom_space,
         new_box, resume_at, _, _, _, _ = block_container_layout(
             context, box, bottom_space, skip_stack, page_is_empty=True,
             absolute_boxes=absolute_boxes, fixed_boxes=fixed_boxes,
-            adjoining_margins=None, discard=False, max_lines=None)
+            adjoining_margins=None, first_letter_style=None, first_line_style=None,
+            discard=False, max_lines=None)
     elif isinstance(box, (boxes.FlexContainerBox)):
         new_box, resume_at, _, _, _ = flex_layout(
             context, box, bottom_space, skip_stack, containing_block,
@@ -235,8 +238,7 @@ def absolute_layout(context, placeholder, containing_block, fixed_boxes,
         context, box, containing_block, fixed_boxes, bottom_space, skip_stack)
     placeholder.set_laid_out_box(new_box)
     if resume_at:
-        context.broken_out_of_flow[placeholder] = (
-            box, containing_block, resume_at)
+        context.add_broken_out_of_flow(placeholder, box, containing_block, resume_at)
 
 
 def absolute_box_layout(context, box, containing_block, fixed_boxes,
@@ -257,7 +259,6 @@ def absolute_box_layout(context, box, containing_block, fixed_boxes,
     resolve_percentages(box, (cb_width, cb_height))
     resolve_position_percentages(box, (cb_width, cb_height))
 
-    context.create_block_formatting_context()
     if isinstance(box, boxes.BlockReplacedBox):
         new_box = absolute_replaced(
             context, box, cb_x, cb_y, cb_width, cb_height)
@@ -267,7 +268,7 @@ def absolute_box_layout(context, box, containing_block, fixed_boxes,
         new_box, resume_at = absolute_block(
             context, box, containing_block, fixed_boxes, bottom_space,
             skip_stack, cb_x, cb_y, cb_width, cb_height)
-    context.finish_block_formatting_context(new_box)
+
     return new_box, resume_at
 
 

weasyprint/layout/background.py

@@ -3,13 +3,13 @@
 from collections import namedtuple
 from itertools import cycle
 
-from tinycss2.color4 import parse_color
+from tinycss2.color5 import parse_color
 
 from ..formatting_structure import boxes
 from . import replaced
 from .percent import percentage, resolve_radii_percentages
 
-Background = namedtuple('Background', 'color, layers, image_rendering')
+Background = namedtuple('Background', 'color, layers, style')
 BackgroundLayer = namedtuple(
     'BackgroundLayer',
     'image, size, position, repeat, unbounded, '
@@ -88,7 +88,7 @@ def layout_box_backgrounds(page, box, get_image_from_uri, layout_children=True,
             style['background_origin'],
             style['background_position'],
             style['background_attachment']]))]
-    box.background = Background(color, layers, style['image_rendering'])
+    box.background = Background(color, layers, style)
 
 
 def layout_background_layer(box, page, resolution, image, size, clip, repeat,
@@ -177,15 +177,15 @@ def layout_background_layer(box, page, resolution, image, size, clip, repeat,
         size_width, size_height = size
         image_width, image_height = replaced.default_image_sizing(
             intrinsic_width, intrinsic_height, ratio,
-            percentage(size_width, positioning_width),
-            percentage(size_height, positioning_height),
+            percentage(size_width, box.style, positioning_width),
+            percentage(size_height, box.style, positioning_height),
             positioning_width, positioning_height)
 
     origin_x, position_x, origin_y, position_y = position
     ref_x = positioning_width - image_width
     ref_y = positioning_height - image_height
-    position_x = percentage(position_x, ref_x)
-    position_y = percentage(position_y, ref_y)
+    position_x = percentage(position_x, box.style, ref_x)
+    position_y = percentage(position_y, box.style, ref_y)
     if origin_x == 'right':
         position_x = ref_x - position_x
     if origin_y == 'bottom':