Merge pull request #2569 from Kozea/case-insensitive-values

liZe · web-flow · commit d0fceda8b499 · 2025-10-01T18:20:59.000+02:00
Case-insensitive units
diff --git a/tests/css/test_common.py b/tests/css/test_common.py
@@ -184,12 +184,15 @@ 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 isclose(p.margin_left, width, rel_tol=0.01)
+    p1, p2 = body.children
+    assert p1.margin_left == p2.margin_left
+    assert isclose(p1.margin_left, width, rel_tol=0.01)
 
 
 @assert_no_logs
diff --git a/tests/css/test_validation.py b/tests/css/test_validation.py
@@ -75,7 +75,7 @@ def test_empty_property_value(prop):
 
 @assert_no_logs
 @pytest.mark.parametrize(('rule', 'value'), [
-    ('1px, 3em, auto, auto', ((1, 'px'), (3, 'em'), 'auto', 'auto')),
+    ('1px, 3EM, auto, auto', ((1, 'px'), (3, 'em'), 'auto', 'auto')),
     ('1px,3em,auto,1px', ((1, 'px'), (3, 'em'), 'auto', (1, 'px'))),
 ])
 def test_clip(rule, value):
@@ -116,7 +116,7 @@ def test_counters_warning(rule, warning):
 
 @assert_no_logs
 @pytest.mark.parametrize('rule', [
-    'counter-reset: foo 3px',
+    'counter-reset: foo 3pX',
     'counter-reset: 3',
 ])
 def test_counters_invalid(rule):
@@ -250,7 +250,7 @@ def test_background_image_invalid(rule):
     ('right 10% bottom', (('right', (10, '%'), 'bottom', (0, '%')),)),
 
     # Four tokens
-    ('left 10% bottom 3px', (('left', (10, '%'), 'bottom', (3, 'px')),)),
+    ('left 10% bottom 3PX', (('left', (10, '%'), 'bottom', (3, 'px')),)),
     ('bottom 3px left 10%', (('left', (10, '%'), 'bottom', (3, 'px')),)),
     ('right 10% top 3px', (('right', (10, '%'), 'top', (3, 'px')),)),
     ('top 3px right 10%', (('right', (10, '%'), 'top', (3, 'px')),)),
@@ -298,7 +298,7 @@ def test_font_family_invalid(rule):
 @pytest.mark.parametrize(('rule', 'value'), [
     ('1px', (1, 'px')),
     ('1.1%', (1.1, '%')),
-    ('1em', (1, 'em')),
+    ('1Em', (1, 'em')),
     ('1', (1, None)),
     ('1.3', (1.3, None)),
     ('-0', (0, None)),
diff --git a/tests/draw/test_absolute.py b/tests/draw/test_absolute.py
@@ -15,7 +15,7 @@ def test_absolute_split_1(assert_pixels):
     ''', '''
         <style>
             @page {
-                size: 16px 2px;
+                size: 16px 2Px;
             }
             body {
                 color: red;
@@ -82,7 +82,7 @@ def test_absolute_split_3(assert_pixels):
             body {
                 color: red;
                 font-family: weasyprint;
-                font-size: 2px;
+                font-size: 2PX;
                 line-height: 1;
             }
             div.split {
@@ -683,7 +683,7 @@ def test_absolute_pages_counter_orphans(assert_pixels):
                 @bottom-right-corner {
                     color: blue;
                     content: counter(pages);
-                    font-size: 1px;
+                    font-size: 1PX;
                 }
             }
             body {
@@ -785,7 +785,7 @@ def test_fixed_in_inline(assert_pixels):
             body {
                 color: red;
                 font-family: weasyprint;
-                font-size: 2px;
+                font-size: 2PX;
                 line-height: 1;
                 orphans: 2;
                 widows: 2;
diff --git a/tests/draw/test_background.py b/tests/draw/test_background.py
@@ -12,7 +12,7 @@
            <style>
              @page { size: 10px }
              /* body’s background propagates to the whole canvas */
-             body { margin: 2px; background: #00f; height: 5px }
+             body { margin: 2px; background: #00f; height: 5Px }
            </style>
          <body>'''),
         ('''
@@ -176,7 +176,7 @@ def test_canvas_background_size(assert_pixels):
         ______________
         ______________
     '''),
-    ('url(pattern.png) no-repeat bottom 6px right 0', '''
+    ('url(pattern.png) no-repeat bottom 6PX right 0', '''
         ______________
         ______________
         ________rBBB__
@@ -357,7 +357,7 @@ def test_canvas_background_size(assert_pixels):
         ______________
         ______________
     '''),
-    ('url(pattern.png) repeat-y local 2px 1px', '''
+    ('url(pattern.png) repeat-y local 2pX 1px', '''
         ______________
         ______________
         ____BBBB______
@@ -702,7 +702,7 @@ def test_background_repeat_space_4(assert_pixels):
       <style>
         @page { size: 8px }
         html { background: #fff }
-        body { margin: 1px; height: 6px;
+        body { margin: 1px; height: 6Px;
                background: url(pattern.png) space lime }
       </style>
       <body>''')
diff --git a/tests/draw/test_before_after.py b/tests/draw/test_before_after.py
@@ -16,7 +16,7 @@ def test_before_after_1(assert_same_renderings):
         ''',
         '''
             <style>
-                @page { size: 300px 30px }
+                @page { size: 300px 30PX }
                 body { margin: 0 }
             </style>
             <p><a href="another url"><span>[some url] </span>some content</p>
@@ -37,7 +37,7 @@ def test_before_after_2(assert_same_renderings):
         ''',
         '''
             <style>
-                @page { size: 500px 30px }
+                @page { size: 500px 30Px }
                 body { margin: 0 }
                 q:before, q:after { content: none }
             </style>
@@ -60,7 +60,7 @@ def test_before_after_3(assert_same_renderings):
         ''',
         '''
             <style>
-                @page { size: 100px 30px }
+                @page { size: 100PX 30px }
                 body { margin: 0 }
             </style>
             <p><span>a<img src="pattern.png" alt="Missing image">b</span>c</p>
diff --git a/tests/draw/test_box.py b/tests/draw/test_box.py
@@ -19,7 +19,7 @@ def test_outlines_and_borders(assert_pixels, assert_different_renderings, margin
     source = '''
       <style>
         @page { size: 140px 110px }
-        body { width: 100px; height: 70px; margin: %s; %s: 10px %s blue }
+        body { width: 100px; height: 70px; margin: %s; %s: 10PX %s blue }
       </style>
       <body>'''
 
@@ -85,7 +85,7 @@ def test_borders_table_collapse_equivalent(assert_same_renderings, styles):
       <style>
         @page { size: 140px 110px }
         table { width: 100px; height: 70px; margin: 10px;
-                border-collapse: collapse; border: 10px %s blue }
+                border-collapse: collapse; border: 10pX %s blue }
       </style>
       <table><td>abc</td>'''
 
@@ -112,7 +112,7 @@ def test_small_borders_2(border_style):
     # Regression test for #146.
     html = '''
       <style>
-        @page { size: 50px 50px }
+        @page { size: 50Px 50px }
         body { height: 0; width: 0; border-width: 1px 0; border-style: %s }
       </style>
       <body>''' % border_style
@@ -177,7 +177,7 @@ def test_margin_boxes(assert_pixels):
         body { background: #f00; height: 100% }
         @page {
           size: 15px;
-          margin: 4px 6px 7px 5px;
+          margin: 4px 6Px 7px 5px;
 
           @top-left-corner {
             margin: 1px;
@@ -229,10 +229,10 @@ def test_draw_border_radius(assert_pixels):
           size: 8px 8px;
         }
         div {
-          background: red;
+          background: Red;
           border-radius: 50% 0 0 0;
           height: 16px;
-          width: 16px;
+          width: 16PX;
         }
       </style>
       <div></div>
@@ -550,7 +550,7 @@ def test_border_image_width(assert_pixels):
           border-image-slice: 25%;
           border-image-width: 2;
           height: 4px;
-          margin: 1px;
+          margin: 1PX;
           width: 6px;
         }
       </style>
diff --git a/tests/draw/test_column.py b/tests/draw/test_column.py
@@ -16,7 +16,7 @@ def test_column_rule_1(assert_pixels):
               column-rule-width: 1px; column-gap: 3px;
               column-rule-color: red }
         body { margin: 0; font-size: 0 }
-        @page { margin: 0; size: 5px 3px }
+        @page { margin: 0; size: 5px 3Px }
       </style>
       <div>
         <img src=blue.jpg>
@@ -94,7 +94,7 @@ def test_column_rule_normal(assert_pixels):
         img { display: inline-block; width: 1px; height: 1px }
         div { columns: 2; column-gap: normal }
         body { margin: 0; font-size: 3px; line-height: 0 }
-        @page { margin: 0; size: 5px 3px }
+        @page { margin: 0; size: 5PX 3px }
       </style>
       <div>
         <img src=blue.jpg>
diff --git a/tests/draw/test_current_color.py b/tests/draw/test_current_color.py
@@ -23,7 +23,7 @@ def test_current_color_2(assert_pixels):
       <style>
         @page { size: 2px }
         html { color: red; border-color: currentColor }
-        body { color: lime; border: 1px solid; border-color: inherit;
+        body { color: lime; border: 1Px solid; border-color: inherit;
                margin: 0 }
       </style>
       <body>''')
@@ -49,7 +49,7 @@ def test_current_color_4(assert_pixels):
         html { color: red; border-color: currentColor; }
         body { margin: 0 }
         table { border-collapse: collapse;
-                color: lime; border: 1px solid; border-color: inherit }
+                color: lime; border: 1PX solid; border-color: inherit }
       </style>
       <table><td>''')
 
diff --git a/tests/draw/test_float.py b/tests/draw/test_float.py
@@ -34,7 +34,7 @@ def test_float_rtl(assert_pixels):
         __________
     ''', '''
       <style>
-        @page { size: 10px 5px }
+        @page { size: 10px 5Px }
       </style>
       <div style="direction: rtl">
         <img style="float: left" src="pattern.png">
@@ -119,7 +119,7 @@ def test_float_inline_block_rtl(assert_pixels):
         _______________
     ''', '''
       <style>
-        @page { size: 15px 5px }
+        @page { size: 15Px 5px }
         body { font-family: weasyprint; font-size: 2px; line-height: 1;
                color: lime }
       </style>
@@ -185,7 +185,7 @@ def test_float_inline_table(assert_pixels):
         _______________
     ''', '''
       <style>
-        @page { size: 15px 5px }
+        @page { size: 15PX 5px }
         table { display: inline-table }
         body { font-family: weasyprint; font-size: 2px; line-height: 1;
                color: lime }
diff --git a/tests/draw/test_footnote.py b/tests/draw/test_footnote.py
@@ -44,7 +44,7 @@ def test_block_footnote(assert_pixels):
     ''', '''
     <style>
         @page {
-            size: 9px 7px;
+            size: 9Px 7px;
         }
         div {
             color: red;
@@ -77,7 +77,7 @@ def test_long_footnote(assert_pixels):
         div {
             color: red;
             font-family: weasyprint;
-            font-size: 2px;
+            font-size: 2PX;
             line-height: 1;
         }
         span {
@@ -146,7 +146,7 @@ def test_footnote_multiple_margin(assert_pixels):
     ''', '''
     <style>
         @page {
-            size: 7px 10px;
+            size: 7px 10Px;
 
             @footnote {
                 margin-top: 1px;
diff --git a/tests/draw/test_footnote_column.py b/tests/draw/test_footnote_column.py
@@ -27,7 +27,7 @@ def test_footnote_column_margin_top(assert_pixels):
       @page {
         size: 9px 7px;
         @footnote {
-          margin-top: 2px;
+          margin-top: 2Px;
         }
       }
       div {
@@ -109,7 +109,7 @@ def test_footnote_column_fill_auto_break_inside_avoid(assert_pixels):
         column-fill: auto;
         column-gap: 1px;
         font-family: weasyprint;
-        font-size: 2px;
+        font-size: 2pX;
         line-height: 1;
       }
       article {
@@ -255,7 +255,7 @@ def test_footnote_column_3(assert_pixels):
       div {
         color: red;
         columns: 3;
-        column-gap: 1px;
+        column-gap: 1Px;
       }
       span {
         float: footnote;
diff --git a/weasyprint/css/computed_values.py b/weasyprint/css/computed_values.py
@@ -559,7 +559,7 @@ def _compute_track_breadth(style, name, value):
     if value in ('auto', 'min-content', 'max-content'):
         return value
     elif isinstance(value, Dimension):
-        if value.unit == 'fr':
+        if value.unit.lower() == 'fr':
             return value
         else:
             return length(style, name, value)
diff --git a/weasyprint/css/tokens.py b/weasyprint/css/tokens.py
@@ -339,25 +339,25 @@ def get_length(token, negative=True, percentage=False):
     if percentage and token.type == 'percentage':
         if negative or token.value >= 0:
             return Dimension(token.value, '%')
-    if token.type == 'dimension' and token.unit in LENGTH_UNITS:
+    if token.type == 'dimension' and token.unit.lower() in LENGTH_UNITS:
         if negative or token.value >= 0:
-            return Dimension(token.value, token.unit)
+            return Dimension(token.value, token.unit.lower())
     if token.type == 'number' and token.value == 0:
         return Dimension(0, None)
 
 
 def get_angle(token):
     """Parse an <angle> token in radians."""
     if token.type == 'dimension':
-        factor = ANGLE_TO_RADIANS.get(token.unit)
+        factor = ANGLE_TO_RADIANS.get(token.unit.lower())
         if factor is not None:
             return token.value * factor
 
 
 def get_resolution(token):
     """Parse a <resolution> token in ddpx."""
     if token.type == 'dimension':
-        factor = RESOLUTION_TO_DPPX.get(token.unit)
+        factor = RESOLUTION_TO_DPPX.get(token.unit.lower())
         if factor is not None:
             return token.value * factor
 
diff --git a/weasyprint/css/units.py b/weasyprint/css/units.py
@@ -44,7 +44,7 @@
 
 def to_pixels(value, style, name, font_size=None):
     """Get number of pixels corresponding to a length."""
-    if (unit := value.unit) == 'px':
+    if (unit := value.unit.lower()) == 'px':
         return value.value
     elif unit in LENGTHS_TO_PIXELS:
         # Convert absolute lengths to pixels
diff --git a/weasyprint/css/validation/properties.py b/weasyprint/css/validation/properties.py
@@ -1344,8 +1344,8 @@ def _inflexible_breadth(token):
 
 def _track_breadth(token):
     """Parse ``track-breadth``."""
-    if token.type == 'dimension' and token.value >= 0 and token.unit == 'fr':
-        return Dimension(token.value, token.unit)
+    if token.type == 'dimension' and token.value >= 0 and token.unit.lower() == 'fr':
+        return Dimension(token.value, token.unit.lower())
     return _inflexible_breadth(token)
 
 
diff --git a/weasyprint/layout/column.py b/weasyprint/layout/column.py
@@ -30,7 +30,7 @@ def columns_layout(context, box, bottom_space, skip_stack, containing_block,
 
     # Set height if defined
     if height != 'auto' and height.unit != '%':
-        assert height.unit == 'px'
+        assert height.unit.lower() == 'px'
         height_defined = True
         empty_space = context.page_bottom - box.content_box_y() - height.value
         bottom_space = max(bottom_space, empty_space)
diff --git a/weasyprint/layout/grid.py b/weasyprint/layout/grid.py
diff --git a/weasyprint/layout/percent.py b/weasyprint/layout/percent.py
diff --git a/weasyprint/layout/preferred.py b/weasyprint/layout/preferred.py
