Merge pull request #1256 from phpDocumentor/fix/enumerated-list

Add support for alphabethic lists.

Author: jaapio

packages/guides-restructured-text/src/RestructuredText/Parser/Productions/EnumeratedListRule.php

@@ -47,7 +47,7 @@ final class EnumeratedListRule implements Rule
     private const ROMAN_NUMBER = '((?:M{0,3})(?:CM|CD|D?C{0,3})(?:XC|XL|L?X{0,3})(?:IX|IV|V?I{0,3}))(?<!^)';
     private const NUMBER = '(\d+|#)';
 
-    private const ALPHABETIC = '[a-z]';
+    private const ALPHABETIC = '([a-z])';
 
     private const LIST_MARKER = '(^%s([\.)])(?:\s+|$)|^[(]%s[)](?:\s+|$))';
 
@@ -144,8 +144,8 @@ private function getItemConfig(string $line): array
         }
 
         return [
-            'marker' => trim($m[1]),
-            'marker_type' => $this->getMarkerType($m[1]),
+            'marker' => trim($m[0]),
+            'marker_type' => $this->getMarkerType($m[0]),
             'indenting' => $m[0] === $line ? 1 : mb_strlen($m[0]),
         ];
     }
@@ -161,7 +161,7 @@ private function isListItemStart(string|null $line, string|null $listMarker = nu
             return false;
         }
 
-        $normalizedMarker = $this->getMarkerType($m[1]);
+        $normalizedMarker = $this->getMarkerType($m[0]);
 
         if ($normalizedMarker === 'unknown') {
             return false;
@@ -222,6 +222,10 @@ private function getMarkerType(string $marker): string
             return 'roman' . $this->markerSuffix($marker);
         }
 
+        if (preg_match('/' . sprintf(self::LIST_MARKER, self::ALPHABETIC, self::ALPHABETIC) . '/', $marker)) {
+            return 'alphabetic' . $this->markerSuffix($marker);
+        }
+
         return 'unknown';
     }
 

tests/Functional/tests/enumerated-ignored/enumerated-ignored.html renamed to tests/Functional/tests/list-enumerated-ignored/list-enumerated-ignored.html

@@ -21,3 +21,15 @@
     <li value="1">First item</li>
     <li value="2">Second item</li>
 </ol>
+<p>This is an enumerated list using letters:</p>
+<ol start="a" type="a">
+    <li value="a">First</li>
+    <li value="b">Second</li>
+    <li value="c">Third</li>
+</ol>
+<p>This is an roman list using letters:</p>
+<ol start="I" type="i">
+    <li value="I">First</li>
+    <li value="II">Second</li>
+    <li value="III">Third</li>
+</ol>

tests/Functional/tests/enumerated-ignored/enumerated-ignored.rst renamed to tests/Functional/tests/list-enumerated-ignored/list-enumerated-ignored.rst

@@ -20,3 +20,15 @@ Using right-parenthesis:
 
 1) First item
 2) Second item
+
+This is an enumerated list using letters:
+
+a. First
+b. Second
+c. Third
+
+This is an roman list using letters:
+
+I. First
+II. Second
+III. Third