apex-ruby 1.0.18 → 1.0.20

data/ext/apex_ext/apex_src/tests/test_runner.c

@@ -43,9 +43,11 @@ void test_cmark_init_callback(void);
 void test_cmark_callback(void);
 void test_custom_plugins(void);
 void test_processor_modes(void);
+void test_quarto_mode(void);
 void test_multimarkdown_image_attributes(void);
 void test_file_includes(void);
 void test_ial(void);
+void test_bear_image_attributes(void);
 void test_bracketed_spans(void);
 void test_definition_lists(void);
 void test_advanced_tables(void);
@@ -58,6 +60,7 @@ void test_callouts(void);
 void test_blockquote_lists(void);
 void test_toc(void);
 void test_terminal_output(void);
+void test_rtf_output(void);
 void test_html_markdown_attributes(void);
 void test_fenced_divs(void);
 void test_sup_sub(void);
@@ -68,6 +71,7 @@ void test_mmd6_features(void);
 void test_emoji(void);
 void test_special_markers(void);
 void test_inline_tables(void);
+void test_grid_tables(void);
 void test_insert_syntax(void);
 void test_advanced_footnotes(void);
 void test_standalone_output(void);
@@ -81,6 +85,7 @@ void test_aria_labels(void);
 void test_marked_integration_features(void);
 void test_plugins_integration(void);
 void test_ast_json_parser(void);
+void test_escaping_repro(void);
 
 /**
  * Test suite registry
@@ -113,8 +118,10 @@ static test_suite suites[] = {
     { "cmark_callback",                test_cmark_callback },
     { "multimarkdown_image_attributes",test_multimarkdown_image_attributes },
     { "processor_modes",               test_processor_modes },
+    { "quarto_mode",                   test_quarto_mode },
     { "file_includes",                 test_file_includes },
     { "ial",                           test_ial },
+    { "bear_image_attributes",         test_bear_image_attributes },
     { "bracketed_spans",               test_bracketed_spans },
     { "definition_lists",              test_definition_lists },
     { "advanced_tables",               test_advanced_tables },
@@ -127,6 +134,7 @@ static test_suite suites[] = {
     { "blockquote_lists",              test_blockquote_lists },
     { "toc",                           test_toc },
     { "terminal_output",               test_terminal_output },
+    { "rtf_output",                    test_rtf_output },
     { "html_markdown_attributes",      test_html_markdown_attributes },
     { "fenced_divs",                   test_fenced_divs },
     { "sup_sub",                       test_sup_sub },
@@ -137,6 +145,7 @@ static test_suite suites[] = {
     { "emoji",                         test_emoji },
     { "special_markers",               test_special_markers },
     { "inline_tables",                 test_inline_tables },
+    { "grid_tables",                   test_grid_tables },
     { "insert_syntax",                 test_insert_syntax },
     { "advanced_footnotes",            test_advanced_footnotes },
     { "standalone_output",             test_standalone_output },
@@ -153,6 +162,8 @@ static test_suite suites[] = {
     { "plugins_integration",           test_plugins_integration },
     { "plugins_custom",                test_custom_plugins },
     { "ast_json",                      test_ast_json_parser },
+    { "escaping_repro",                test_escaping_repro },
+    { "escaping",                      test_escaping_repro },
 };
 
 static const size_t suite_count = sizeof(suites) / sizeof(suites[0]);

data/ext/apex_ext/apex_src/tests/test_tables.c

@@ -7,6 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 void test_advanced_tables(void) {
     int suite_failures = suite_start();
@@ -37,6 +38,120 @@ void test_advanced_tables(void) {
     assert_contains(html, "Table Caption After", "Caption text after is present");
     apex_free_string(html);
 
+    /* Regression: footnote definitions must not be interpreted as table captions.
+     * Repro from issue #20: inline table followed by [^1]: ...
+     */
+    apex_options inline_table_opts = apex_options_default();
+    inline_table_opts.enable_marked_extensions = true;
+    const char *inline_table_footnote_caption_regression =
+        "Lorem ipsum dolor sit amet[^1], fabulas propriae signiferumque in ius.\n\n"
+        "<<[Table.csv{;}]\n\n"
+        "[^1]: Lorem is a good guy\n";
+    html = apex_markdown_to_html(inline_table_footnote_caption_regression,
+                                 strlen(inline_table_footnote_caption_regression),
+                                 &inline_table_opts);
+    assert_not_contains(html, "<figcaption>^1</figcaption>",
+                        "Footnote definition is not treated as table caption");
+    apex_free_string(html);
+
+    const char *inline_table_linkdef_caption_regression =
+        "Lorem ipsum dolor sit amet [link-ref].\n\n"
+        "<<[Table.csv{;}]\n\n"
+        "[link-ref]: https://example.com\n";
+    html = apex_markdown_to_html(inline_table_linkdef_caption_regression,
+                                 strlen(inline_table_linkdef_caption_regression),
+                                 &inline_table_opts);
+    assert_not_contains(html, "<figcaption>link-ref</figcaption>",
+                        "Link definition is not treated as table caption");
+    apex_free_string(html);
+
+    const char *gfm_table_footnote_caption_regression =
+        "Lorem ipsum dolor sit amet[^1], fabulas propriae signiferumque in ius.\n\n"
+        "| Lorem         | Dolor   | Sit     |\n"
+        "| ------------- | ------- | ------- |\n"
+        "| Amet          | Fabulas | Propiae |\n"
+        "| Signiferumque | In      | Ius     |\n\n"
+        "[^1]: Lorem is a good guy\n";
+    html = apex_markdown_to_html(gfm_table_footnote_caption_regression,
+                                 strlen(gfm_table_footnote_caption_regression),
+                                 &opts);
+    assert_contains(html, "<table", "GFM table renders in footnote-caption regression");
+    assert_not_contains(html, "<figcaption>^1</figcaption>",
+                        "Footnote definition after GFM table is not treated as caption");
+    apex_free_string(html);
+
+    /* Regression (#22): caption from inclusion-table section must not leak to nearby tables
+     * that do not define their own caption.
+     */
+    const char *inclusion_caption_leak_regression =
+        "**First table**\n\n"
+        "| Lorem         | Dolor   | Sit     |\n"
+        "| ------------- | ------- | ------- |\n"
+        "| Amet          | Fabulas | Propiae |\n"
+        "| Signiferumque | In      | Ius     |\n"
+        ": My little table caption\n\n"
+        "**Second table**\n\n"
+        "| Lorem         | Dolor   | Sit     |\n"
+        "| ------------- | ------- | ------- |\n"
+        "| Amet          | Fabulas | Propiae |\n"
+        "| Signiferumque | In      | Ius     |\n\n"
+        "**Inclusion Table**\n\n"
+        "<<[Table.csv]\n"
+        ": Caption for inclusion table\n\n"
+        "**Third table**\n\n"
+        "| Lorem         | Dolor   | Sit     |\n"
+        "| ------------- | ------- | ------- |\n"
+        "| Amet          | Fabulas | Propiae |\n"
+        "| Signiferumque | In      | Ius     |\n";
+    html = apex_markdown_to_html(inclusion_caption_leak_regression,
+                                 strlen(inclusion_caption_leak_regression),
+                                 &inline_table_opts);
+    assert_contains(html, "My little table caption",
+                    "Own caption remains attached to first table");
+    assert_not_contains(html, "data-caption=\"Caption for inclusion table\"",
+                        "Inclusion-table caption does not leak into other table attributes");
+    assert_not_contains(html, "<figcaption>Caption for inclusion table</figcaption>",
+                        "Inclusion-table caption does not leak into other table figure captions");
+    apex_free_string(html);
+
+    /* Regression (#20 comment): <<[file] include must not treat following
+     * definition lines as include addresses or table captions.
+     */
+    const char *include_csv_path = "/tmp/apex_issue20_include_table.csv";
+    FILE *include_csv = fopen(include_csv_path, "w");
+    if (include_csv) {
+        fputs("H1,H2\nA,B\n", include_csv);
+        fclose(include_csv);
+    }
+
+    char include_table_footnote_def_regression[512];
+    snprintf(include_table_footnote_def_regression,
+             sizeof(include_table_footnote_def_regression),
+             "<<[%s]\n\n[^1]: Some Footnote Text\n",
+             include_csv_path);
+    html = apex_markdown_to_html(include_table_footnote_def_regression,
+                                 strlen(include_table_footnote_def_regression),
+                                 &inline_table_opts);
+    assert_contains(html, "<table", "Include-table with real CSV renders");
+    assert_not_contains(html, "<figcaption>Some Footnote Text</figcaption>",
+                        "Footnote definition after <<[file] is not treated as caption");
+    apex_free_string(html);
+
+    char include_table_link_def_regression[512];
+    snprintf(include_table_link_def_regression,
+             sizeof(include_table_link_def_regression),
+             "<<[%s]\n\n[link-ref]: https://example.com\n",
+             include_csv_path);
+    html = apex_markdown_to_html(include_table_link_def_regression,
+                                 strlen(include_table_link_def_regression),
+                                 &inline_table_opts);
+    assert_contains(html, "<table", "Include-table with link definition renders");
+    assert_not_contains(html, "<figcaption>https://example.com</figcaption>",
+                        "Link definition after <<[file] is not treated as caption");
+    apex_free_string(html);
+
+    remove(include_csv_path);
+
     /* Test rowspan with ^^ */
     const char *rowspan_table = "| H1 | H2 |\n|----|----|"
                                 "\n| A  | B  |"
@@ -98,6 +213,35 @@ void test_advanced_tables(void) {
     assert_not_contains(html, "colspan", "Empty cells table: no colspan attribute (empty cells don't create colspan)");
     apex_free_string(html);
 
+    /* Blank cells use spaced pipes (| |); colspan only for consecutive pipes (||).
+     * A later full-width colspan row must not steal blanks from earlier indent rows. */
+    const char *blank_then_colspan =
+        "|:-|:-|:-|:-|:-|\n"
+        "|a|b|c|d|e|\n"
+        "| | |x|y|z|\n"
+        "| | |p|q|r|\n"
+        "|full|||||\n";
+    html = apex_markdown_to_html(blank_then_colspan, strlen(blank_then_colspan), &opts);
+    assert_contains(html, "<td colspan=\"5\">full</td>", "Blank then colspan: full-width colspan on last row");
+    assert_contains(html, ">x</td>", "Blank then colspan: indent cell x present");
+    assert_contains(html, ">p</td>", "Blank then colspan: indent cell p present");
+    /* First indent row should keep two leading blank cells, not a colspan on an empty cell */
+    assert_not_contains(html, "<td colspan=\"5\"></td>", "Blank then colspan: no empty-cell colspan on indent rows");
+    assert_not_contains(html, "<th colspan=\"5\"></th>", "Blank then colspan: no empty th colspan on indent rows");
+    apex_free_string(html);
+
+    /* Spaced empty cell between content stays a blank column, not a span */
+    const char *spaced_blank_between =
+        "| H1 | H2 | H3 |\n"
+        "|----|----|----|\n"
+        "| A | | B |\n";
+    html = apex_markdown_to_html(spaced_blank_between, strlen(spaced_blank_between), &opts);
+    assert_contains(html, "<td>A</td>", "Spaced blank between: A present");
+    assert_contains(html, "<td></td>", "Spaced blank between: blank cell present");
+    assert_contains(html, "<td>B</td>", "Spaced blank between: B present");
+    assert_not_contains(html, "colspan", "Spaced blank between: no colspan from | |");
+    apex_free_string(html);
+
     /* Test dash-only separator row removal (rows containing only — should be removed). */
     const char *dash_row =
         "| H1 | H2 |\n"
@@ -389,6 +533,43 @@ void test_relaxed_tables(void) {
     }
     apex_free_string(html);
 
+    /* Pipes inside fenced code blocks must not trigger relaxed table separators */
+    const char *fenced_code_with_pipes =
+        "```bash\n"
+        "update_widgets() {\n"
+        "  echo foo | sed 's/x/y/' | awk '{print $1}'\n"
+        "}\n"
+        "```";
+    html = apex_markdown_to_html(fenced_code_with_pipes, strlen(fenced_code_with_pipes), &opts);
+    assert_contains(html, "<code", "Fenced code block with pipes renders as code");
+    assert_contains(html, "echo foo | sed", "Code block content with pipes preserved");
+    if (strstr(html, "---|---|---|") == NULL) {
+        test_result(true, "No relaxed-table separator injected inside fenced code");
+    } else {
+        test_result(false, "Relaxed-table separator was injected inside fenced code");
+    }
+    apex_free_string(html);
+
+    /* Mermaid edge labels |Yes| / |No| must not get a GFM separator injected */
+    {
+        apex_options unified = apex_options_default();
+        unified.mode = APEX_MODE_UNIFIED;
+        unified.relaxed_tables = true;
+        unified.enable_tables = true;
+        const char *mermaid_pipes =
+            "```mermaid\n"
+            "graph TD\n"
+            "  A -->|Yes| B\n"
+            "  A -->|No| C\n"
+            "```\n";
+        html = apex_markdown_to_html(mermaid_pipes, strlen(mermaid_pipes), &unified);
+        assert_contains(html, "lang=\"mermaid\"", "Mermaid fence keeps language");
+        assert_contains(html, "|Yes|", "Mermaid Yes edge label preserved");
+        assert_contains(html, "|No|", "Mermaid No edge label preserved");
+        assert_not_contains(html, "---|---|---", "No relaxed-table separator inside Mermaid fence");
+        apex_free_string(html);
+    }
+
     bool had_failures = suite_end(suite_failures);
     print_suite_title("Relaxed Tables Tests", had_failures, false);
 }
@@ -873,6 +1054,245 @@ void test_inline_tables(void) {
     print_suite_title("Inline Tables Tests", had_failures, false);
 }
 
+void test_grid_tables(void) {
+    int suite_failures = suite_start();
+    print_suite_title("Grid Tables Tests", false, true);
+
+    apex_options opts = apex_options_default();
+    opts.enable_tables = true;
+    opts.enable_grid_tables = true;
+    opts.relaxed_tables = false;
+    char *html;
+
+    /* Test basic grid table */
+    const char *basic_grid = "+---+---+\n"
+                             "| H1 | H2 |\n"
+                             "+===+===+\n"
+                             "| C1 | C2 |\n"
+                             "+---+---+";
+    html = apex_markdown_to_html(basic_grid, strlen(basic_grid), &opts);
+    assert_contains(html, "<table", "Basic grid table renders");
+    assert_contains(html, "<th>H1</th>", "Grid table header");
+    assert_contains(html, "<td>C1</td>", "Grid table cell");
+    apex_free_string(html);
+
+    /* Test grid table with header separator */
+    const char *header_sep_grid = "+---+---+\n"
+                                   "| H1 | H2 |\n"
+                                   "+===+===+\n"
+                                   "| C1 | C2 |\n"
+                                   "+---+---+";
+    html = apex_markdown_to_html(header_sep_grid, strlen(header_sep_grid), &opts);
+    assert_contains(html, "<table", "Grid table with header separator renders");
+    assert_contains(html, "<th>H1</th>", "Header separator table has header");
+    apex_free_string(html);
+
+    /* Test grid table with alignment */
+    const char *aligned_grid = "+:---+---+---:+\n"
+                                "| C  | L  |  R |\n"
+                                "+===+===+===+\n"
+                                "| A  | B  |  C |\n"
+                                "+---+---+---+";
+    html = apex_markdown_to_html(aligned_grid, strlen(aligned_grid), &opts);
+    assert_contains(html, "<table", "Aligned grid table renders");
+    apex_free_string(html);
+
+    /* Test grid table with footer separator */
+    const char *footer_grid = "+---+---+\n"
+                              "| H1 | H2 |\n"
+                              "+---+---+\n"
+                              "| C1 | C2 |\n"
+                              "+===+===+\n"
+                              "| F1 | F2 |\n"
+                              "+---+---+";
+    html = apex_markdown_to_html(footer_grid, strlen(footer_grid), &opts);
+    assert_contains(html, "<table", "Grid table with footer renders");
+    apex_free_string(html);
+
+    /* Test multi-line cells in grid table */
+    const char *multiline_grid = "+---+---+\n"
+                                  "| H1 | H2 |\n"
+                                  "+===+===+\n"
+                                  "| Line 1 | Cell 2 |\n"
+                                  "| Line 2 |        |\n"
+                                  "+---+---+";
+    html = apex_markdown_to_html(multiline_grid, strlen(multiline_grid), &opts);
+    assert_contains(html, "<table", "Multi-line grid table renders");
+    assert_contains(html, "Line 1", "Multi-line cell content preserved");
+    assert_contains(html, "Line 2", "Multi-line cell second line preserved");
+    apex_free_string(html);
+
+    /* Test grid table with caption (before) */
+    const char *caption_before = "[Grid Table Caption]\n\n"
+                                 "+---+---+\n"
+                                 "| H1 | H2 |\n"
+                                 "+===+===+\n"
+                                 "| C1 | C2 |\n"
+                                 "+---+---+";
+    html = apex_markdown_to_html(caption_before, strlen(caption_before), &opts);
+    assert_contains(html, "<table", "Grid table with caption before renders");
+    assert_contains(html, "<figure", "Grid table with caption wrapped in figure");
+    assert_contains(html, "Grid Table Caption", "Caption text present");
+    apex_free_string(html);
+
+    /* Test grid table with caption (after) */
+    const char *caption_after = "+---+---+\n"
+                                "| H1 | H2 |\n"
+                                "+===+===+\n"
+                                "| C1 | C2 |\n"
+                                "+---+---+\n\n"
+                                "[Grid Table Caption After]";
+    html = apex_markdown_to_html(caption_after, strlen(caption_after), &opts);
+    assert_contains(html, "<table", "Grid table with caption after renders");
+    assert_contains(html, "Grid Table Caption After", "Caption text after present");
+    apex_free_string(html);
+
+    /* Test grid table in code block (should not be parsed) */
+    const char *code_block_grid = "```\n"
+                                  "+---+---+\n"
+                                  "| H1 | H2 |\n"
+                                  "+===+===+\n"
+                                  "| C1 | C2 |\n"
+                                  "+---+---+\n"
+                                  "```";
+    html = apex_markdown_to_html(code_block_grid, strlen(code_block_grid), &opts);
+    assert_not_contains(html, "<table", "Grid table in code block not parsed");
+    assert_contains(html, "<code", "Code block preserved");
+    apex_free_string(html);
+
+    /* Test mixed grid and pipe tables */
+    const char *mixed_tables = "+---+---+\n"
+                               "| G1 | G2 |\n"
+                               "+===+===+\n"
+                               "| GC1 | GC2 |\n"
+                               "+---+---+\n\n"
+                               "| P1 | P2 |\n"
+                               "|----|----|\n"
+                               "| PC1 | PC2 |";
+    html = apex_markdown_to_html(mixed_tables, strlen(mixed_tables), &opts);
+    assert_contains(html, "<table", "Mixed tables render");
+    assert_contains(html, "G1", "Grid table content present");
+    assert_contains(html, "P1", "Pipe table content present");
+    apex_free_string(html);
+
+    /* Test grid table disabled */
+    opts.enable_grid_tables = false;
+    html = apex_markdown_to_html(basic_grid, strlen(basic_grid), &opts);
+    apex_free_string(html);
+
+    /* Complex colspan row spanning full table width (no closing table separator) */
+    opts.enable_grid_tables = true;
+    opts.enable_tables = true;
+    const char *colspan_grid = "+---+---+\n"
+                               "| H1 | H2 |\n"
+                               "+===+===+\n"
+                               "| C1 | C2 |\n"
+                               "+---+---+\n"
+                               "| Spans both columns here             |\n";
+    html = apex_markdown_to_html(colspan_grid, strlen(colspan_grid), &opts);
+    assert_contains(html, "colspan=\"2\"", "Colspan row spans both columns");
+    assert_contains(html, "Spans both columns", "Colspan cell content preserved");
+    apex_free_string(html);
+
+    /* Nested grid inside colspan cell stays in one cell */
+    const char *nested_in_colspan = "+---+---+\n"
+                                    "| A | B |\n"
+                                    "+===+===+\n"
+                                    "| Wide cell                           |\n"
+                                    "+---+---+---+\n"
+                                    "| n1 | n2 | n3 |\n"
+                                    "+---+---+---+";
+    html = apex_markdown_to_html(nested_in_colspan, strlen(nested_in_colspan), &opts);
+    assert_contains(html, "colspan=\"2\"", "Nested grid parent has colspan");
+    assert_contains(html, "Wide cell", "Wide cell text preserved");
+    assert_not_contains(html, "<tr>\n<td>n1</td>\n<td>n2</td>", "Nested grid not separate top-level row");
+    apex_free_string(html);
+
+    /* Fixture table 1: colspan + nested grid stays inside the table, not a stray paragraph */
+    const char *fixture_colspan_nested = "+-------------------+-------------------+\n"
+        "| Grid Tables       | Are Beautiful     |\n"
+        "+===================+===================+\n"
+        "| Easy to read      | In code and docs  |\n"
+        "+-------------------+-------------------+\n"
+        "| Exceptionally flexible and powerful   |\n"
+        "+-------+-------+-------+-------+-------+\n"
+        "| Col 1 | Col 2 | Col 3 | Col 4 | Col 5 |\n"
+        "+-------+-------+-------+-------+-------+\n";
+    html = apex_markdown_to_html(fixture_colspan_nested, strlen(fixture_colspan_nested), &opts);
+    assert_contains(html, "colspan=\"2\"", "Fixture colspan row in table");
+    assert_contains(html, "Exceptionally flexible and powerful", "Fixture colspan text in output");
+    assert_not_contains(html, "</table>\n<p>|", "Colspan row not leaked as paragraph after table");
+    assert_contains(html, "Col 1", "Nested grid Col 1 inside colspan cell");
+    assert_contains(html, "Col 5", "Nested grid Col 5 inside colspan cell");
+    apex_free_string(html);
+
+    /* Partial separator table (fixture table 2 pattern) */
+    const char *partial_grid = "+---------------------+----------+\n"
+        "| Property            | Earth    |\n"
+        "+=============+=======+==========+\n"
+        "|             | min   | -89.2 °C |\n"
+        "| Temperature +-------+----------+\n"
+        "| 1961-1990   | mean  | 14 °C    |\n"
+        "|             +-------+----------+\n"
+        "|             | min   | 56.7 °C  |\n"
+        "+-------------+-------+----------+\n";
+    html = apex_markdown_to_html(partial_grid, strlen(partial_grid), &opts);
+    assert_contains(html, "colspan=\"2\"", "Partial table Property spans two columns");
+    assert_contains(html, "rowspan=\"3\"", "Partial table Temperature rowspan");
+    assert_contains(html, "14 °C", "Partial table mean temperature");
+    apex_free_string(html);
+
+    /* Multiline list cells */
+    const char *list_cells = "+---+---+---+\n"
+                             "| F | P | Notes |\n"
+                             "+===+===+===+\n"
+                             "| Ban | $1 | - one |\n"
+                             "|     |    | - two |\n"
+                             "+---+---+---+";
+    html = apex_markdown_to_html(list_cells, strlen(list_cells), &opts);
+    assert_contains(html, "<ul>", "List cell renders as ul");
+    assert_contains(html, "<li>one</li>", "List item one in cell");
+    assert_contains(html, "<li>two</li>", "List item two in cell");
+    assert_contains(html, "<table", "List cells table renders");
+    apex_free_string(html);
+
+    /* Plus-prefixed prose lines are not mistaken for grid tables */
+    const char *plus_prose = "+ Item one\n+ Item two\n\nParagraph after.";
+    html = apex_markdown_to_html(plus_prose, strlen(plus_prose), &opts);
+    assert_contains(html, "Item one", "Plus prose lines preserved as list items");
+    assert_contains(html, "Paragraph after", "Text after plus lines preserved");
+    assert_not_contains(html, "<table", "Plus prose is not converted to a table");
+    apex_free_string(html);
+
+    /* Block with +---+ lines but no valid grid content is preserved on failure */
+    const char *invalid_grid = "+---+\nThis line has no pipes\n+---+";
+    html = apex_markdown_to_html(invalid_grid, strlen(invalid_grid), &opts);
+    assert_contains(html, "This line has no pipes", "Invalid grid block content preserved");
+    apex_free_string(html);
+
+    /* Grid tables disabled by default in unified mode */
+    apex_options unified_opts = apex_options_for_mode(APEX_MODE_UNIFIED);
+    html = apex_markdown_to_html(basic_grid, strlen(basic_grid), &unified_opts);
+    assert_not_contains(html, "<th>H1</th>", "Grid tables off by default in unified mode");
+    apex_free_string(html);
+
+    /* Pandoc-style simple grid (manual example pattern) */
+    const char *pandoc_simple = "+---------------+---------------+\n"
+        "| Fruit         | Price         |\n"
+        "+:==============+==============:+\n"
+        "| Bananas       | $1.34         |\n"
+        "| Oranges       | $2.10         |\n"
+        "+---------------+---------------+\n";
+    html = apex_markdown_to_html(pandoc_simple, strlen(pandoc_simple), &opts);
+    assert_contains(html, "Bananas", "Pandoc-style aligned grid renders");
+    assert_contains(html, "$1.34", "Pandoc-style grid cell content");
+    assert_contains(html, "<table", "Pandoc-style grid produces table");
+    apex_free_string(html);
+
+    bool had_failures = suite_end(suite_failures);
+    print_suite_title("Grid Tables Tests", had_failures, false);
+}
+
 /**
  * Test advanced footnotes
  */

data/ext/apex_ext/apex_src/vendor/cmark-gfm/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 project(cmark-gfm)
 
 set(PROJECT_VERSION_MAJOR 0)

data/ext/apex_ext/apex_src/vendor/cmark-gfm/extensions/autolink.c

@@ -267,7 +267,7 @@ static cmark_node *url_match(cmark_parser *parser, cmark_node *parent,
   cmark_node *text = cmark_node_new_with_mem(CMARK_NODE_TEXT, parser->mem);
   text->as.literal = url;
   cmark_node_append_child(node, text);
-  
+
   node->start_line = text->start_line = node->end_line = text->end_line = cmark_inline_parser_get_line(inline_parser);
 
   node->start_column = text->start_column = max_rewind - rewind;
@@ -318,6 +318,64 @@ static bool validate_protocol(const char protocol[], uint8_t *data, size_t rewin
   return !cmark_isalnum(prev_char);
 }
 
+static bool inside_html_tag(const uint8_t *data, size_t at_pos) {
+  bool in_tag = false;
+  uint8_t quote = 0;
+  size_t i;
+
+  for (i = 0; i < at_pos; ++i) {
+    uint8_t c = data[i];
+
+    if (!in_tag) {
+      if (c == '<')
+        in_tag = true;
+      continue;
+    }
+
+    if (quote != 0) {
+      if (c == quote)
+        quote = 0;
+      continue;
+    }
+
+    if (c == '"' || c == '\'') {
+      quote = c;
+      continue;
+    }
+
+    if (c == '>')
+      in_tag = false;
+  }
+
+  return in_tag;
+}
+
+static bool is_image_density_suffix(const uint8_t *data, size_t size) {
+  size_t i = 0;
+
+  if (size < 4)
+    return false;
+
+  while (i < size && cmark_isdigit(data[i]))
+    i++;
+
+  if (i == 0 || i >= size || data[i] != 'x')
+    return false;
+  i++;
+
+  if (i >= size || data[i] != '.')
+    return false;
+  i++;
+
+  if (i >= size || !cmark_isalnum(data[i]))
+    return false;
+
+  while (i < size && cmark_isalnum(data[i]))
+    i++;
+
+  return i == size;
+}
+
 static void postprocess_text(cmark_parser *parser, cmark_node *text) {
   size_t start = 0;
   size_t offset = 0;
@@ -350,6 +408,11 @@ static void postprocess_text(cmark_parser *parser, cmark_node *text) {
 
     max_rewind = at - (data + start + offset);
 
+    if (inside_html_tag(data + start + offset, max_rewind)) {
+      offset += max_rewind + 1;
+      continue;
+    }
+
 found_at:
     for (rewind = 0; rewind < max_rewind; ++rewind) {
       uint8_t c = data[start + offset + max_rewind - rewind - 1];
@@ -381,6 +444,14 @@ found_at:
       continue;
     }
 
+    /* Require that the character immediately before @ is alphanumeric.
+     * This prevents matching @ in URLs like https://example.com/@user */
+    uint8_t char_before_at = data[start + offset + max_rewind - 1];
+    if (!cmark_isalnum(char_before_at)) {
+      offset += max_rewind + 1;
+      continue;
+    }
+
     assert(data[start + offset + max_rewind] == '@');
     for (link_end = 1; link_end < remaining - offset - max_rewind; ++link_end) {
       uint8_t c = data[start + offset + max_rewind + link_end];
@@ -409,6 +480,11 @@ found_at:
       continue;
     }
 
+    if (is_image_density_suffix(data + start + offset + max_rewind + 1, link_end - 1)) {
+      offset += max_rewind + link_end;
+      continue;
+    }
+
     link_end = autolink_delim(data + start + offset + max_rewind, link_end);
 
     if (link_end == 0) {