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

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/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/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/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)

{weasyprint-65.0.dist-info → weasyprint-65.1.dist-info}/METADATA

@@ -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.dist-info → weasyprint-65.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-weasyprint/__init__.py,sha256=tNkl1pKk8bY-aU64SZC2USPpatilxPwciiS7EaVDsRM,17409
+weasyprint/__init__.py,sha256=MrV26630NkuBXozSOqGdsFZWOFI6arULa1nSj-7EYM8,17409
 weasyprint/__main__.py,sha256=WaRdNsuuTBCJlny8AgqF9I_0Mnx5GseQEFA5lXimErw,7114
 weasyprint/anchors.py,sha256=yXEZD0uFsCAdDjC07cHgWqRuGOSsOsmmmk4omZZecAo,6428
 weasyprint/document.py,sha256=pUwJKcUp3tmgxh155RsQpS3kVUMuXWZfXCOziqQwaNc,17131
@@ -12,7 +12,7 @@ weasyprint/css/__init__.py,sha256=6w2UoHQSoZ76eCuferHS3R0M8nAzFgab1NwR1vpy9LA,51
 weasyprint/css/computed_values.py,sha256=O3USpx2ZH7Ff_FN5oIjn40lNMHj3zdThR0r51HRniIQ,27301
 weasyprint/css/counters.py,sha256=DHSrGJr2ktpZLCc-JYIiE67ak0TORsKSBKkjju-qwdE,11373
 weasyprint/css/html5_ph.css,sha256=l8t4ZN3KoevKx0UEfNw3_vgVjArcII6y5DZXZolWaw0,4629
-weasyprint/css/html5_ua.css,sha256=HJsoxwopC2Alp6qkbmaMUBX3lpU7qSYaSxcMHREcwEc,18809
+weasyprint/css/html5_ua.css,sha256=qGUxl1eIu3tQRVu2fVMnC_oo_CbMYoukAC8dSvH1ErM,19111
 weasyprint/css/html5_ua_form.css,sha256=0JLdrpmhokuy9IFhK2L1ZwbTa2G3ibXTXcGuCkAw80Y,288
 weasyprint/css/media_queries.py,sha256=wHPteZ9Gs2ttuA5kZpMDgRtFHnhYZVwrFXrhKgmR-4g,1072
 weasyprint/css/properties.py,sha256=5nywzyQjLOSKKGxsvJsVgoyQfMsLSQarMeso-WRgYlU,11593
@@ -34,13 +34,13 @@ weasyprint/layout/absolute.py,sha256=Caek_aFJDz5NLYFxTfEYO1-l7ITUMcx6TNDjNpE15-Y
 weasyprint/layout/background.py,sha256=0ZRFZGAJnvF9eULIMyt8oy6lDqE-hKSbcyomQPx8HsQ,10008
 weasyprint/layout/block.py,sha256=jwQS2jGCoQ0hSvCsWRPFK7Y3wad-Ucgzv0fzf-4DKm0,45388
 weasyprint/layout/column.py,sha256=P_863u0_vFYzig9tfBUMI8ZCpXlbx9SLoYekbZ5vg5Y,17299
-weasyprint/layout/flex.py,sha256=AAd3ILF-sVjkTCQafEFcqUDsdZHrGYKR60YG59OwgQo,42335
+weasyprint/layout/flex.py,sha256=uAm4DAOvomSg0aX1oEse8-vT3M_fVI-IGFO1yatBH6E,42630
 weasyprint/layout/float.py,sha256=xo9CuXfvrC5jE8rnCVT2ShNRAXl7vAISq41oqkvvbK8,9266
 weasyprint/layout/grid.py,sha256=hzmsWXWQYw5rdy2XA_O_4Hz7CWCVle0RnnWTkugPEvY,54729
 weasyprint/layout/inline.py,sha256=aFxHM0b-fQCSIWyXgf3dLHM90sQq8AOcS1ELx7sDpbc,48217
 weasyprint/layout/leader.py,sha256=wklI0aLyTx0VJhqU7D_FxtJpfe7dXswcN-VApAusM-Q,2825
 weasyprint/layout/min_max.py,sha256=JdXJG9ISO_RsfeHua_-3g477a16I-NrnYuwH_tQwq4o,1527
-weasyprint/layout/page.py,sha256=4WBLmg0RtGYK1reehYOAkBO06_bTsgiMz8_UvXN-DJ0,39554
+weasyprint/layout/page.py,sha256=JLKoYzGmrULONv11KLLrQuRFaTRK7XJZocuUsB0EGKs,39908
 weasyprint/layout/percent.py,sha256=2XzT_Y-fu7OVt2Ut1f9T1Tt9S4ftRr4x7wL3agvEJus,5626
 weasyprint/layout/preferred.py,sha256=cSOraU8g7i_8dDUifJhvKk0gxHBdPXqGZjjIgs8LVIs,31040
 weasyprint/layout/replaced.py,sha256=ucAd6VMKIEryjnwK8ciKbUoE2yK29-ggdYlGW3KPDXk,11178
@@ -67,8 +67,8 @@ weasyprint/text/constants.py,sha256=ifPeTG_us_sSgWuM-WTQgDrrAgwwnohYR63HhS_1dIM,
 weasyprint/text/ffi.py,sha256=0FWxNeYn0Nub-fKHWElFcQc9GmlgiLAKvS82hpDxsAs,18282
 weasyprint/text/fonts.py,sha256=Qa7HxrQeJN84XXBKgJitcRdVMRA9vz1QY8Kl3StRCE4,17460
 weasyprint/text/line_break.py,sha256=FXlHDk8A4lBB-i3wqgl7RO66P3TPpFzkkFbmu-FHGKg,24735
-weasyprint-65.0.dist-info/entry_points.txt,sha256=wgDp3XXzFywdYgI5vUWMp1zAwx1sZXXH0FTUQbFOq6A,55
-weasyprint-65.0.dist-info/licenses/LICENSE,sha256=v9FOzPphAFdUYOaFVWsYM5nUvTNZBOPJUhsBFtIcVNo,1534
-weasyprint-65.0.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
-weasyprint-65.0.dist-info/METADATA,sha256=X0c9Bin5j5eoQX3YDf0QaJry6HbiBmZMhqebufYN_YM,3707
-weasyprint-65.0.dist-info/RECORD,,
+weasyprint-65.1.dist-info/entry_points.txt,sha256=wgDp3XXzFywdYgI5vUWMp1zAwx1sZXXH0FTUQbFOq6A,55
+weasyprint-65.1.dist-info/licenses/LICENSE,sha256=v9FOzPphAFdUYOaFVWsYM5nUvTNZBOPJUhsBFtIcVNo,1534
+weasyprint-65.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+weasyprint-65.1.dist-info/METADATA,sha256=v9-RDucK9Kk_K1t1UO7i1KRMr7GRF-bbdCdt9XGn-qg,3707
+weasyprint-65.1.dist-info/RECORD,,

{weasyprint-65.0.dist-info → weasyprint-65.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.11.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any