weasyprint 66.0__tar.gz → 67.0__tar.gz

{weasyprint-66.0 → weasyprint-67.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: weasyprint
-Version: 66.0
+Version: 67.0
 Summary: The Awesome Document Factory
 Keywords: html,css,pdf,converter
 Author-email: Simon Sapin <simon.sapin@exyr.org>
 Maintainer-email: CourtBouillon <contact@courtbouillon.org>
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -14,7 +14,6 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -29,11 +28,11 @@ License-File: LICENSE
 Requires-Dist: pydyf >=0.11.0
 Requires-Dist: cffi >=0.6
 Requires-Dist: tinyhtml5 >=2.0.0b1
-Requires-Dist: tinycss2 >=1.4.0
+Requires-Dist: tinycss2 >=1.5.0
 Requires-Dist: cssselect2 >=0.8.0
 Requires-Dist: Pyphen >=0.9.1
 Requires-Dist: Pillow >=9.1.0
-Requires-Dist: fonttools[woff] >=4.0.0
+Requires-Dist: fonttools[woff] >=4.59.2
 Requires-Dist: sphinx ; extra == "doc"
 Requires-Dist: furo ; extra == "doc"
 Requires-Dist: pytest ; extra == "test"
@@ -62,7 +61,7 @@ WebKit or Gecko. The CSS layout engine is written in Python, designed for
 pagination, and meant to be easy to hack on.
 
 * Free software: BSD license
-* For Python 3.9+, tested on CPython and PyPy
+* For Python 3.10+, tested on CPython and PyPy
 * Documentation: https://doc.courtbouillon.org/weasyprint
 * Examples: https://weasyprint.org/#samples
 * Changelog: https://github.com/Kozea/WeasyPrint/releases

{weasyprint-66.0 → weasyprint-67.0}/README.rst

@@ -13,7 +13,7 @@ WebKit or Gecko. The CSS layout engine is written in Python, designed for
 pagination, and meant to be easy to hack on.
 
 * Free software: BSD license
-* For Python 3.9+, tested on CPython and PyPy
+* For Python 3.10+, tested on CPython and PyPy
 * Documentation: https://doc.courtbouillon.org/weasyprint
 * Examples: https://weasyprint.org/#samples
 * Changelog: https://github.com/Kozea/WeasyPrint/releases

{weasyprint-66.0 → weasyprint-67.0}/docs/api_reference.rst

@@ -182,14 +182,35 @@ specifications.
 Fonts
 ~~~~~
 
-WeasyPrint can use any font that Pango can find installed on the system. Fonts
-are automatically embedded in PDF files.
+WeasyPrint can use any font that Pango_ can find installed on the system. Fonts are
+automatically embedded in PDF files and are subset by default to only include the glyphs
+used in the PDF. Subsetting is done with hb-subset_ when available on the system,
+or by the slower fontTools_ library as a fallback.
 
-Pango always uses fontconfig to access fonts, even on Windows and macOS. You
+Pango_ always uses Fontconfig_ to access fonts, even on Windows and macOS. You
 can list the available fonts thanks to the ``fc-list`` command, and know which
 font is matched by a given pattern thanks to ``fc-match``. Copying a font file
 into the ``~/.local/share/fonts`` directory is generally enough to install a
-new font. WeasyPrint should support the major font formats handled by Harfbuzz.
+new font. WeasyPrint should support the major font formats handled by HarfBuzz_.
+
+WeasyPrint follows the Fontconfig_ configuration of the system. This default
+configuration is often useful for many cases: font fallbacks for missing glyphs, aliases
+for standard font families like "serif" or "monospace", colored variants for emojis,
+etc. But some of these default rules can sometimes interfere with CSS rules, and it may
+be interesting to disable them if you need to tweak details about font management.
+
+When a Unicode code point is not supported by a font and its fallbacks, the font’s `.notdef glyph`_ is
+displayed instead, and a warning is displayed in logs. Because of the way Pango handles
+this case, the .notdef glyph may be rendered with an incorrect width (advance), but the layout of
+the other glyphs is correct. Text search and selection work as if the glyph was
+available.
+
+.. _hb-subset: https://harfbuzz.github.io/harfbuzz-hb-subset.html
+.. _fontTools: https://fonttools.readthedocs.io/en/latest/
+.. _Pango: https://www.pango.org/
+.. _Fontconfig: https://www.freedesktop.org/wiki/Software/fontconfig/
+.. _HarfBuzz: https://harfbuzz.github.io/
+.. _.notdef glyph: https://en.wikipedia.org/wiki/Notdef_glyph
 
 
 CSS
@@ -199,13 +220,7 @@ WeasyPrint supports many of the `CSS specifications`_ written by the W3C. You
 will find in this chapter a comprehensive list of the specifications or drafts
 with at least one feature implemented in WeasyPrint.
 
-The results of some of the test suites provided by the W3C are also available
-at `test.weasyprint.org`_. This website uses a tool called `WeasySuite`_ that
-can be useful if you want to implement new features in WeasyPrint.
-
 .. _CSS specifications: https://www.w3.org/Style/CSS/current-work
-.. _test.weasyprint.org: http://test.weasyprint.org/
-.. _WeasySuite: https://github.com/Kozea/WeasySuite
 
 CSS Level 2 Revision 1
 ++++++++++++++++++++++
@@ -216,7 +231,6 @@ Test`_.
 
 The CSS 2.1 features listed here are **not** supported:
 
-* The `::first-line`_ pseudo-element.
 * On tables: `visibility: collapse`_.
 * Minimum and maximum height_ on table-related boxes.
 * Minimum and maximum width_ and height_ on page-margin boxes.
@@ -228,7 +242,6 @@ The CSS 2.1 features listed here are **not** supported:
 
 .. _CSS Level 2 Revision 1: https://www.w3.org/TR/CSS21/
 .. _Acid2 Test: https://www.webstandards.org/files/acid2/test.html
-.. _::first-line: https://www.w3.org/TR/CSS21/selector.html#first-line-pseudo
 .. _empty-cells: https://www.w3.org/TR/CSS21/tables.html#empty-cells
 .. _visibility\: collapse: https://www.w3.org/TR/CSS21/tables.html#dynamic-effects
 .. _width: https://www.w3.org/TR/CSS21/visudet.html#min-max-widths
@@ -237,6 +250,7 @@ The CSS 2.1 features listed here are **not** supported:
 .. _Bi-directional text: https://www.w3.org/TR/CSS21/visuren.html#direction
 .. _System colors: https://www.w3.org/TR/CSS21/ui.html#system-colors
 .. _system fonts: https://www.w3.org/TR/CSS21/fonts.html#propdef-font
+.. _CSS Color Module Level 3: https://www.w3.org/TR/css-color-3/
 
 To the best of our knowledge, everything else that applies to the
 print media **is** supported. Please report a bug if you find this list
@@ -492,20 +506,30 @@ The other features of this module are **not** implemented:
 .. _user agent stylesheet: https://github.com/Kozea/WeasyPrint/blob/main/weasyprint/css/html5_ua.css
 .. _Leaders: https://www.w3.org/TR/css-content-3/#leaders
 
-CSS Color Module Level 3
-++++++++++++++++++++++++
+CSS Color Module Level 4 / 5
+++++++++++++++++++++++++++++
 
-The `CSS Color Module Level 3`_ is a recommendation defining "CSS properties
-which allow authors to specify the foreground color and opacity of an
-element". Its main goal is to specify how colors are defined, including color
-keywords and the ``#rgb``, ``#rrggbb``, ``rgb()``, ``rgba()``, ``hsl()``,
-``hsla()`` syntaxes. Opacity and alpha compositing are also defined in this
-document.
+The `CSS Color Module Level 4`_ is a recommendation defining "CSS properties which allow
+authors to specify the foreground color and opacity of the text content of an element".
+Its main goal is to specify how colors are defined, including color keywords and many
+color notations including ``#rgba``, ``rgb()``, ``hsl()``, ``hwb()``, ``lab()``, etc.
+The standard ``color()`` function gives a common way to define colors giving their color
+space. Opacity and alpha compositing are also defined in this document.
 
 This recommendation is fully implemented in WeasyPrint, except the deprecated
 System Colors.
 
-.. _CSS Color Module Level 3: https://www.w3.org/TR/css-color-3/
+The `CSS Color Module Level 5`_ is a working draft adding "color modification functions,
+custom color spaces (ICC profiles), ``contrast-color()``, ``light-dark()`` and
+``device-cmyk()``" to level 4.
+
+WeasyPrint supports the ``light-dark()`` and ``device-cmyk()`` properties, and the
+``@color-profile`` at-rule.
+
+WeasyPrint does **not** support the ``color-mix()`` and ``contrast-color()`` properties.
+
+.. _CSS Color Module Level 4: https://www.w3.org/TR/css-color-4/
+.. _CSS Color Module Level 5: https://www.w3.org/TR/css-color-5/
 
 CSS Transforms Module Level 1
 +++++++++++++++++++++++++++++

{weasyprint-66.0 → weasyprint-67.0}/docs/changelog.rst

@@ -2,6 +2,165 @@ Changelog
 =========
 
 
+Version 67.0
+------------
+
+Released on 2025-12-02.
+
+Dependencies:
+
+* Python 3.10+ is now needed, Python 3.9 is not supported anymore
+* tinycss2 1.5.0+ is now needed
+* fontTools 4.59.2+ is now needed
+
+Features:
+
+* `#2560 <https://github.com/Kozea/WeasyPrint/pull/2560>`_,
+  `#640 <https://github.com/Kozea/WeasyPrint/issues/640>`_,
+  `#844 <https://github.com/Kozea/WeasyPrint/issues/844>`_,
+  `#1091 <https://github.com/Kozea/WeasyPrint/issues/1091>`_,
+  `#2517 <https://github.com/Kozea/WeasyPrint/issues/2517>`_:
+  Support CMYK colors, PDF/X, color profiles and light-dark() function
+* `#2558 <https://github.com/Kozea/WeasyPrint/pull/2558>`_,
+  `#1175 <https://github.com/Kozea/WeasyPrint/issues/1175>`_:
+  Support ::first-line, with financial support from Karte Technology
+* `#2552 <https://github.com/Kozea/WeasyPrint/pull/2552>`_:
+  Support CSS layers, with financial support from Code & Co.
+* `#2564 <https://github.com/Kozea/WeasyPrint/pull/2564>`_,
+  `#2599 <https://github.com/Kozea/WeasyPrint/pull/2599>`_,
+  `#2397 <https://github.com/Kozea/WeasyPrint/issues/2397>`_:
+  Allow page breaks in grid rows, with financial support from Ocean Recap
+* `#2568 <https://github.com/Kozea/WeasyPrint/pull/2568>`_,
+  `#357 <https://github.com/Kozea/WeasyPrint/issues/357>`_:
+  Support calc() and other mathematical functions
+* `#2575 <https://github.com/Kozea/WeasyPrint/pull/2575>`_,
+  `#2574 <https://github.com/Kozea/WeasyPrint/issues/2574>`_:
+  Support PDF/A-1a, PDF/A-2a and PDF/A-3a
+* `#2611 <https://github.com/Kozea/WeasyPrint/pull/2611>`_,
+  `#2573 <https://github.com/Kozea/WeasyPrint/issues/2573>`_:
+  Support PDF/A-4e and PDF/A-4f
+* `#2523 <https://github.com/Kozea/WeasyPrint/pull/2523>`_:
+  Display tofu for missing glyphs
+* `#2581 <https://github.com/Kozea/WeasyPrint/pull/2581>`_:
+  Add option to disable protocols in URL resolution
+* `#2570 <https://github.com/Kozea/WeasyPrint/pull/2570>`_:
+  Support rch, cap, rcap, rex, ic and ric font-relative units
+* `#2547 <https://github.com/Kozea/WeasyPrint/pull/2547>`_,
+  `#2140 <https://github.com/Kozea/WeasyPrint/issues/2140>`_:
+  Support "only" keyword in media queries
+
+Bug fixes:
+
+* `#2516 <https://github.com/Kozea/WeasyPrint/pull/2516>`_,
+  `#1510 <https://github.com/Kozea/WeasyPrint/issues/1510>`_:
+  Fix rendering of first line of text with nested right float
+* `#2510 <https://github.com/Kozea/WeasyPrint/pull/2510>`_,
+  `#1073 <https://github.com/Kozea/WeasyPrint/issues/1073>`_,
+  `#2507 <https://github.com/Kozea/WeasyPrint/issues/2507>`_:
+  Avoid Pango crashes and font mismatches with @font-face rules referencing local fonts
+* `#2532 <https://github.com/Kozea/WeasyPrint/pull/2532>`_,
+  `#2531 <https://github.com/Kozea/WeasyPrint/issues/2531>`_:
+  Use fonttools instancer instead of deprecated mutator API
+* `#2541 <https://github.com/Kozea/WeasyPrint/pull/2541>`_:
+  Fix syntax of functions
+* `#2543 <https://github.com/Kozea/WeasyPrint/pull/2543>`_:
+  Allow font-related units to access @font-face fonts
+* `#2525 <https://github.com/Kozea/WeasyPrint/pull/2525>`_:
+  Respect top margins and avoid overlapping footnotes for columns, with financial support from Code & Co.
+* `#2536 <https://github.com/Kozea/WeasyPrint/pull/2536>`_:
+  Remove Subtype key from font descriptor
+* `#2539 <https://github.com/Kozea/WeasyPrint/pull/2539>`_:
+  Fix min width for SVGs with intrinsic ratio but no intrinsic size
+* `#2537 <https://github.com/Kozea/WeasyPrint/pull/2537>`_,
+  `#2533 <https://github.com/Kozea/WeasyPrint/issues/2533>`_:
+  Fix order of operators when drawing SVGs
+* `#2538 <https://github.com/Kozea/WeasyPrint/pull/2538>`_:
+  Don’t crash with nested unknown functions
+* `#2542 <https://github.com/Kozea/WeasyPrint/pull/2542>`_:
+  Don’t crash when lh and rlh are used for line height or font size
+* `#2540 <https://github.com/Kozea/WeasyPrint/pull/2540>`_,
+  `#2528 <https://github.com/Kozea/WeasyPrint/issues/2528>`_:
+  Use locale encoding instead of filesystem encoding for font paths
+* `#2563 <https://github.com/Kozea/WeasyPrint/pull/2563>`_,
+  `#2479 <https://github.com/Kozea/WeasyPrint/issues/2479>`_:
+  Don’t avoid float collisions for atomic flex items
+* `#2569 <https://github.com/Kozea/WeasyPrint/pull/2569>`_:
+  Don’t be case-sensitive for units
+* `#2567 <https://github.com/Kozea/WeasyPrint/pull/2567>`_,
+  `#2566 <https://github.com/Kozea/WeasyPrint/issues/2566>`_:
+  Add x-default attribute for metadata description to be compliant with PDF/A
+* `#2586 <https://github.com/Kozea/WeasyPrint/pull/2586>`_,
+  `#2571 <https://github.com/Kozea/WeasyPrint/issues/2571>`_:
+  Improve formatting contexts management
+* `#2600 <https://github.com/Kozea/WeasyPrint/pull/2600>`_:
+  Fix SVG image aspect ratio when only width or height is specified
+* `#2612 <https://github.com/Kozea/WeasyPrint/pull/2612>`_,
+  `#2595 <https://github.com/Kozea/WeasyPrint/pull/2595>`_:
+  Clean block layout and fix corner cases
+* `#2522 <https://github.com/Kozea/WeasyPrint/issues/2522>`_:
+  Ignore preserveAspectRatio when SVG has no viewBox
+* `#2544 <https://github.com/Kozea/WeasyPrint/issues/2544>`_:
+  Allow to use a variable twice in a function
+* `#2555 <https://github.com/Kozea/WeasyPrint/issues/2555>`_:
+  Fix flex gap in right-to-left context
+* `#2591 <https://github.com/Kozea/WeasyPrint/issues/2591>`_:
+  Respect non-auto widths and fix padding of grid items
+* `#2601 <https://github.com/Kozea/WeasyPrint/issues/2601>`_:
+  Don’t crash when tagged tables are not displayed as tables
+* `#2607 <https://github.com/Kozea/WeasyPrint/issues/2607>`_:
+  Fix rendering of multiline textareas with PDF forms
+* `#2106 <https://github.com/Kozea/WeasyPrint/issues/2106>`_:
+  Force variable initialization to avoid crashes during column layout
+* `#2618 <https://github.com/Kozea/WeasyPrint/pull/2618>`_,
+  `#2617 <https://github.com/Kozea/WeasyPrint/issues/2617>`_:
+  Fix rendering of relative grid and flex items
+
+Documentation:
+
+* `#2535 <https://github.com/Kozea/WeasyPrint/pull/2535>`_:
+  `#2534 <https://github.com/Kozea/WeasyPrint/issues/2534>`_:
+  Removed reference to defunct site
+
+Contributors:
+
+* Guillaume Ayoub
+* Fazle Rabbi Ferdaus
+* Lucie Anglade
+* Luca Vercelli
+* ChickenF622
+* Ernie Chu
+* Mark Pullin
+* Malte Laukötter
+* Markus Mohanty
+* Yvonne Kothmeier
+* Jarom Ort
+* kuypan
+
+Backers and sponsors:
+
+* Spacinov
+* Syslifters
+* Kobalt
+* Simon Sapin
+* Grip Angebotssoftware
+* Manuel Barkhau
+* Simonsoft
+* KontextWork
+* Menutech
+* TrainingSparkle
+* Healthchecks.io
+* Method B
+* FieldHub
+* Hammerbacher
+* Yanal-Yves Fargialla
+* Morntag
+* Piloterr
+* Xavid
+* Charlie S.
+* Prothesis Dental Solutions
+* Kai DeLorenzo
+
+
 Version 66.0
 ------------
 

{weasyprint-66.0 → weasyprint-67.0}/docs/common_use_cases.rst

@@ -158,6 +158,32 @@ also used to define the order of the PDF content.
 Some information is required in your HTML file, including a ``<title>`` tag,
 and a ``lang`` attribute set on the ``<html>`` tag.
 
+PDF/X (Graphics Exchange)
+.........................
+
+PDF/X documents facilitate graphics exchange and adds printing-related requirements such
+as color profiles.
+
+The easiest way to fulfill these requirements is to use device-dependent CMYK colors and
+images everywhere in your document. For colors, you can use the ``device-cmyk()``
+function:
+
+.. code-block:: css
+
+   body { color: device-cmyk(0% 10% 0% 80%) }
+
+You also have to define the output profile color to use.
+
+.. code-block:: css
+
+   @color-profile device-cmyk {
+     components: cyan, magenta, yellow, black;
+     src: url(path/to/cmyk-profile.icc);
+   }
+
+If possible, PDF/X-4 should be preferred: it allows transparency layers that are
+forbidden by previous variants.
+
 Factur-X / ZUGFeRD (Electronic Invoices)
 ........................................
 

{weasyprint-66.0 → weasyprint-67.0}/docs/first_steps.rst

@@ -9,16 +9,16 @@ Installation
 
 WeasyPrint |version| depends on:
 
-* Python_ ≥ 3.9.0
+* Python_ ≥ 3.10.0
 * Pango_ ≥ 1.44.0
-* pydyf_ ≥ 0.10.0
+* pydyf_ ≥ 0.11.0
 * CFFI_ ≥ 0.6
 * tinyhtml5_ ≥ 2.0.0b1
-* tinycss2_ ≥ 1.3.0
+* tinycss2_ ≥ 1.5.0
 * cssselect2_ ≥ 0.8.0
 * Pyphen_ ≥ 0.9.1
 * Pillow_ ≥ 9.1.0
-* fontTools_ ≥ 4.0.0
+* fontTools_ ≥ 4.59.2
 
 .. _Python: https://www.python.org/
 .. _Pango: https://pango.gnome.org/

{weasyprint-66.0 → weasyprint-67.0}/pyproject.toml

@@ -8,18 +8,18 @@ description = 'The Awesome Document Factory'
 keywords = ['html', 'css', 'pdf', 'converter']
 authors = [{name = 'Simon Sapin', email = 'simon.sapin@exyr.org'}]
 maintainers = [{name = 'CourtBouillon', email = 'contact@courtbouillon.org'}]
-requires-python = '>=3.9'
+requires-python = '>=3.10'
 readme = {file = 'README.rst', content-type = 'text/x-rst'}
 license = {file = 'LICENSE'}
 dependencies = [
   'pydyf >=0.11.0',
   'cffi >=0.6',
   'tinyhtml5 >=2.0.0b1',
-  'tinycss2 >=1.4.0',
+  'tinycss2 >=1.5.0',
   'cssselect2 >=0.8.0',
   'Pyphen >=0.9.1',
   'Pillow >=9.1.0',
-  'fonttools[woff] >=4.0.0',
+  'fonttools[woff] >=4.59.2',
 ]
 classifiers = [
   'Development Status :: 5 - Production/Stable',
@@ -29,7 +29,6 @@ classifiers = [
   'Programming Language :: Python',
   'Programming Language :: Python :: 3',
   'Programming Language :: Python :: 3 :: Only',
-  'Programming Language :: Python :: 3.9',
   'Programming Language :: Python :: 3.10',
   'Programming Language :: Python :: 3.11',
   'Programming Language :: Python :: 3.12',
@@ -69,5 +68,5 @@ include = ['tests/*', 'weasyprint/*']
 exclude_lines = ['pragma: no cover', 'def __repr__', 'raise NotImplementedError']
 
 [tool.ruff.lint]
-select = ['E', 'W', 'F', 'I', 'N', 'RUF']
-ignore = ['RUF001', 'RUF002', 'RUF003']
+select = ['E', 'W', 'F', 'I', 'N', 'RUF', 'T20', 'PIE', 'PT', 'RSE', 'UP']
+ignore = ['E226', 'RUF001', 'RUF002', 'RUF003', 'RUF039', 'RUF059', 'UP031']

{weasyprint-66.0 → weasyprint-67.0}/tests/conftest.py

@@ -31,8 +31,8 @@ def document_write_png(document, target=None, resolution=96, antialiasing=1,
     command = (
         'gs', '-q', '-sDEVICE=png16m', f'-dTextAlphaBits={antialiasing}',
         f'-dGraphicsAlphaBits={antialiasing}', '-dBATCH', '-dNOPAUSE',
-        '-dPDFSTOPONERROR', f'-r{resolution / zoom}', '-sOutputFile=-',
-        pdf.name)
+        '-dPDFSTOPONERROR', f'-r{resolution / zoom}', '-dUsePDFX3Profile',
+        '-sOutputFile=-', pdf.name)
     pngs = run(command, stdout=PIPE).stdout
     os.remove(pdf.name)
 

{weasyprint-66.0 → weasyprint-67.0}/tests/css/test_common.py

@@ -1,5 +1,7 @@
 """Test the CSS parsing, cascade, inherited and computed values."""
 
+from math import isclose
+
 import pytest
 
 from weasyprint import CSS, default_url_fetcher
@@ -16,7 +18,8 @@ def test_find_stylesheets():
 
     sheets = list(find_stylesheets(
         html.wrapper_element, 'print', default_url_fetcher, html.base_url,
-        font_config=None, counter_style=None, page_rules=None))
+        font_config=None, counter_style=None, color_profiles=None, page_rules=None,
+        layers=None))
     assert len(sheets) == 2
     # Also test that stylesheets are in tree order.
     sheet_names = [
@@ -163,7 +166,7 @@ def test_important():
 
 
 @assert_no_logs
-@pytest.mark.parametrize('value, width', (
+@pytest.mark.parametrize(('value', 'width'), [
     ('96px', 96),
     ('1in', 96),
     ('72pt', 96),
@@ -173,29 +176,50 @@ def test_important():
     ('101.6q', 96),
     ('1.1em', 11),
     ('1.1rem', 17.6),
-    # TODO: ch and ex units don't work with font-face, see computed_values.py.
-    # ('1.1ch', 11),
-    # ('1.5ex', 12),
-    # ('1.1lh', 13.2),
-    # ('1.1rlh', 17.6),
-))
+    ('1.1ch', 11),
+    ('1.1rch', 17.6),
+    ('1.1cap', 11),
+    ('1.1rcap', 17.6),
+    ('1.5ex', 12),
+    ('2rex', 25.6),
+    ('1ic', 20),
+    ('1ric', 32),
+    ('1.1lh', 13.2),
+    ('1.1rlh', 26.4),
+])
 def test_units(value, width):
     document = FakeHTML(base_url=BASE_URL, string='''
       <html style="font: 16px / 1.5 weasyprint">
       <body style="font: 10px / 1.2 weasyprint">
-      <p style="margin-left: %s"></p>''' % value)
+      <p style="margin-left: %s"></p>
+      <p style="margin-left: %s"></p>
+      ''' % (value, value.upper()))
     page, = document.render().pages
     html, = page._page_box.children
     body, = html.children
-    p, = body.children
-    assert p.margin_left == width
+    p1, p2 = body.children
+    assert p1.margin_left == p2.margin_left
+    assert isclose(p1.margin_left, width, rel_tol=0.01)
+
+
+@assert_no_logs
+@pytest.mark.parametrize('property', ['line-height', 'font-size'])
+def test_recursive_lh(property):
+    document = FakeHTML(base_url=BASE_URL, string='''
+      <html style="%s: 1lh">
+      <body style="%s: 1rlh">a''' % (property, property))
+    document.render().pages
+    document = FakeHTML(base_url=BASE_URL, string='''
+      <html style="%s: 1rlh">
+      <body style="%s: 1lh">a''' % (property, property))
+    document.render().pages
 
 
-@pytest.mark.parametrize('media, width, warning', (
+@pytest.mark.parametrize(('media', 'width', 'warning'), [
     ('@media screen { @page { size: 10px } }', 20, False),
     ('@media print { @page { size: 10px } }', 10, False),
     ('@media ("unknown content") { @page { size: 10px } }', 20, True),
-))
+])
 def test_media_queries(media, width, warning):
     document = FakeHTML(string='<p>a<span>b')
     with capture_logs() as logs:

{weasyprint-66.0 → weasyprint-67.0}/tests/css/test_counters.py

@@ -461,14 +461,14 @@ def test_counter_styles_11():
 
 
 @assert_no_logs
-@pytest.mark.parametrize('arguments, values', (
+@pytest.mark.parametrize(('arguments', 'values'), [
     ('cyclic "a" "b" "c"', ('a ', 'b ', 'c ', 'a ')),
     ('symbolic "a" "b"', ('a ', 'b ', 'aa ', 'bb ')),
     ('"a" "b"', ('a ', 'b ', 'aa ', 'bb ')),
     ('alphabetic "a" "b"', ('a ', 'b ', 'aa ', 'ab ')),
     ('fixed "a" "b"', ('a ', 'b ', '3 ', '4 ')),
     ('numeric "0" "1" "2"', ('1 ', '2 ', '10 ', '11 ')),
-))
+])
 def test_counter_symbols(arguments, values):
     page, = render_pages('''
       <style>
@@ -492,10 +492,10 @@ def test_counter_symbols(arguments, values):
 
 
 @assert_no_logs
-@pytest.mark.parametrize('style_type, values', (
+@pytest.mark.parametrize(('style_type', 'values'), [
     ('decimal', ('1. ', '2. ', '3. ', '4. ')),
     ('"/"', ('/', '/', '/', '/')),
-))
+])
 def test_list_style_types(style_type, values):
     page, = render_pages('''
       <style>

{weasyprint-66.0 → weasyprint-67.0}/tests/css/test_descriptors.py

@@ -136,7 +136,7 @@ def test_font_face_bad_2():
     with capture_logs() as logs:
         preprocess_stylesheet(
             'print', 'https://wp.org/foo/', stylesheet, None, None, None,
-            None, None)
+            None, None, None, None)
     assert logs == [
         "WARNING: Missing src descriptor in '@font-face' rule at 1:1"]
 
@@ -146,7 +146,7 @@ def test_font_face_bad_3():
     with capture_logs() as logs:
         preprocess_stylesheet(
             'print', 'https://wp.org/foo/', stylesheet, None, None, None,
-            None, None)
+            None, None, None, None)
     assert logs == [
         "WARNING: Missing font-family descriptor in '@font-face' rule at 1:1"]
 
@@ -156,7 +156,7 @@ def test_font_face_bad_4():
     with capture_logs() as logs:
         preprocess_stylesheet(
             'print', 'https://wp.org/foo/', stylesheet, None, None, None,
-            None, None)
+            None, None, None, None)
     assert logs == [
         "WARNING: Missing src descriptor in '@font-face' rule at 1:1"]
 
@@ -167,7 +167,7 @@ def test_font_face_bad_5():
     with capture_logs() as logs:
         preprocess_stylesheet(
             'print', 'https://wp.org/foo/', stylesheet, None, None, None,
-            None, None)
+            None, None, None, None)
     assert logs == [
         'WARNING: Ignored `src: wrong ` at 1:33, invalid value.',
         "WARNING: Missing src descriptor in '@font-face' rule at 1:1"]
@@ -179,7 +179,7 @@ def test_font_face_bad_6():
     with capture_logs() as logs:
         preprocess_stylesheet(
             'print', 'https://wp.org/foo/', stylesheet, None, None, None,
-            None, None)
+            None, None, None, None)
     assert logs == [
         'WARNING: Ignored `font-family: good, bad` at 1:14, invalid value.',
         "WARNING: Missing font-family descriptor in '@font-face' rule at 1:1"]
@@ -191,23 +191,23 @@ def test_font_face_bad_7():
     with capture_logs() as logs:
         preprocess_stylesheet(
             'print', 'https://wp.org/foo/', stylesheet, None, None, None,
-            None, None)
+            None, None, None, None)
     assert logs == [
         'WARNING: Ignored `font-family: good, bad` at 1:14, invalid value.',
         'WARNING: Ignored `src: really bad ` at 1:38, invalid value.',
         "WARNING: Missing src descriptor in '@font-face' rule at 1:1"]
 
 
-@pytest.mark.parametrize('rule', (
+@pytest.mark.parametrize('rule', [
     '@counter-style test {system: alphabetic; symbols: a}',
     '@counter-style test {system: cyclic}',
     '@counter-style test {system: additive; additive-symbols: a 1}',
     '@counter-style test {system: additive; additive-symbols: 10 x, 1 i, 5 v}',
-))
+])
 def test_counter_style_invalid(rule):
     stylesheet = tinycss2.parse_stylesheet(rule)
     with capture_logs() as logs:
         preprocess_stylesheet(
             'print', 'https://wp.org/foo/', stylesheet, None, None, None,
-            None, {})
+            None, None, None, {})
     assert len(logs) >= 1