Tap stops after list markers properly computed.

Changes

@@ -5,6 +5,7 @@ Revision history for pmarkdown and the Markdown::Perl module.
  - Improvement to the support of the original markdown syntax.
  - Bugfixes:
    - Do not make a list loose when it is followed by blank lines.
+   - Tab stops after list markers are properly computed.
 
 1.01 - 2024-04-05
 

lib/Markdown/Perl/BlockParser.pm

@@ -603,8 +603,13 @@ sub _do_list_item {
   # There is a note in the spec on thematic breaks that are not list items,
   # it’s not exactly clear what is intended, and there are no examples.
   my ($indent_outside, $marker, $text, $digits, $symbol) = @+{qw(indent marker text digits symbol)};
+  my $indent_marker = length($indent_outside) + length($marker);
   my $type = $marker =~ m/[-+*]/ ? 'ul' : 'ol';
-  my $text_indent = indent_size($text);
+  # The $indent_marker is passed in case the text starts with tabs, to properly
+  # compute the tab stops. This is better than nothing but won’t work inside
+  # other container blocks. In all cases, using tabs instead of space should not
+  # be encouraged.
+  my $text_indent = indent_size($text, $indent_marker);
   # When interrupting a paragraph, the rules are stricter.
   my $mode = $this->get_lists_can_interrupt_paragraph;
   if (@{$this->{paragraph}}) {
@@ -622,7 +627,6 @@ sub _do_list_item {
   my $first_line_blank = $text =~ m/^[ \t]*$/;
   my $discard_text_indent = $first_line_blank || indented(4 + 1, $text);  # 4 + 1 is an indented code block, plus the required space after marker.
   my $indent_inside = $discard_text_indent ? 1 : $text_indent;
-  my $indent_marker = length($indent_outside) + length($marker);
   my $indent = $indent_inside + $indent_marker;
   my $cond = sub {
     if ($first_line_blank && m/^[ \t]*$/) {

lib/Markdown/Perl/Util.pm

@@ -62,12 +62,21 @@ sub remove_prefix_spaces {
 }
 
 # Return the indentation of the given text
+# indent_size($str, $prev_indent)
+#
 # Sets pos($_[0]) to the first non-whitespace character.
+# $prev_indent can be passed if the $str is not the beginning of the logical
+# line, to properly compute the tab stops.
+# TODO: this feature is used when parsing list_items, but could be used in many
+# other places too.
 sub indent_size {  ## no critic (RequireArgUnpacking)
   pos($_[0]) = 0;
   my $t = () = $_[0] =~ m/\G( {0,3}\t| {4})/gc;  # Forcing list context.
   $_[0] =~ m/\G( *)/g;
   my $s = length($1);  ## no critic (ProhibitCaptureWithoutTest)
+  if (substr($_[0], 0, 1) eq "\t" && @_ > 1) {
+    $s -= $_[1] % 4;
+  }
   return $t * 4 + $s;
 }
 

t/303-lists.t

@@ -10,5 +10,6 @@ sub run {
 }
 
 is(run("* a\n* b\n* c\n\n\nfoo"), "<ul>\n<li>a</li>\n<li>b</li>\n<li>c</li>\n</ul>\n<p>foo</p>\n", 'list is tight');
+is(run("1.\tfoo\n\n\tbar"), "<ol>\n<li><p>foo</p>\n<p>bar</p>\n</li>\n</ol>\n", 'indent_with_tabs_after_marker');
 
 done_testing;

t/902-markdown-test-suite.t

@@ -10,7 +10,7 @@ use MmdTest;
 use Test2::V0;
 
 # TODO: remove these todos.
-my %opt = (todo => [16, 18, 20, 21, 22]);
+my %opt = (todo => [16, 18, 21, 22]);
 
 while ($_ = shift) {
   $opt{test_num} = shift @ARGV if /^-n$/;