weasyprint 65.0__tar.gz → 65.1__tar.gz

{weasyprint-65.0 → weasyprint-65.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weasyprint
-Version: 65.0
+Version: 65.1
 Summary: The Awesome Document Factory
 Keywords: html,css,pdf,converter
 Author-email: Simon Sapin <simon.sapin@exyr.org>

{weasyprint-65.0 → weasyprint-65.1}/docs/changelog.rst

@@ -2,6 +2,57 @@ Changelog
 =========
 
 
+Version 65.1
+------------
+
+Released on 2025-04-14.
+
+Bug fixes:
+
+* `#2414 <https://github.com/Kozea/WeasyPrint/issues/2414>`_:
+  Correctly handle flex columns split between pages
+* `1b24ad9 <https://github.com/Kozea/WeasyPrint/commit/1b24ad9>`_:
+  Include padding in outer size of item elements
+* `#2419 <https://github.com/Kozea/WeasyPrint/issues/2419>`_:
+  Set main tag as block by default
+* `#2415 <https://github.com/Kozea/WeasyPrint/issues/2415>`_:
+  Fix support of replaced block box as flex items
+* `83da2fe0 <https://github.com/Kozea/WeasyPrint/commit/83da2fe0>`_:
+  Fix margins and padding for rtl lists
+* `#2429 <https://github.com/Kozea/WeasyPrint/issues/2429>`_,
+  `#1076 <https://github.com/Kozea/WeasyPrint/issues/1076>`_,
+  `#2431 <https://github.com/Kozea/WeasyPrint/pull/2431>`_:
+  Fix page groups
+
+Contributors:
+
+* Guillaume Ayoub
+
+Backers and sponsors:
+
+* Spacinov
+* Kobalt
+* Grip Angebotssoftware
+* Syslifters
+* Simon Sapin
+* Manuel Barkhau
+* Simonsoft
+* Menutech
+* KontextWork
+* TrainingSparkle
+* Healthchecks.io
+* Hammerbacher
+* DocRaptor
+* Yanal-Yves Fargialla
+* Method B
+* FieldHub
+* Morntag
+* Xavid
+* Kai DeLorenzo
+* Charlie S.
+* Alan Villalobos
+
+
 Version 65.0
 ------------
 

{weasyprint-65.0 → weasyprint-65.1}/tests/layout/test_flex.py

@@ -1753,3 +1753,81 @@ def test_flex_collapsing_margin():
     assert p.height == 100
     assert article.position_y == 110
     assert div.position_y == 120
+
+
+@assert_no_logs
+def test_flex_direction_column_next_page():
+    # Regression test for issue #2414.
+    page1, page2 = render_pages('''
+      <style>
+        @page { size: 4px 5px }
+        html { font: 2px/1 weasyprint }
+      </style>
+      <div>1</div>
+      <article style="display: flex; flex-direction: column">
+        <div>A</div>
+        <div>B</div>
+        <div>C</div>
+      </article>
+    ''')
+    html, = page1.children
+    body, = html.children
+    div, article = body.children
+    assert div.children[0].children[0].text == '1'
+    assert div.children[0].children[0].position_y == 0
+    assert article.children[0].children[0].children[0].text == 'A'
+    assert article.children[0].children[0].children[0].position_y == 2
+    html, = page2.children
+    body, = html.children
+    article, = body.children
+    assert article.children[0].children[0].children[0].text == 'B'
+    assert article.children[0].children[0].children[0].position_y == 0
+    assert article.children[1].children[0].children[0].text == 'C'
+    assert article.children[1].children[0].children[0].position_y == 2
+
+
+@assert_no_logs
+def test_flex_1_item_padding():
+    page, = render_pages('''
+      <article style="display: flex; width: 100px; font: 2px weasyprint">
+        <div>abc</div>
+        <div style="flex: 1; padding-right: 5em">def</div>
+      </article>
+    ''')
+    html, = page.children
+    body, = html.children
+    article, = body.children
+    div1, div2 = article.children
+    assert div1.border_width() + div2.border_width() == article.width
+
+
+@assert_no_logs
+def test_flex_1_item_padding_direction_column():
+    page, = render_pages('''
+      <article style="display: flex; flex-direction: column; height: 100px;
+                      font: 2px weasyprint">
+        <div>abc</div>
+        <div style="flex: 1; padding-top: 5em">def</div>
+      </article>
+    ''')
+    html, = page.children
+    body, = html.children
+    article, = body.children
+    div1, div2 = article.children
+    assert div1.border_height() + div2.border_height() == article.height
+
+
+@assert_no_logs
+def test_flex_item_replaced():
+    page, = render_pages('''
+      <div style="display: flex">
+        <svg style="display: block" height="100" width="100" xmlns="http://www.w3.org/2000/svg">
+          <circle r="45" cx="50" cy="50" fill="red" />
+        </svg>
+      </div>
+    ''')
+    html, = page.children
+    body, = html.children
+    div, = body.children
+    svg, = div.children
+    assert svg.width == svg.height == 100

{weasyprint-65.0 → weasyprint-65.1}/tests/layout/test_page.py

@@ -969,6 +969,74 @@ def test_page_groups():
     assert section.element_tag == 'section'
 
 
+@assert_no_logs
+def test_page_groups_blank_inside():
+    # Regression test for #1076.
+    pages = render_pages('''
+      <style>
+        @page { size: 100px }
+        @page div { size: 50px }
+        div { page: div }
+        p { break-before: right }
+      </style>
+      <div>
+        <p>1</p>
+        <p>2</p>
+      </div>
+    ''')
+    assert len(pages) == 3
+    for page in pages:
+        assert (page.width, page.height) == (50, 50)
+
+
+@assert_no_logs
+def test_page_groups_blank_outside():
+    pages = render_pages('''
+      <style>
+        @page { size: 100px }
+        @page p { size: 50px }
+        p { page: p; break-before: right }
+      </style>
+      <div>
+        <p>1</p>
+        <p>2</p>
+      </div>
+    ''')
+    page1, page2, page3 = pages
+    for page in (page1, page3):
+        assert (page.width, page.height) == (50, 50)
+    assert (page2.width, page2.height) == (100, 100)
+
+
+@assert_no_logs
+def test_page_groups_first_nth():
+    # Regression test for #2429.
+    pages = render_pages('''
+      <style>
+        @page { size: 100px }
+        @page div { size: 50px }
+        @page :nth(2n+1 of div) { size: 30px }
+        div { page: div; break-before: right }
+        p { break-before: page }
+      </style>
+      <div>
+        <p>1</p>
+        <p>2</p>
+        <p>3</p>
+      </div>
+      <div>
+        <p>4</p>
+        <p>5</p>
+      </div>
+    ''')
+    page1, page2, page3, page4, page5, page6 = pages
+    for page in (page1, page3, page5):
+        assert (page.width, page.height) == (30, 30)
+    for page in (page2, page6):
+        assert (page.width, page.height) == (50, 50)
+    assert (page4.width, page4.height) == (100, 100)
+
+
 @assert_no_logs
 @pytest.mark.parametrize('style, line_counts', (
     ('orphans: 2; widows: 2', [4, 3]),

{weasyprint-65.0 → weasyprint-65.1}/weasyprint/__init__.py

@@ -15,7 +15,7 @@ import cssselect2
 import tinycss2
 import tinyhtml5
 
-VERSION = __version__ = '65.0'
+VERSION = __version__ = '65.1'
 
 #: Default values for command-line and Python API options. See
 #: :func:`__main__.main` to learn more about specific options for

{weasyprint-65.0 → weasyprint-65.1}/weasyprint/css/html5_ua.css

@@ -20,7 +20,7 @@ a[href] { -weasy-link: attr(href) }
 /* Display and visibility */
 
 [hidden], area, base, basefont, command, datalist, head, input[type=hidden i], link, menu[type=context i], meta, noembed, noframes, param, rp, script, source, style, template, title, track { display: none }
-address, article, aside, blockquote, body, center, dd, details, dir, div, dl, dt, frame, frameset, fieldset, figure, figcaption, footer, form, h1, h2, h3, h4, h5, h6, header, hgroup, hr, html, legend, listing, menu, nav, ol, p, plaintext, pre, section, summary, ul, xmp { display: block }
+address, article, aside, blockquote, body, center, dd, details, dir, div, dl, dt, frame, frameset, fieldset, figure, figcaption, footer, form, h1, h2, h3, h4, h5, h6, header, hgroup, hr, html, legend, listing, main, menu, nav, ol, p, plaintext, pre, section, summary, ul, xmp { display: block }
 button, input, keygen, select, textarea { display: inline-block }
 li { display: list-item }
 table { display: table }
@@ -62,14 +62,18 @@ dd { margin-left: 40px }
 [dir] [dir=rtl i] dd { margin-left: 40px; margin-right: 0 }
 [dir] [dir] [dir=ltr i] dd { margin-left: 0; margin-right: 40px }
 [dir] [dir] [dir=rtl i] dd { margin-left: 40px; margin-right: 0 }
+dd[dir=ltr i][dir][dir] { margin-left: 0; margin-right: 40px }
+dd[dir=rtl i][dir][dir] { margin-left: 40px; margin-right: 0 }
 
 dir, menu, ol, ul { padding-left: 40px }
-[dir=rtl i] :is(dir, menu, ol, ul) { padding-left: 0; padding-right: 40px }
 [dir=ltr i] :is(dir, menu, ol, ul) { padding-left: 40px; padding-right: 0 }
-[dir] [dir=rtl i] :is(dir, menu, ol, ul) { padding-left: 0; padding-right: 40px }
+[dir=rtl i] :is(dir, menu, ol, ul) { padding-left: 0; padding-right: 40px }
 [dir] [dir=ltr i] :is(dir, menu, ol, ul) { padding-left: 40px; padding-right: 0 }
-[dir] [dir] [dir=rtl i] :is(dir, menu, ol, ul) { padding-left: 0; padding-right: 40px }
+[dir] [dir=rtl i] :is(dir, menu, ol, ul) { padding-left: 0; padding-right: 40px }
 [dir] [dir] [dir=ltr i] :is(dir, menu, ol, ul) { padding-left: 40px; padding-right: 0 }
+[dir] [dir] [dir=rtl i] :is(dir, menu, ol, ul) { padding-left: 0; padding-right: 40px }
+:is(dir, menu, ol, ul)[dir=ltr i][dir][dir] { padding-left: 40px; padding-right: 0 }
+:is(dir, menu, ol, ul)[dir=rtl i][dir][dir] { padding-left: 0; padding-right: 40px }
 
 table { border-spacing: 2px; border-collapse: separate }
 td, th { padding: 1px }

{weasyprint-65.0 → weasyprint-65.1}/weasyprint/layout/flex.py

@@ -167,9 +167,9 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             content_size = min_content_width(context, new_child, outer=False)
             transferred_size = None
             if isinstance(child, boxes.ReplacedBox):
-                image = box.replacement
+                image = child.replacement
                 _, intrinsic_height, intrinsic_ratio = image.get_intrinsic_size(
-                    box.style['image_resolution'], box.style['font_size'])
+                    child.style['image_resolution'], child.style['font_size'])
                 if intrinsic_ratio and intrinsic_height:
                     transferred_size = intrinsic_height * intrinsic_ratio
             if specified_size != 'auto':
@@ -195,9 +195,9 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             content_size = new_child.height if new_child else 0
             transferred_size = None
             if isinstance(child, boxes.ReplacedBox):
-                image = box.replacement
+                image = child.replacement
                 intrinsic_width, _, intrinsic_ratio = image.get_intrinsic_size(
-                    box.style['image_resolution'], box.style['font_size'])
+                    child.style['image_resolution'], child.style['font_size'])
                 if intrinsic_ratio and intrinsic_width:
                     transferred_size = intrinsic_width / intrinsic_ratio
             if specified_size != 'auto':
@@ -221,14 +221,16 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
             child.flex_base_size = flex_basis
             if main == 'width':
                 child.main_outer_extra = (
-                    child.border_left_width + child.border_right_width)
+                    child.border_left_width + child.border_right_width +
+                    child.padding_left + child.padding_right)
                 if child.margin_left != 'auto':
                     child.main_outer_extra += child.margin_left
                 if child.margin_right != 'auto':
                     child.main_outer_extra += child.margin_right
             else:
                 child.main_outer_extra = (
-                    child.border_top_width + child.border_bottom_width)
+                    child.border_top_width + child.border_bottom_width +
+                    child.padding_top + child.padding_bottom)
                 if child.margin_top != 'auto':
                     child.main_outer_extra += child.margin_top
                 if child.margin_bottom != 'auto':
@@ -250,8 +252,12 @@ def flex_layout(context, box, bottom_space, skip_stack, containing_block, page_i
                 new_child = block.block_level_layout(
                     context, new_child, bottom_space, child_skip_stack, parent_box,
                     page_is_empty, absolute_boxes, fixed_boxes)[0]
-                child.flex_base_size = new_child.height
-                child.main_outer_extra = new_child.margin_height() - new_child.height
+                if new_child:
+                    child.flex_base_size = new_child.height
+                    child.main_outer_extra = (
+                        new_child.margin_height() - new_child.height)
+                else:
+                    child.flex_base_size = child.main_outer_extra = 0
 
         if main == 'width':
             position_x += child.flex_base_size + child.main_outer_extra

{weasyprint-65.0 → weasyprint-65.1}/weasyprint/layout/page.py

@@ -799,6 +799,8 @@ def set_page_type_computed_styles(page_type, html, style_for):
 
 
 def _includes_resume_at(resume_at, page_group_resume_at):
+    if not page_group_resume_at:
+        return True
     (page_child_index, page_child_resume_at), = page_group_resume_at.items()
     if resume_at is None or page_child_index not in resume_at:
         return False
@@ -807,7 +809,7 @@ def _includes_resume_at(resume_at, page_group_resume_at):
     return _includes_resume_at(resume_at[page_child_index], page_child_resume_at)
 
 
-def _update_page_groups(page_groups, resume_at, next_page, root_box):
+def _update_page_groups(page_groups, resume_at, next_page, root_box, blank):
     # https://www.w3.org/TR/css-gcpm-3/#document-sequence-selectors
 
     # Remove or increment page groups.
@@ -819,35 +821,40 @@ def _update_page_groups(page_groups, resume_at, next_page, root_box):
             page_groups.pop(i - page_groups_length)
 
     # Add page groups.
-    if next_page['break'] == 'any' or not next_page['page']:
-        # We don’t have a forced page break or a named page.
-        return
-    if page_groups and page_groups[-1][0] == next_page['page']:
-        # We’re already in an element whose page name is the next page name.
-        return
+    if not blank:
+        if (resume_at and next_page['break'] == 'any') or not next_page['page']:
+            # We don’t have a forced page break or a named page.
+            return next_page['page']
+        if page_groups and page_groups[-1][0] == next_page['page']:
+            # We’re already in an element whose page name is the next page name.
+            return next_page['page']
 
     # Find the box that has the named page. It is a first in-flow child of the
     # element corresponding to resume_at.
 
     # Find element corrensponding to resume_at.
-    page_group_resume_at = copy.deepcopy(resume_at)
-    current_resume_at = page_group_resume_at
+    current_resume_at = page_group_resume_at = copy.deepcopy(resume_at) or {0: None}
     current_element = root_box
     while True:
         child_index, child_resume_at = tuple(current_resume_at.items())[-1]
+        parent_element = current_element
         current_element = current_element.children[child_index]
         if child_resume_at is None:
             break
         current_resume_at = child_resume_at
 
+    if blank:
+        # Page is blank, don’t create a new page group and return parent’s page name.
+        return parent_element.style['page']
+
     # Find the descendant with named page.
     while True:
         if current_element.style['page'] == next_page['page']:
             page_groups.append([next_page['page'], 0, page_group_resume_at])
-            return
+            return next_page['page']
         if not isinstance(current_element, boxes.ParentBox):
             # Shouldn’t happen.
-            return
+            return next_page['page']
         for i, child in enumerate(current_element.children):
             if not child.is_in_normal_flow():
                 continue
@@ -858,7 +865,7 @@ def _update_page_groups(page_groups, resume_at, next_page, root_box):
             break
         else:
             # Shouldn’t happen.
-            return
+            return next_page['page']
 
 
 def remake_page(index, page_groups, context, root_box, html):
@@ -891,9 +898,8 @@ def remake_page(index, page_groups, context, root_box, html):
         (next_page_side == 'left' and right_page) or
         (next_page_side == 'right' and not right_page) or
         (context.reported_footnotes and resume_at is None))
-    name = '' if blank else next_page['page']
     side = 'right' if right_page else 'left'
-    _update_page_groups(page_groups, resume_at, next_page, root_box)
+    name = _update_page_groups(page_groups, resume_at, next_page, root_box, blank)
     groups = tuple((name, index) for name, index, _ in page_groups)
     page_type = PageType(side, blank, name, index, groups)
     set_page_type_computed_styles(page_type, html, context.style_for)