markdown: Fix another wrong paragraph length detection issue

DCO-1.1-Signed-off-by: Ellie <el@horse64.org>
Spew3D · Oct 16, 2023 · a9a9835 · a9a9835
1 parent 49d960e
commit a9a9835
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/implementation/spew3dweb_markdown.c b/implementation/spew3dweb_markdown.c
@@ -270,9 +270,9 @@ static int _spew3d_markdown_process_inline_content(
     size_t past_image_idx = 0;
 
     #define LINEC(l, c) \
-        lineinfo[l].linestart[\
+        (lineinfo[l].linestart[\
             lineinfo[l].indentlen + c\
-        ]
+        ])
 
     while (endline + 1 < endbeforeline &&
             !as_code &&
@@ -299,11 +299,12 @@ static int _spew3d_markdown_process_inline_content(
             (LINEC(endline + 1, 0) != '#' || (
                 lineinfo[endline + 1].indentedcontentlen > 1 &&
                 LINEC(endline + 1, 1) != '#' &&
-                LINEC(endline + 1, 1) != ' ')) &&
+                LINEC(endline + 1, 1) != ' ' &&
+                LINEC(endline + 1, 1) != '\t')) &&
             (LINEC(endline + 1, 0) != '`' || (
-                lineinfo[endline + 1].indentedcontentlen < 3 && (
+                lineinfo[endline + 1].indentedcontentlen < 3 ||
                 LINEC(endline + 1, 1) != '`' ||
-                LINEC(endline + 1, 2) != '`'))) &&
+                LINEC(endline + 1, 2) != '`')) &&
             (_m2htmlline_line_get_next_line_heading_strength(
                 lineinfo, lineinfofill, endline + 1) >= 0) &&
             (_m2htmlline_start_list_number_len(

diff --git a/implementation/test_markdown_nosdl.c b/implementation/test_markdown_nosdl.c
@@ -676,6 +676,17 @@ START_TEST(test_markdown_tohtml)
             ));
         free(result);
     }
+    {
+        result = spew3dweb_markdown_ToHTML(
+            "- abc def\n  `hello()` test"
+        );
+        printf("test_markdown_tohtml result #23: <<%s>>\n", result);
+        assert(_s3dw_check_html_same(result,
+            "<ul><li><p>abc def "
+            "<code>hello()</code> test</p></li></ul>"
+            ));
+        free(result);
+    }
 }
 END_TEST