Kozea#106: handle rtl ol counter

malnajdi · Oct 11, 2020 · b6ee385 · b6ee385
1 parent a81a82d
commit b6ee385
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/weasyprint/css/counters.py b/weasyprint/css/counters.py
@@ -280,12 +280,16 @@ def render_value(self, counter_value, counter_name=None, counter=None,
         # Step 6
         return initial
 
-    def render_marker(self, counter_name, counter_value):
+    def render_marker(self, counter_name, counter_value, parent_direction):
         """Generate the content of a ::marker pseudo-element."""
         counter = self.resolve_counter(counter_name)
         if counter is None:
             if 'decimal' in self:
-                return self.render_marker('decimal', counter_value)
+                return self.render_marker(
+                    'decimal',
+                    counter_value,
+                    parent_direction
+                )
             else:
                 # Could happen if the UA stylesheet is not used
                 return ''
@@ -295,6 +299,11 @@ def render_marker(self, counter_name, counter_value):
 
         value = self.render_value(counter_value, counter_name=counter_name)
         assert value is not None
+
+        if parent_direction == 'rtl':
+            suffix = symbol(counter['suffix'] or ('string', ' .'))
+            return suffix + value + prefix
+
         return prefix + value + suffix
 
     def copy(self):

diff --git a/weasyprint/formatting_structure/build.py b/weasyprint/formatting_structure/build.py
@@ -145,6 +145,15 @@ def element_to_box(element, style_for, get_image_from_uri, base_url,
 
     marker_boxes = []
     if style['display'] == 'list-item':
+        # This should handle rtl direction
+        if style['direction'] == 'rtl':
+            translate_x = properties.Dimension(-5, '%')
+            translate_y = computed_values.ZERO_PIXELS
+            box.style['transform'] = (
+                    ('translate', (translate_x, translate_y)),
+                )
+            box.style['padding_right'] = properties.Dimension(10, 'px')
+
         marker_boxes = list(marker_to_box(
             element, state, style, style_for, get_image_from_uri,
             target_collector, counter_style))
@@ -295,9 +304,8 @@ def marker_to_box(element, state, parent_style, style_for, get_image_from_uri,
         if not children and style['list_style_type'] != 'none':
             counter_value = counter_values.get('list-item', [0])[-1]
             counter_type = style['list_style_type']
-            # TODO: rtl numbered list has the dot on the left
             marker_text = counter_style.render_marker(
-                counter_type, counter_value)
+                counter_type, counter_value, parent_style['direction'])
             box = boxes.TextBox.anonymous_from(box, marker_text)
             box.style['white_space'] = 'pre-wrap'
             children.append(box)
@@ -311,9 +319,11 @@ def marker_to_box(element, state, parent_style, style_for, get_image_from_uri,
         # See https://drafts.csswg.org/css-pseudo-4/#marker-pseudo
         marker_box.style['position'] = 'absolute'
         if parent_style['direction'] == 'ltr':
+            marker_box.style['left'] = 'auto'
             translate_x = properties.Dimension(-100, '%')
         else:
-            translate_x = properties.Dimension(100, '%')
+            marker_box.style['right'] = properties.Dimension(0, 'px')
+            translate_x = properties.Dimension(20, '%')
         translate_y = computed_values.ZERO_PIXELS
         marker_box.style['transform'] = (
             ('translate', (translate_x, translate_y)),)