PyPI - weasyprint - Versions diffs - 67.0__py3-none-any.whl → 68.0__py3-none-any.whl - Mend

weasyprint 67.0py3-none-any.whl → 68.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

weasyprint/__init__.py +35 -103
weasyprint/__main__.py +107 -80
weasyprint/css/__init__.py +4 -10
weasyprint/css/functions.py +5 -0
weasyprint/css/html5_ua.css +1 -1
weasyprint/css/tokens.py +4 -1
weasyprint/css/validation/properties.py +4 -4
weasyprint/document.py +4 -64
weasyprint/draw/text.py +4 -2
weasyprint/formatting_structure/boxes.py +4 -1
weasyprint/formatting_structure/build.py +111 -37
weasyprint/images.py +27 -32
weasyprint/layout/__init__.py +2 -1
weasyprint/layout/grid.py +25 -14
weasyprint/layout/page.py +4 -4
weasyprint/layout/preferred.py +35 -2
weasyprint/pdf/__init__.py +12 -1
weasyprint/pdf/anchors.py +10 -16
weasyprint/pdf/fonts.py +12 -3
weasyprint/pdf/metadata.py +153 -98
weasyprint/pdf/pdfa.py +1 -3
weasyprint/pdf/pdfua.py +1 -3
weasyprint/pdf/pdfx.py +1 -3
weasyprint/pdf/stream.py +0 -2
weasyprint/svg/__init__.py +51 -30
weasyprint/svg/css.py +21 -4
weasyprint/svg/defs.py +5 -3
weasyprint/text/fonts.py +2 -3
weasyprint/urls.py +272 -96
{weasyprint-67.0.dist-info → weasyprint-68.0.dist-info}/METADATA +2 -1
{weasyprint-67.0.dist-info → weasyprint-68.0.dist-info}/RECORD +34 -34
{weasyprint-67.0.dist-info → weasyprint-68.0.dist-info}/WHEEL +0 -0
{weasyprint-67.0.dist-info → weasyprint-68.0.dist-info}/entry_points.txt +0 -0
{weasyprint-67.0.dist-info → weasyprint-68.0.dist-info}/licenses/LICENSE +0 -0

weasyprint/document.py CHANGED Viewed

@@ -18,7 +18,7 @@ from .layout import LayoutContext, layout_document
 from .logger import PROGRESS_LOGGER
 from .matrix import Matrix
 from .pdf import VARIANTS, generate_pdf
-from .pdf.metadata import generate_rdf_metadata
+from .pdf.metadata import DocumentMetadata
 from .text.fonts import FontConfiguration
@@ -87,64 +87,6 @@ class Page:
             draw_page(self._page_box, stream)
-class DocumentMetadata:
-    """Meta-information belonging to a whole :class:`Document`.
-    New attributes may be added in future versions of WeasyPrint.
-    """
-    def __init__(self, title=None, authors=None, description=None, keywords=None,
-                 generator=None, created=None, modified=None, attachments=None,
-                 lang=None, custom=None, generate_rdf_metadata=generate_rdf_metadata):
-        #: The title of the document, as a string or :obj:`None`.
-        #: Extracted from the ``<title>`` element in HTML
-        #: and written to the ``/Title`` info field in PDF.
-        self.title = title
-        #: The authors of the document, as a list of strings.
-        #: (Defaults to the empty list.)
-        #: Extracted from the ``<meta name=author>`` elements in HTML
-        #: and written to the ``/Author`` info field in PDF.
-        self.authors = authors or []
-        #: The description of the document, as a string or :obj:`None`.
-        #: Extracted from the ``<meta name=description>`` element in HTML
-        #: and written to the ``/Subject`` info field in PDF.
-        self.description = description
-        #: Keywords associated with the document, as a list of strings.
-        #: (Defaults to the empty list.)
-        #: Extracted from ``<meta name=keywords>`` elements in HTML
-        #: and written to the ``/Keywords`` info field in PDF.
-        self.keywords = keywords or []
-        #: The name of one of the software packages
-        #: used to generate the document, as a string or :obj:`None`.
-        #: Extracted from the ``<meta name=generator>`` element in HTML
-        #: and written to the ``/Creator`` info field in PDF.
-        self.generator = generator
-        #: The creation date of the document, as a string or :obj:`None`.
-        #: Dates are in one of the six formats specified in
-        #: `W3C’s profile of ISO 8601 <https://www.w3.org/TR/NOTE-datetime>`_.
-        #: Extracted from the ``<meta name=dcterms.created>`` element in HTML
-        #: and written to the ``/CreationDate`` info field in PDF.
-        self.created = created
-        #: The modification date of the document, as a string or :obj:`None`.
-        #: Dates are in one of the six formats specified in
-        #: `W3C’s profile of ISO 8601 <https://www.w3.org/TR/NOTE-datetime>`_.
-        #: Extracted from the ``<meta name=dcterms.modified>`` element in HTML
-        #: and written to the ``/ModDate`` info field in PDF.
-        self.modified = modified
-        #: A list of :class:`attachments <weasyprint.Attachment>`, empty by default.
-        #: Extracted from the ``<link rel=attachment>`` elements in HTML
-        #: and written to the ``/EmbeddedFiles`` dictionary in PDF.
-        self.attachments = attachments or []
-        #: Document language as BCP 47 language tags.
-        #: Extracted from ``<html lang=lang>`` in HTML.
-        self.lang = lang
-        #: Custom metadata, as a dict whose keys are the metadata names and
-        #: values are the metadata values.
-        self.custom = custom or {}
-        #: Custom RDF metadata generator, which will replace the default generator.
-        #: The function should return bytes containing an RDF XML.
-        self.generate_rdf_metadata = generate_rdf_metadata
 class DiskCache:
     """Dict-like storing images content on disk.
@@ -197,8 +139,8 @@ class Document:
     Typically obtained from :meth:`HTML.render() <weasyprint.HTML.render>`, but
     can also be instantiated directly with a list of :class:`pages <Page>`, a
-    set of :class:`metadata <DocumentMetadata>`, a :func:`url_fetcher
-    <weasyprint.default_url_fetcher>` function, and a :class:`font_config
+    set of :class:`metadata <DocumentMetadata>`, a :class:`url_fetcher
+    <weasyprint.urls.URLFetcher>`, and a :class:`font_config
     <weasyprint.text.fonts.FontConfiguration>`.
     """
@@ -269,9 +211,7 @@ class Document:
         #: Contains information that does not belong to a specific page
         #: but to the whole document.
         self.metadata = metadata
-        #: A function or other callable with the same signature as
-        #: :func:`weasyprint.default_url_fetcher` called to fetch external
-        #: resources such as stylesheets and images. (See :ref:`URL Fetchers`.)
+        #: A :class:`weasyprint.urls.URLFetcher` object (see :ref:`URL Fetchers`.)
         self.url_fetcher = url_fetcher
         #: A :obj:`dict` of fonts used by the document. Keys are hashes used to
         #: identify fonts, values are ``Font`` objects.

weasyprint/draw/text.py CHANGED Viewed

@@ -254,8 +254,10 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, matrix):
                         tree.append(defs)
                         ElementTree.SubElement(
                             tree, 'use', attrib={'href': f'#glyph{glyph_id}'})
-                    image = SVGImage(tree, None, None, stream)
-                    a = d = logical_width / 1000 / font.upem * font_size
+                    if 'viewBox' not in tree.attrib:
+                        tree.attrib['viewBox'] = f'0 0 {font.upem} {font.upem}'
+                    image = SVGImage(tree, None, None, None)
+                    a = d = 1
                     emojis.append([image, font, a, d, x_advance, 0])
             elif font.png:
                 png_data = get_hb_object_data(font.hb_font, 'png', glyph_id)

weasyprint/formatting_structure/boxes.py CHANGED Viewed

@@ -815,7 +815,10 @@ class InlineFlexBox(FlexContainerBox, InlineLevelBox):
 class GridContainerBox(ParentBox):
     """A box that contains only grid-items."""
-    advancements = None
+    def __init__(self, element_tag, style, element, children):
+        super().__init__(element_tag, style, element, children)
+        # TODO: we shouldn’t store this in the box but in the rendering context instead.
+        self.advancements = {}
 class GridBox(GridContainerBox, BlockLevelBox):

weasyprint/formatting_structure/build.py CHANGED Viewed

@@ -84,6 +84,8 @@ def build_formatting_structure(element_tree, style_for, get_image_from_uri,
             target_collector, counter_style, footnotes)
     target_collector.check_pending_targets()
+    process_whitespace(box)
+    process_text_transform(box)
     box.is_for_root_element = True
     # If this is changed, maybe update weasy.layout.page.make_margin_boxes()
@@ -152,9 +154,10 @@ def element_to_box(element, style_for, get_image_from_uri, base_url,
             [0],  # quote_depth: single integer
             # TODO: define the footnote counter where it can be updated by page
             {'footnote': [0]},  # counter_values: name -> stacked/scoped values
-            [{'footnote'}]  # counter_scopes: element depths -> counter names
+            [{'footnote'}],  # counter_scopes: element depths -> counter names
+            [] # page_groups
         )
-    quote_depth, counter_values, counter_scopes = state
+    quote_depth, counter_values, counter_scopes, _page_groups = state
     update_counters(state, style)
@@ -224,10 +227,8 @@ def element_to_box(element, style_for, get_image_from_uri, base_url,
             counter_values.pop(name)
     box.children = children
-    process_whitespace(box)
     set_content_lists(
         element, box, style, counter_values, target_collector, counter_style)
-    process_text_transform(box)
     if marker_boxes and len(box.children) == 1:
         # See https://www.w3.org/TR/css-lists-3/#list-style-position-outside
@@ -278,7 +279,7 @@ def before_after_to_box(element, pseudo_type, state, style_for,
         return []
     box = make_box(f'{element.tag}::{pseudo_type}', style, [], element)
-    quote_depth, counter_values, _counter_scopes = state
+    quote_depth, counter_values, _counter_scopes, _page_groups = state
     update_counters(state, style)
     children = []
@@ -297,7 +298,7 @@ def before_after_to_box(element, pseudo_type, state, style_for,
     # calculate the bookmark-label
     if style['bookmark_level'] != 'none':
-        _quote_depth, counter_values, _counter_scopes = state
+        _quote_depth, counter_values, _counter_scopes, _page_groups = state
         compute_bookmark_label(
             element, box, style['bookmark_label'], counter_values,
             target_collector, counter_style)
@@ -318,7 +319,7 @@ def marker_to_box(element, state, parent_style, style_for, get_image_from_uri,
     # TODO: should be the computed value. When does the used value for
     # `display` differ from the computer value? It's at least wrong for
     # `content` where 'normal' computes as 'inhibit' for pseudo elements.
-    quote_depth, counter_values, _counter_scopes = state
+    quote_depth, counter_values, _counter_scopes, _page_groups = state
     box = make_box(f'{element.tag}::marker', style, children, element)
@@ -423,9 +424,7 @@ def compute_content_list(content_list, parent_box, counter_values, css_token,
                     boxes.InlineReplacedBox.anonymous_from(parent_box, image))
         elif type_ == 'content()':
             added_text = extract_text(value, parent_box)
-            # Simulate the step of white space processing
-            # (normally done during the layout).
-            add_text(added_text.strip())
+            add_text(added_text)
         elif type_ == 'string()':
             if not in_page_context:
                 # string() is currently only valid in @page context.
@@ -491,9 +490,7 @@ def compute_content_list(content_list, parent_box, counter_values, css_token,
                 # TODO: 'before'- and 'after'- content referring missing
                 # counters are not properly set.
                 text = extract_text(text_style, target_box)
-                # Simulate the step of white space processing
-                # (normally done during the layout)
-                add_text(text.strip())
+                add_text(text)
             else:
                 break
         elif type_ == 'quote' and None not in (quote_depth, quote_style):
@@ -598,7 +595,6 @@ def compute_string_set(element, box, string_name, content_list,
     """Parse the content-list value of ``string_name`` for ``string-set``."""
     def parse_again(mixin_pagebased_counters=None):
         """Closure to parse the string-set string value all again."""
         # Neither alters the mixed-in nor the cached counter values, no
         # need to deepcopy here
         if mixin_pagebased_counters is None:
@@ -606,7 +602,6 @@ def compute_string_set(element, box, string_name, content_list,
         else:
             local_counters = mixin_pagebased_counters.copy()
         local_counters.update(box.cached_counter_values)
         compute_string_set(
             element, box, string_name, content_list, local_counters,
             target_collector, counter_style)
@@ -630,7 +625,7 @@ def compute_string_set(element, box, string_name, content_list,
 def compute_bookmark_label(element, box, content_list, counter_values,
                            target_collector, counter_style):
     """Parses the content-list value for ``bookmark-label``."""
-    def parse_again(mixin_pagebased_counters={}):
+    def parse_again(mixin_pagebased_counters=None):
         """Closure to parse the bookmark-label all again."""
         # Neither alters the mixed-in nor the cached counter values, no
         # need to deepcopy here
@@ -638,7 +633,6 @@ def compute_bookmark_label(element, box, content_list, counter_values,
             local_counters = {}
         else:
             local_counters = mixin_pagebased_counters.copy()
-        local_counters = mixin_pagebased_counters.copy()
         local_counters.update(box.cached_counter_values)
         compute_bookmark_label(
             element, box, content_list, local_counters, target_collector,
@@ -662,7 +656,7 @@ def set_content_lists(element, box, style, counter_values, target_collector,
     """
     box.string_set = []
     if style['string_set'] != 'none':
-        for i, (string_name, string_values) in enumerate(style['string_set']):
+        for string_name, string_values in style['string_set']:
             compute_string_set(
                 element, box, string_name, string_values, counter_values,
                 target_collector, counter_style)
@@ -674,7 +668,7 @@ def set_content_lists(element, box, style, counter_values, target_collector,
 def update_counters(state, style):
     """Handle the ``counter-*`` properties."""
-    _quote_depth, counter_values, counter_scopes = state
+    _quote_depth, counter_values, counter_scopes, _page_groups = state
     sibling_scopes = counter_scopes[-1]
     for name, value in style['counter_reset']:
@@ -1113,45 +1107,120 @@ def process_whitespace(box, following_collapsible_space=False):
     else:
         for child in box.children:
+            child_collapsible_space = process_whitespace(
+                child, following_collapsible_space)
             if isinstance(child, (boxes.TextBox, boxes.InlineBox)):
-                child_collapsible_space = process_whitespace(
-                    child, following_collapsible_space)
-                if box.is_in_normal_flow() and child.is_in_normal_flow():
-                    following_collapsible_space = child_collapsible_space
+                following_collapsible_space = child_collapsible_space
             elif child.is_in_normal_flow():
                 following_collapsible_space = False
-    return following_collapsible_space and not box.is_running()
+    return following_collapsible_space
 def process_text_transform(box):
+    # Rules defined in
+    # https://www.unicode.org/versions/latest/core-spec/chapter-3/#G33992
+    # https://www.unicode.org/Public/UCD/latest/ucd/SpecialCasing.txt
+    # https://w3c.github.io/i18n-tests/results/text-transform
+    # Common transformations should be handled by common algorithm in Python, special
+    # casing and tailoring shoud be done here when it depends on the language and not on
+    # only on the glyphs.
     if isinstance(box, boxes.TextBox):
         text_transform = box.style['text_transform']
+        lang_code = (box.style['lang'] or '').split('-')[0].lower()
         if text_transform != 'none':
             box.text = {
-                'uppercase': lambda text: text.upper(),
-                'lowercase': lambda text: text.lower(),
+                'uppercase': uppercase,
+                'lowercase': lowercase,
                 'capitalize': capitalize,
-                'full-width': lambda text: text.translate(ASCII_TO_WIDE),
-            }[text_transform](box.text)
+                'full-width': lambda text, lang_code: text.translate(ASCII_TO_WIDE),
+            }[text_transform](box.text, lang_code)
         if box.style['hyphens'] == 'none':
             box.text = box.text.replace('\u00AD', '')  # U+00AD is soft hyphen
     elif not box.is_running():
         for child in box.children:
-            if isinstance(child, (boxes.TextBox, boxes.InlineBox)):
-                process_text_transform(child)
-def capitalize(text):
+            process_text_transform(child)
+def uppercase(text, lang_code):
+    mapper = {}
+    if lang_code == 'el':
+        # https://w3c.github.io/i18n-tests/css-text/text-transform/
+        #   text-transform-tailoring-003.html
+        # https://en.wikiversity.org/wiki/Greek_Language/Diphthongs
+        mapper = {
+            'άι': 'ΑΪ',
+            'άυ': 'ΑΫ',
+            'όι': 'ΟΪ',
+            'όυ': 'ΟΫ',
+            'έυ': 'ΗΫ',
+        }
+    elif lang_code in ('tr', 'az'):
+        # https://github.com/unicode-org/cldr/blob/main/common/transforms/tr-Upper.xml
+        mapper = {
+            'i': 'İ',
+        }
+    for key, value in mapper.items():
+        text = text.replace(key, value)
+    if lang_code == 'el':
+        # Remove diacritics in Greek.
+        # https://github.com/unicode-org/cldr/blob/main/common/transforms/el-Upper.xml
+        # TODO: we should keep tonos on disjunctive eta.
+        # https://w3c.github.io/i18n-tests/css-text/text-transform/
+        #   text-transform-tailoring-005.html
+        text = unicodedata.normalize('NFD', text)
+        for char in '\u0313\u0314\u0301\u0300\u0306\u0342\u0304\u0345':
+            text = text.replace(char, '')
+        text = unicodedata.normalize('NFC', text)
+    return text.upper()
+def lowercase(text, lang_code):
+    mapper = {}
+    if lang_code in ('tr', 'az'):
+        # https://github.com/unicode-org/cldr/blob/main/common/transforms/tr-Lower.xml
+        mapper = {
+            'I': 'ı',
+            'İ': 'i',
+        }
+    elif lang_code == 'lt':
+        # https://github.com/unicode-org/cldr/blob/main/common/transforms/lt-Lower.xml
+        mapper = {
+            'Ì': 'i̇̀',
+            'Í': 'i̇́',
+            'Ĩ': 'i̇̃',
+        }
+    for key, value in mapper.items():
+        text = text.replace(key, value)
+    return text.lower()
+def capitalize(text, lang_code):
     """Capitalize words according to CSS’s "text-transform: capitalize"."""
     letter_found = False
+    skip_next_letter = False
     output = ''
-    for letter in text:
+    for i, letter in enumerate(text):
+        if skip_next_letter:
+            skip_next_letter = False
+            continue
         category = unicodedata.category(letter)[0]
         if not letter_found and category in ('L', 'N'):
             letter_found = True
-            letter = letter.upper()
+            if lang_code == 'nl' and text[i:i+2] == 'ij':
+                skip_next_letter = True
+                letter = 'IJ'
+            elif lang_code in ('tr', 'az'):
+                letter = uppercase(letter, lang_code)
+            else:
+                letter = letter.upper()
         elif category == 'Z':
             letter_found = False
         output += letter
@@ -1448,15 +1517,20 @@ def set_viewport_overflow(root_box):
 def box_text(box):
+    # Stripping may not be the "right" way, but it seems to be what users usually want
+    # in this case. The specification asks for the "text content", probably as defined
+    # in DOM.
+    box = box.deepcopy()
+    process_whitespace(box)
     if isinstance(box, boxes.TextBox):
-        return box.text
+        return box.text.strip()
     elif isinstance(box, boxes.ParentBox):
         return ''.join(
             child.text for child in box.descendants()
             if not child.element_tag.endswith('::before') and
             not child.element_tag.endswith('::after') and
             not child.element_tag.endswith('::marker') and
-            isinstance(child, boxes.TextBox))
+            isinstance(child, boxes.TextBox)).strip()
     return ''

weasyprint/images.py CHANGED Viewed

@@ -30,12 +30,6 @@ class ImageLoadingError(ValueError):
     """
-    @classmethod
-    def from_exception(cls, exception):
-        name = type(exception).__name__
-        value = str(exception)
-        return cls(f'{name}: {value}' if value else name)
 class RasterImage:
     def __init__(self, pillow_image, image_id, image_data, filename=None,
@@ -257,7 +251,7 @@ class LazyLocalImage(pydyf.Object):
 class SVGImage:
     def __init__(self, tree, base_url, url_fetcher, context):
         font_config = context.font_config if context else None
-        self._svg = SVG(tree, base_url, font_config)
+        self._svg = SVG(tree, base_url, font_config, url_fetcher)
         self._base_url = base_url
         self._url_fetcher = url_fetcher
         self._context = context
@@ -284,7 +278,7 @@ class SVGImage:
         try:
             self._svg.draw(
                 stream, concrete_width, concrete_height, self._base_url,
-                self._url_fetcher, self._context)
+                self._context)
         except BaseException as exception:
             LOGGER.error('Failed to render SVG image %s', self._base_url)
             LOGGER.debug('Error while rendering SVG image:', exc_info=exception)
@@ -297,43 +291,40 @@ def get_image_from_uri(cache, url_fetcher, options, url, forced_mime_type=None,
         return cache[url]
     try:
-        with fetch(url_fetcher, url) as result:
-            if 'string' in result:
-                string = result['string']
-            else:
-                string = result['file_obj'].read()
-            mime_type = forced_mime_type or result['mime_type']
+        with fetch(url_fetcher, url) as response:
+            bytestring = response.read()
+            mime_type = forced_mime_type or response.content_type
         image = None
         svg_exceptions = []
         # Try to rely on given mimetype for SVG
         if mime_type == 'image/svg+xml':
             try:
-                tree = ElementTree.fromstring(string)
+                tree = ElementTree.fromstring(bytestring)
                 image = SVGImage(tree, url, url_fetcher, context)
             except Exception as svg_exception:
                 svg_exceptions.append(svg_exception)
         # Try pillow for raster images, or for failing SVG
         if image is None:
             try:
-                pillow_image = Image.open(BytesIO(string))
+                pillow_image = Image.open(BytesIO(bytestring))
             except Exception as raster_exception:
                 if mime_type == 'image/svg+xml':
                     # Tried SVGImage then Pillow for a SVG, abort
-                    raise ImageLoadingError.from_exception(svg_exceptions[0])
+                    raise ImageLoadingError from svg_exceptions[0]
                 try:
                     # Last chance, try SVG
-                    tree = ElementTree.fromstring(string)
+                    tree = ElementTree.fromstring(bytestring)
                     image = SVGImage(tree, url, url_fetcher, context)
                 except Exception:
                     # Tried Pillow then SVGImage for a raster, abort
-                    raise ImageLoadingError.from_exception(raster_exception)
+                    raise ImageLoadingError from raster_exception
             else:
                 # Store image id to enable cache in Stream.add_image
                 image_id = md5(url.encode(), usedforsecurity=False).hexdigest()
-                path = result.get('path')
                 image = RasterImage(
-                    pillow_image, image_id, string, path, cache, orientation, options)
+                    pillow_image, image_id, bytestring, response.path, cache,
+                    orientation, options)
     except (URLFetchingError, ImageLoadingError) as exception:
         LOGGER.error('Failed to load image at %r: %s', url, exception)
@@ -655,7 +646,7 @@ class LinearGradient(Gradient):
                 positions.append(positions[-1] + step)
                 last += step * stop_length
-            # Add colors before last step
+            # Add colors before first step
             while first > 0:
                 step = next(previous_steps)
                 colors.insert(0, next(previous_colors))
@@ -764,14 +755,15 @@ class RadialGradient(Gradient):
             center_x, center_y / scale_y, last)
         if self.repeating:
-            points, positions, colors = self._repeat(
-                width, height, scale_y, points, positions, colors)
+            points, positions, colors, hints = self._repeat(
+                width, height, scale_y, points, positions, colors, hints)
         return scale_y, 'radial', points, positions, colors, hints
-    def _repeat(self, width, height, scale_y, points, positions, colors):
+    def _repeat(self, width, height, scale_y, points, positions, colors, hints):
         # Keep original lists and values, they’re useful
         original_colors = colors.copy()
+        original_hints = hints.copy()
         original_positions = positions.copy()
         gradient_length = points[5] - points[2]
@@ -787,13 +779,14 @@ class RadialGradient(Gradient):
             # Repeat colors and extrapolate positions
             repeat = 1 + repeat_after
             colors *= repeat
+            hints = ([*hints, 1] * repeat)[:-1]
             positions = [
                 i + position for i in range(repeat) for position in positions]
             points = (*points[:5], points[5] + gradient_length * repeat_after)
         if points[2] == 0:
             # Inner circle has 0 radius, no need to repeat inside, return
-            return points, positions, colors
+            return points, positions, colors, hints
         # Find how many times we have to repeat the colors inside
         repeat_before = points[2] / gradient_length
@@ -806,6 +799,7 @@ class RadialGradient(Gradient):
         if full_repeat:
             # Repeat colors and extrapolate positions
             colors += original_colors * full_repeat
+            hints += [1, *original_hints] * full_repeat
             positions = [
                 i - full_repeat + position for i in range(full_repeat)
                 for position in original_positions] + positions
@@ -814,7 +808,7 @@ class RadialGradient(Gradient):
         partial_repeat = repeat_before - full_repeat
         if partial_repeat == 0:
             # No partial repeat, return
-            return points, positions, colors
+            return points, positions, colors, hints
         # Iterate through positions in reverse order, from the outer
         # circle to the original inner circle, to find positions from
@@ -828,11 +822,12 @@ class RadialGradient(Gradient):
                 # The center is a color of the gradient, truncate original
                 # colors and positions and prepend them
                 colors = original_colors[-i:] + colors
+                hints = [*original_hints[-i:], 1, *hints]
                 new_positions = [
                     position - full_repeat - 1
                     for position in original_positions[-i:]]
                 positions = new_positions + positions
-                return points, positions, colors
+                return points, positions, colors, hints
             if position < ratio:
                 # The center is between two colors of the gradient,
                 # define the center color as the average of these two
@@ -842,14 +837,14 @@ class RadialGradient(Gradient):
                 next_position = original_positions[-(i - 1)]
                 average_colors = [color, color, next_color, next_color]
                 average_positions = [position, ratio, ratio, next_position]
-                zero_color = gradient_average_color(
-                    average_colors, average_positions)
-                colors = [zero_color, *original_colors[-(i - 1):], *colors]
+                zero_color = gradient_average_color(average_colors, average_positions)
+                colors = [zero_color, *original_colors[-(i-1):], *colors]
+                hints = [1, *original_hints[-(i-1):], 1, *hints]
                 new_positions = [
                     position - 1 - full_repeat for position
                     in original_positions[-(i - 1):]]
                 positions = (ratio - 1 - full_repeat, *new_positions, *positions)
-                return points, positions, colors
+                return points, positions, colors, hints
     def _resolve_size(self, width, height, center_x, center_y, style):
         """Resolve circle size of the radial gradient."""

weasyprint/layout/__init__.py CHANGED Viewed

@@ -60,7 +60,8 @@ def initialize_page_maker(context, root_box):
         # Shared mutable objects:
         [0],  # quote_depth: single integer
         {'pages': [0]},
-        [{'pages'}]  # counter_scopes
+        [{'pages'}],  # counter_scopes
+        [] # page_groups
     )
     # Initial values

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

weasyprint 67.0py3-none-any.whl → 68.0py3-none-any.whl