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

weasyprint/css/html5_ua_form.css

@@ -1,15 +1,5 @@
 /* Default stylesheet for PDF forms */
 
-button, input, select, textarea {
-  appearance: auto;
-}
-
-select option,
-select:not([multiple])::before,
-input:not([type="submit"])::before {
-  visibility: hidden;
-}
-
-textarea {
-  color: transparent;
-}
+button, input, select, textarea { appearance: auto }
+select option, select:not([multiple])::before, input:not([type="submit"])::before {visibility: hidden }
+textarea { text-indent: 10000% } /* Hide text but don’t change color used by PDF form */

weasyprint/css/validation/descriptors.py

@@ -208,6 +208,15 @@ def font_variant(tokens):
     return values
 
 
+@descriptor('font-face')
+@comma_separated_list
+@single_token
+def unicode_range(token):
+    """``unicode_range`` descriptor validation."""
+    if token.type == 'unicode-range':
+        return token
+
+
 @descriptor('counter-style')
 def system(tokens):
     """``system`` descriptor validation."""

weasyprint/draw/border.py

@@ -419,9 +419,9 @@ def clip_border_segment(stream, style, width, side, border_box,
             else:
                 # 2x - 1/2 dashes
                 dash = length / (dash_length + dash_length % 2 - 0.5)
-            dashes1 = int(ceil((chl1 - dash / 2) / dash))
-            dashes2 = int(ceil((chl2 - dash / 2) / dash))
-            line = int(floor(line_length / dash))
+            dashes1 = ceil((chl1 - dash / 2) / dash)
+            dashes2 = ceil((chl2 - dash / 2) / dash)
+            line = floor(line_length / dash)
 
             def draw_dots(dashes, line, way, x, y, px, py, chl):
                 if not dashes:
@@ -483,7 +483,7 @@ def clip_border_segment(stream, style, width, side, border_box,
             stream.end()
             dash = length / (
                 round(length / dash) - (round(length / dash) + 1) % 2) or 1
-            for i in range(0, int(round(length / dash)), 2):
+            for i in range(0, round(length / dash), 2):
                 if side == 'top':
                     stream.rectangle(bbx + i * dash, bby, dash, width)
                 elif side == 'right':

weasyprint/draw/text.py

@@ -134,7 +134,6 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, matrix):
             first_line, index = textbox.pango_layout.get_first_line()
 
     utf8_text = textbox.pango_layout.text.encode()
-    previous_utf8_position = 0
     stream.set_text_matrix(*matrix.values)
     previous_pango_font = None
     string = ''
@@ -152,8 +151,11 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, matrix):
         clusters = glyph_string.log_clusters
 
         # Get positions of the glyphs in the UTF-8 string.
-        utf8_positions = [offset + clusters[i] for i in range(1, num_glyphs)]
-        utf8_positions.append(offset + glyph_item.item.length)
+        utf8_positions = [offset + clusters[i] for i in range(num_glyphs)]
+        if glyph_item.item.analysis.level % 2:
+            utf8_positions.insert(0, offset + glyph_item.item.length)  # rtl
+        else:
+            utf8_positions.append(offset + glyph_item.item.length)  # ltr
 
         pango_font = glyph_item.item.analysis.font
         if pango_font != previous_pango_font:
@@ -161,6 +163,10 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, matrix):
             previous_pango_font = pango_font
             font, font_size = stream.add_font(pango_font)
 
+            # Workaround for https://gitlab.gnome.org/GNOME/pango/-/issues/530.
+            if pango.pango_version() < 14802:
+                font_size = textbox.style['font_size']
+
             # Go through the run glyphs.
             if string:
                 stream.show_text(string)
@@ -175,7 +181,6 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, matrix):
                     glyph & pango.PANGO_GLYPH_UNKNOWN_FLAG):
                 string += f'>{-width / font_size}<'
                 continue
-            utf8_position = utf8_positions[i]
 
             offset = glyph_info.geometry.x_offset / font_size
             rise = glyph_info.geometry.y_offset / 1000
@@ -202,8 +207,8 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, matrix):
             if glyph not in font.widths:
                 pango.pango_font_get_glyph_extents(
                     pango_font, glyph, stream.ink_rect, stream.logical_rect)
-                font.widths[glyph] = int(round(
-                    stream.logical_rect.width * 1000 * FROM_UNITS / font_size))
+                font.widths[glyph] = round(
+                    stream.logical_rect.width * 1000 * FROM_UNITS / font_size)
 
             # Set kerning, word spacing, letter spacing.
             kerning = int(
@@ -213,9 +218,8 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, matrix):
 
             # Create mapping between glyphs and characters.
             if glyph not in font.cmap:
-                utf8_slice = slice(previous_utf8_position, utf8_position)
+                utf8_slice = slice(*sorted(utf8_positions[i:i+2]))
                 font.cmap[glyph] = utf8_text[utf8_slice].decode()
-            previous_utf8_position = utf8_position
 
             # Create list of emojis.
             if font.svg:

weasyprint/formatting_structure/build.py

@@ -724,9 +724,7 @@ def is_whitespace(box, _has_non_whitespace=re.compile('\\S').search):
 
 
 def wrap_improper(box, children, wrapper_type, test=None):
-    """
-    Wrap consecutive children that do not pass ``test`` in a box of type
-    ``wrapper_type``.
+    """Wrap consecutive children that do not pass ``test`` in a ``wrapper_type`` box.
 
     ``test`` defaults to children being of the same type as ``wrapper_type``.
 
@@ -744,17 +742,7 @@ def wrap_improper(box, children, wrapper_type, test=None):
                 improper = []
             yield child
         else:
-            # Whitespace either fail the test or were removed earlier,
-            # so there is no need to take special care with the definition
-            # of "consecutive".
-            if isinstance(box, boxes.FlexContainerBox):
-                # The display value of a flex item must be "blockified", see
-                # https://www.w3.org/TR/css-flexbox-1/#flex-items
-                # TODO: These blocks are currently ignored, we should
-                # "blockify" them and their children.
-                pass
-            else:
-                improper.append(child)
+            improper.append(child)
     if improper:
         wrapper = wrapper_type.anonymous_from(box, children=[])
         # Apply the rules again on the new wrapper
@@ -1023,6 +1011,7 @@ def flex_children(box, children):
     if isinstance(box, boxes.FlexContainerBox):
         flex_children = []
         for child in children:
+            child.is_floated = lambda: False
             if child.is_in_normal_flow():
                 child.is_flex_item = True
             if isinstance(child, boxes.TextBox) and not child.text.strip(' '):
@@ -1030,8 +1019,14 @@ def flex_children(box, children):
                 # affected by the white-space property"
                 # https://www.w3.org/TR/css-flexbox-1/#flex-items
                 continue
-            if isinstance(child, boxes.InlineLevelBox):
-                anonymous = boxes.BlockBox.anonymous_from(box, [child])
+            if isinstance(child, boxes.InlineBlockBox):
+                anonymous = boxes.BlockBox.anonymous_from(child, child.children)
+                anonymous.style = child.style
+                anonymous.is_flex_item = True
+                flex_children.append(anonymous)
+            elif isinstance(child, boxes.InlineLevelBox):
+                anonymous = boxes.BlockBox.anonymous_from(child, [child])
+                anonymous.style = child.style
                 anonymous.is_flex_item = True
                 flex_children.append(anonymous)
             else:
@@ -1069,7 +1064,12 @@ def grid_children(box, children):
                 # affected by the white-space property"
                 # https://drafts.csswg.org/css-grid-2/#grid-item
                 continue
-            if isinstance(child, boxes.InlineLevelBox):
+            if isinstance(child, boxes.InlineBlockBox):
+                anonymous = boxes.BlockBox.anonymous_from(child, child.children)
+                anonymous.style = child.style
+                anonymous.is_grid_item = True
+                grid_children.append(anonymous)
+            elif isinstance(child, boxes.InlineLevelBox):
                 anonymous = boxes.BlockBox.anonymous_from(child, [child])
                 anonymous.style = child.style
                 child.is_grid_item = False

weasyprint/images.py

@@ -127,8 +127,8 @@ class RasterImage:
             width, height = self.width, self.height
         else:
             thumbnail = Image.open(io.BytesIO(self.image_data.data))
-            width = max(1, int(round(self.width * dpi_ratio)))
-            height = max(1, int(round(self.height * dpi_ratio)))
+            width = max(1, round(self.width * dpi_ratio))
+            height = max(1, round(self.height * dpi_ratio))
             thumbnail.thumbnail((width, height))
             image_file = io.BytesIO()
             thumbnail.save(

weasyprint/layout/__init__.py

@@ -215,6 +215,12 @@ def layout_document(html, root_box, context, max_loops=8):
         yield page
 
 
+class FakeList(list):
+    """List in which you can’t append objects."""
+    def append(self, item):
+        pass
+
+
 class LayoutContext:
     def __init__(self, style_for, get_image_from_uri, font_config,
                  counter_style, target_collector):
@@ -271,6 +277,17 @@ class LayoutContext:
         else:
             self.excluded_shapes = None
 
+    def create_flex_formatting_context(self):
+        self.excluded_shapes = FakeList()
+        self._excluded_shapes_lists.append(self.excluded_shapes)
+
+    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
+
     def get_string_set_for(self, page, name, keyword='first'):
         """Resolve value of string function."""
         return self.get_string_or_element_for(

weasyprint/layout/absolute.py

@@ -205,7 +205,7 @@ def absolute_block(context, box, containing_block, fixed_boxes, bottom_space,
         new_box, resume_at, _, _, _ = flex_layout(
             context, box, bottom_space, skip_stack, containing_block,
             page_is_empty=True, absolute_boxes=absolute_boxes,
-            fixed_boxes=fixed_boxes)
+            fixed_boxes=fixed_boxes, discard=False)
     elif isinstance(box, (boxes.GridContainerBox)):
         new_box, resume_at, _, _, _ = grid_layout(
             context, box, bottom_space, skip_stack, containing_block,

weasyprint/layout/block.py

@@ -10,7 +10,7 @@ from .float import avoid_collisions, float_layout, get_clearance
 from .grid import grid_layout
 from .inline import iter_line_boxes
 from .min_max import handle_min_max_width
-from .percent import resolve_percentages, resolve_position_percentages
+from .percent import percentage, resolve_percentages, resolve_position_percentages
 from .replaced import block_replaced_box_layout
 from .table import table_layout, table_wrapper_width
 
@@ -81,7 +81,7 @@ def block_level_layout_switch(context, box, bottom_space, skip_stack,
     elif isinstance(box, boxes.FlexBox):
         result = flex_layout(
             context, box, bottom_space, skip_stack, containing_block,
-            page_is_empty, absolute_boxes, fixed_boxes)
+            page_is_empty, absolute_boxes, fixed_boxes, discard)
     elif isinstance(box, boxes.GridBox):
         result = grid_layout(
             context, box, bottom_space, skip_stack, containing_block,
@@ -496,11 +496,24 @@ def _in_flow_layout(context, box, index, child, new_children, page_is_empty,
                 adjoining_margins = []
                 position_y = box.content_box_y()
 
-    if adjoining_margins and box.is_table_wrapper:
-        collapsed_margin = collapse_margin(adjoining_margins)
-        child.position_y += collapsed_margin
-        position_y += collapsed_margin
-        adjoining_margins = []
+    # TODO: Merge this with block_container_layout, block_level_layout, _in_flow_layout,
+    # and check code above.
+    if adjoining_margins:
+        if box.is_table_wrapper:  # should not be a special case
+            collapsed_margin = collapse_margin(adjoining_margins)
+            child.position_y += collapsed_margin
+            position_y += collapsed_margin
+            adjoining_margins = []
+        elif not isinstance(child, boxes.BlockBox):  # blocks handle that themselves
+            if child.style['margin_top'] == 'auto':
+                margin_top = 0
+            else:
+                margin_top = percentage(child.style['margin_top'], box.width)
+            adjoining_margins.append(margin_top)
+            offset_y = collapse_margin(adjoining_margins) - margin_top
+            child.position_y += offset_y
+            position_y += offset_y
+            adjoining_margins = []
 
     page_is_empty_with_no_children = page_is_empty and not any(
         child for child in new_children
@@ -515,15 +528,6 @@ def _in_flow_layout(context, box, index, child, new_children, page_is_empty,
          fixed_boxes, adjoining_margins, discard, max_lines)
 
     if new_child is not None:
-        # We need to do this after the child layout to have the
-        # used value for margin_top (eg. it might be a percentage.)
-        if not isinstance(new_child, (boxes.BlockBox, boxes.TableBox)):
-            adjoining_margins.append(new_child.margin_top)
-            offset_y = (
-                collapse_margin(adjoining_margins) - new_child.margin_top)
-            new_child.translate(0, offset_y)
-        # else: blocks handle that themselves.
-
         if not collapsing_through:
             new_content_position_y = (
                 new_child.content_box_y() + new_child.height)
@@ -629,13 +633,12 @@ def block_container_layout(context, box, bottom_space, skip_stack,
                            page_is_empty, absolute_boxes, fixed_boxes,
                            adjoining_margins, discard, max_lines):
     """Set the ``box`` height."""
-    # TODO: boxes.FlexBox is allowed here because flex_layout calls
-    # block_container_layout, there's probably a better solution.
-    assert isinstance(box, (boxes.BlockContainerBox, boxes.FlexBox))
+    assert isinstance(box, boxes.BlockContainerBox)
 
     if box.establishes_formatting_context():
         context.create_block_formatting_context()
 
+    # TODO: merge this with _in_flow_layout, flex_layout…
     is_start = skip_stack is None
     box.remove_decoration(start=not is_start, end=False)
 
@@ -753,7 +756,7 @@ def block_container_layout(context, box, bottom_space, skip_stack,
                 max_lines)
         elif stop:
             if box.height != 'auto':
-                if context.overflows(box.position_y + box.height, position_y):
+                if context.overflows(box.position_y + box.border_height(), position_y):
                     # Box heigh is fixed and it doesn’t overflow page, forget
                     # overflowing children.
                     resume_at = None

weasyprint/layout/column.py

@@ -51,11 +51,10 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
     if width == 'auto' and count != 'auto':
         width = max(0, box.width - (count - 1) * gap) / count
     elif width != 'auto' and count == 'auto':
-        count = max(1, int(floor((box.width + gap) / (width + gap))))
+        count = max(1, floor((box.width + gap) / (width + gap)))
         width = (box.width + gap) / count - gap
     else:  # overconstrained, with width != 'auto' and count != 'auto'
-        count = max(
-            1, min(count, int(floor((box.width + gap) / (width + gap)))))
+        count = max(1, min(count, floor((box.width + gap) / (width + gap))))
         width = (box.width + gap) / count - gap
 
     # Handle column-span property with the following structure: