apex-ruby 1.0.6 → 1.0.8

data/ext/apex_ext/apex_src/src/html_renderer.h

@@ -118,6 +118,27 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document);
  */
 char *apex_convert_image_captions(const char *html, bool enable_image_captions, bool title_captions_only);
 
+/**
+ * Strip <p> that wraps only a single <img> (and optional leading "&lt; ") inside
+ * <figure>, so the result is <figure><img...></figure>. Call after image captions.
+ */
+char *apex_strip_figure_paragraph_wrapper(const char *html);
+
+/**
+ * Strip <p> that wraps only a single block element (figure, video, picture).
+ * HTML5 invalid: <p> may only contain phrasing content. Call after image captions.
+ */
+char *apex_strip_block_paragraph_wrapper(const char *html);
+
+/**
+ * Expand img tags with data-apex-replace-auto=1 by discovering existing
+ * format variants (2x, 3x, webp, avif, video formats) on disk.
+ * Only processes local relative URLs when base_directory is provided.
+ * @param html The HTML to process
+ * @param base_directory Base path for resolving relative URLs (e.g. document directory)
+ * @return Newly allocated HTML with auto media expanded (must be freed)
+ */
+char *apex_expand_auto_media(const char *html, const char *base_directory);
 #ifdef __cplusplus
 }
 #endif

data/ext/apex_ext/apex_src/src/plugins_remote.c

@@ -37,7 +37,7 @@ void apex_remote_free_plugins(apex_remote_plugin_list *list) {
 }
 
 /* Fetch JSON from a URL using curl. Returns malloc'd buffer or NULL. */
-static char *apex_remote_fetch_json(const char *url) {
+char *apex_remote_fetch_json(const char *url) {
     if (!url) return NULL;
     /* Use curl -fsSL to fail on HTTP errors and be quiet except for data. */
     char cmd[1024];
@@ -85,7 +85,7 @@ static char *apex_remote_fetch_json(const char *url) {
 /* Very small JSON helper: extract string value for a key from an object snippet.
  * Assumes JSON is well-formed and keys/values are double-quoted.
  */
-static char *apex_remote_extract_string(const char *obj, const char *key) {
+char *apex_remote_extract_string(const char *obj, const char *key) {
     if (!obj || !key) return NULL;
     char pattern[128];
     snprintf(pattern, sizeof(pattern), "\"%s\"", key);
@@ -114,15 +114,11 @@ static char *apex_remote_extract_string(const char *obj, const char *key) {
     return out;
 }
 
-/* Parse a very small subset of JSON: { \"plugins\": [ { ... }, { ... } ] } */
-static apex_remote_plugin_list *apex_remote_parse_directory(const char *json) {
-    if (!json) return NULL;
-    const char *plugins_key = "\"plugins\"";
-    const char *p = strstr(json, plugins_key);
-    if (!p) {
-        fprintf(stderr, "Error: plugin directory JSON missing \"plugins\" key.\n");
-        return NULL;
-    }
+/* Parse array of objects from JSON; array_key is e.g. "\"plugins\"" or "\"filters\"" */
+static apex_remote_plugin_list *apex_remote_parse_array(const char *json, const char *array_key) {
+    if (!json || !array_key) return NULL;
+    const char *p = strstr(json, array_key);
+    if (!p) return NULL;
     p = strchr(p, '[');
     if (!p) return NULL;
     p++; /* move past '[' */
@@ -195,6 +191,27 @@ static apex_remote_plugin_list *apex_remote_parse_directory(const char *json) {
     return list;
 }
 
+/* Parse { \"plugins\": [ ... ] } */
+static apex_remote_plugin_list *apex_remote_parse_directory(const char *json) {
+    if (!json) return NULL;
+    if (!strstr(json, "\"plugins\"")) {
+        fprintf(stderr, "Error: plugin directory JSON missing \"plugins\" key.\n");
+        return NULL;
+    }
+    return apex_remote_parse_array(json, "\"plugins\"");
+}
+
+/* Parse { \"filters\": [ ... ] } - same shape as plugins (id, title, description, author, homepage, repo) */
+static apex_remote_plugin_list *apex_remote_parse_filters_directory(const char *json) {
+    if (!json) return NULL;
+    const char *p = strstr(json, "\"filters\"");
+    if (!p) {
+        fprintf(stderr, "Error: filter directory JSON missing \"filters\" key.\n");
+        return NULL;
+    }
+    return apex_remote_parse_array(json, "\"filters\"");
+}
+
 /* Public helpers used by CLI */
 
 apex_remote_plugin_list *apex_remote_fetch_directory(const char *url) {
@@ -205,11 +222,20 @@ apex_remote_plugin_list *apex_remote_fetch_directory(const char *url) {
     return list;
 }
 
+apex_remote_plugin_list *apex_remote_fetch_filters_directory(const char *url) {
+    char *json = apex_remote_fetch_json(url);
+    if (!json) return NULL;
+    apex_remote_plugin_list *list = apex_remote_parse_filters_directory(json);
+    free(json);
+    return list;
+}
+
 void apex_remote_print_plugins_filtered(apex_remote_plugin_list *list,
                                         const char **installed_ids,
-                                        size_t installed_count) {
+                                        size_t installed_count,
+                                        const char *noun) {
     if (!list || !list->head) {
-        fprintf(stderr, "No plugins found in remote directory.\n");
+        fprintf(stderr, "No %s found in remote directory.\n", noun ? noun : "plugins");
         return;
     }
     for (apex_remote_plugin *p = list->head; p; p = p->next) {
@@ -243,7 +269,7 @@ void apex_remote_print_plugins_filtered(apex_remote_plugin_list *list,
 }
 
 void apex_remote_print_plugins(apex_remote_plugin_list *list) {
-    apex_remote_print_plugins_filtered(list, NULL, 0);
+    apex_remote_print_plugins_filtered(list, NULL, 0, NULL);
 }
 
 apex_remote_plugin *apex_remote_find_plugin(apex_remote_plugin_list *list, const char *id) {

data/ext/apex_ext/apex_src/tests/CMakeLists.txt

@@ -5,6 +5,7 @@ add_executable(test_runner
     test_helpers.c
     test_runner.c
     test_basic.c
+    test_cmark_callback.c
     test_metadata.c
     test_links.c
     test_tables.c

data/ext/apex_ext/apex_src/tests/README.md

@@ -85,22 +85,28 @@ Notes:
     - Depth control
     - Nested structure
 
-14. **HTML Markdown Attributes** (9 tests) ✨ NEW
+14. **Terminal Output** (12 tests)
+    - ANSI terminal and terminal256 format
+    - List markers (bullet and ordered, default list_marker styling)
+    - terminal_width option (library)
+    - Optional script: `./tests/terminal_width_test.sh` checks CLI `--width` wrapping
+
+15. **HTML Markdown Attributes** (9 tests) ✨ NEW
     - markdown="1", "block", "span", "0"
     - Nested HTML parsing
 
-15. **Abbreviations** (4 tests) ✨ NEW
+16. **Abbreviations** (4 tests) ✨ NEW
     - Definition syntax (partial support)
 
-16. **Emoji** (10 tests) ✨ NEW
+17. **Emoji** (10 tests) ✨ NEW
     - 350+ GitHub emoji
     - Unknown emoji handling
 
-17. **Special Markers** (7 tests) ✨ NEW
+18. **Special Markers** (7 tests) ✨ NEW
     - Page breaks, pauses
     - End-of-block markers
 
-18. **Advanced Footnotes** (3 tests) ✨ NEW
+19. **Advanced Footnotes** (3 tests) ✨ NEW
     - Basic and inline footnotes
     - Markdown in footnotes
 

data/ext/apex_ext/apex_src/tests/fixtures/comprehensive_test.md

@@ -193,8 +193,6 @@ Use `^^` to merge cells vertically (rowspan):
 
 #### Combined Spans Example
 
-This table combines both rowspan and colspan features, as well as per-cell alignment:
-
 [Employee Performance Q4 2025]
 
 | Department  | Employee | Q1-Q2 Average | Q3  | Q4    | Overall |
@@ -257,6 +255,19 @@ CommonMark
 
   And more!
 
+**With blank lines:** A term can have blank lines before the first definition and between definitions:
+
+Glossary
+: First meaning of the term.
+
+: Second meaning, after a blank line.
+
+**One-line format:**
+
+key::value
+
+abbrev :: expanded form
+
 ## Critic Markup
 
 Here's some text with {++additions++} and {--deletions--}.

data/ext/apex_ext/apex_src/tests/fixtures/filters/filter_output_with_rawblock.json

@@ -0,0 +1 @@
+{"pandoc-api-version":[1,23,1],"meta":{},"blocks":[{"t":"Header","c":[1,["",[],[]],[{"t":"Str","c":"UNWRAP FILTER"}]},{"t":"RawBlock","c":["html","<figure><p>&lt; <img src=\"image.png\" alt=\"Image\" /></p>\n</figure>\n"]}]}

data/ext/apex_ext/apex_src/tests/fixtures/filters/unwrap.md

@@ -0,0 +1,7 @@
+# Unwrap filter
+
+What about this?
+
+::: >figure
+< ![Image](image.png)
+:::

data/ext/apex_ext/apex_src/tests/fixtures/images/auto-wildcard.md

@@ -0,0 +1,8 @@
+
+## Wildcard extension (*) - same as auto
+
+Using `*` as the extension (e.g. `![](image.*)`) is equivalent to `![](image.png)` with the `auto` attribute when base_directory is set.
+
+Apex scans for jpg, png, gif, webp, avif (1x, 2x, 3x) for images and mp4, webm, ogg, mov, m4v for videos.
+
+![Profile menu wildcard](img/app-pass-1-profile-menu.*)

data/ext/apex_ext/apex_src/tests/fixtures/images/media_formats_test.md

@@ -0,0 +1,63 @@
+# Media Format Handling - Images and Videos
+
+This fixture tests WebP, AVIF, and video format attributes for images and videos.
+
+## Images with WebP
+
+![Hero image](img/hero.png "Hero!" webp)
+
+## Images with AVIF
+
+![Hero AVIF](img/hero.png avif)
+
+## Images with WebP and @2x
+
+![Retina WebP](img/hero.png webp @2x)
+
+## Images with AVIF and @2x
+
+![Retina AVIF](img/hero.png avif @2x )
+
+## Images with both WebP and AVIF
+
+![Modern formats](img/banner.jpg webp avif)
+
+## Video - basic MP4
+
+![Demo video](media/demo.mp4)
+
+## Video - MP4 with WebM alternative
+
+![Demo with WebM](media/demo.mp4 webm)
+
+## Video - MP4 with OGG alternative
+
+![Demo with OGG](media/intro.mp4 ogg)
+
+## Video - WebM with MP4 fallback
+
+![WebM primary](media/clip.webm mp4)
+
+## Video - MOV format
+
+![QuickTime](assets/trailer.mov)
+
+## Video - M4V format
+
+![M4V](assets/sample.m4v)
+
+## Auto - discover formats from filesystem
+
+When `auto` is specified and base_directory is set, Apex discovers existing
+variants (2x, 3x, webp, avif for images; webm, ogg, mp4, mov, m4v for videos)
+and generates appropriate picture/video elements.
+
+![Profile menu](img/app-pass-1-profile-menu.jpg auto)
+
+## Wildcard extension (*) - same as auto
+
+Using `*` as the extension (e.g. `![](image.*)`) is equivalent to `![](image.png)` with the `auto` attribute when base_directory is set.
+
+Apex scans for jpg, png, gif, webp, avif (1x, 2x, 3x) for images and mp4, webm, ogg, mov, m4v for videos.
+
+![Profile menu wildcard](img/app-pass-1-profile-menu.*)

data/ext/apex_ext/apex_src/tests/fixtures/includes/data-semi.csv

@@ -0,0 +1,3 @@
+Name;Age;City
+Alice;30;New York
+Bob;25;San Francisco

data/ext/apex_ext/apex_src/tests/fixtures/includes/with space.txt

@@ -0,0 +1 @@
+Percent-decoded include works.

data/ext/apex_ext/apex_src/tests/fixtures/tables/inline_tables_test.md

@@ -35,4 +35,7 @@ delta\tepsilon\tzeta
 
 No data here; should be unchanged.
 
-
+<!--TABLE-->
+one,two,three four five
+:--,--:,--:
+1,23,245

data/ext/apex_ext/apex_src/tests/paginate_cli_test.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+# Sanity checks for -p/--paginate and paginate config option for terminal output.
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+APEX_BIN="${APEX_BIN:-$ROOT/build/apex}"
+
+if [[ ! -x "$APEX_BIN" ]]; then
+	echo "Error: $APEX_BIN not found or not executable. Set APEX_BIN or build first." >&2
+	exit 1
+fi
+
+DOC="# Heading
+
+Some *styled* text for testing."
+
+echo "== Testing --paginate with APEX_PAGER=cat =="
+
+BASE_OUT=$("$APEX_BIN" -t terminal <<< "$DOC")
+PAGED_OUT=$(APEX_PAGER=cat "$APEX_BIN" -t terminal --paginate <<< "$DOC")
+
+if [[ "$BASE_OUT" != "$PAGED_OUT" ]]; then
+	echo "paginate_cli_test: -p output differs from baseline when using APEX_PAGER=cat" >&2
+	exit 1
+fi
+
+echo "paginate_cli_test: -p with APEX_PAGER=cat matches baseline output."
+
+echo
+echo "== Testing paginate: true via config metadata with APEX_PAGER=cat =="
+
+TMPDIR="$(mktemp -d "${TMPDIR:-/tmp}/apex-paginate-XXXXXX")"
+trap 'rm -rf "$TMPDIR"' EXIT
+
+CFG="$TMPDIR/config.yml"
+cat >"$CFG" <<'YAML'
+paginate: true
+YAML
+
+CFG_OUT=$(APEX_PAGER=cat "$APEX_BIN" --meta-file "$CFG" -t terminal <<< "$DOC")
+
+if [[ "$BASE_OUT" != "$CFG_OUT" ]]; then
+	echo "paginate_cli_test: paginate: true output differs from baseline when using APEX_PAGER=cat" >&2
+	exit 1
+fi
+
+echo "paginate_cli_test: paginate: true config matches baseline output with APEX_PAGER=cat."
+
+echo
+echo "== Testing that --paginate is ignored for non-terminal formats =="
+
+HTML_BASE=$("$APEX_BIN" -t html <<< "$DOC")
+HTML_PAGED=$(APEX_PAGER=cat "$APEX_BIN" -t html --paginate <<< "$DOC")
+
+if [[ "$HTML_BASE" != "$HTML_PAGED" ]]; then
+	echo "paginate_cli_test: -p should be a no-op for -t html" >&2
+	exit 1
+fi
+
+echo "paginate_cli_test: -p ignored for non-terminal formats as expected."
+
+echo
+echo "All paginate CLI tests passed."
+

data/ext/apex_ext/apex_src/tests/terminal_width_test.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Sanity check that -t terminal --width N wraps output (CLI applies wrap after render).
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+APEX_BIN="${APEX_BIN:-$ROOT/build/apex}"
+
+if [[ ! -x "$APEX_BIN" ]]; then
+	echo "Error: $APEX_BIN not found or not executable. Set APEX_BIN or build first." >&2
+	exit 1
+fi
+
+# Long line without ANSI: with --width 10 we expect more than one line
+LONG="this is a long line of plain text that should wrap"
+OUT=$("$APEX_BIN" -t terminal --width 10 <<< "$LONG")
+LINES=$(echo "$OUT" | wc -l | tr -d ' ')
+if [[ "$LINES" -lt 2 ]]; then
+	echo "Expected --width 10 to wrap output into multiple lines, got $LINES line(s)" >&2
+	exit 1
+fi
+
+# With --width 80 the same line may stay on one line (or wrap less)
+OUT2=$("$APEX_BIN" -t terminal --width 80 <<< "$LONG")
+if [[ -z "$OUT2" ]]; then
+	echo "Expected non-empty output with --width 80" >&2
+	exit 1
+fi
+
+echo "terminal_width_test: --width wrapping OK"

data/ext/apex_ext/apex_src/tests/test-swift-package.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+
+cd "$ROOT"
+
+echo "=== Swift debug build ==="
+swift build
+
+echo "=== Swift release build ==="
+swift build -c release
+
+echo "Swift package OK."

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

@@ -0,0 +1,189 @@
+//
+// Created by Sbarex on 10/02/26.
+//
+
+#include "test_helpers.h"
+#include "apex/apex.h"
+#include <string.h>
+
+/* cmark-gfm headers */
+#include "cmark-gfm.h"
+#include "cmark-gfm-extension_api.h"
+#include "registry.h"
+#include <string.h>
+
+#include "render.h"
+#include "parser.h"
+
+#define DELIMITER ';'
+#define DELIMITER_STR ";"
+
+cmark_node_type CMARK_NODE_TEST;
+
+
+// Match function: search the pattern ;;...;;
+static cmark_node *match(__attribute__((unused)) cmark_syntax_extension *ext,
+                         cmark_parser *parser,
+                         __attribute__((unused)) cmark_node *parent,
+                         unsigned char character,
+                         cmark_inline_parser *inline_parser) {
+    cmark_node *res = NULL;
+    int left_flanking, right_flanking, punct_before, punct_after;
+    char buffer[101] = {0};
+
+    if (character != DELIMITER) {
+        return NULL;
+    }
+
+    int delims = cmark_inline_parser_scan_delimiters(
+        inline_parser, sizeof(buffer) - 1, DELIMITER,
+        &left_flanking,
+        &right_flanking, &punct_before, &punct_after);
+
+    memset(buffer, DELIMITER, delims);
+    buffer[delims] = 0;
+
+    res = cmark_node_new_with_mem(CMARK_NODE_TEXT, parser->mem);
+    cmark_node_set_literal(res, buffer);
+    res->start_line = res->end_line = cmark_inline_parser_get_line(inline_parser);
+    res->start_column = cmark_inline_parser_get_column(inline_parser) - delims;
+
+    if ((left_flanking || right_flanking) && delims == 2) {
+        cmark_inline_parser_push_delimiter(inline_parser, character, left_flanking,
+                                           right_flanking, res);
+    }
+
+    return res;
+}
+
+static delimiter *insert(cmark_syntax_extension *self, __attribute__((unused)) cmark_parser *parser,
+                         cmark_inline_parser *inline_parser, delimiter *opener,
+                         delimiter *closer) {
+    cmark_node *tmp, *next;
+    delimiter *delim, *tmp_delim;
+    delimiter *res = closer->next;
+
+    cmark_node *node = opener->inl_text;
+
+    if (opener->inl_text->as.literal.len != closer->inl_text->as.literal.len)
+        goto done;
+
+    if (!cmark_node_set_type(node, CMARK_NODE_TEST))
+        goto done;
+
+    cmark_node_set_syntax_extension(node, self);
+
+    tmp = cmark_node_next(opener->inl_text);
+
+    while (tmp) {
+        if (tmp == closer->inl_text)
+            break;
+        next = cmark_node_next(tmp);
+        cmark_node_append_child(node, tmp);
+        tmp = next;
+    }
+
+    node->end_column = closer->inl_text->start_column + closer->inl_text->as.literal.len - 1;
+    cmark_node_free(closer->inl_text);
+
+    done:
+      delim = closer;
+    while (delim != NULL && delim != opener) {
+        tmp_delim = delim->previous;
+        cmark_inline_parser_remove_delimiter(inline_parser, delim);
+        delim = tmp_delim;
+    }
+
+    cmark_inline_parser_remove_delimiter(inline_parser, opener);
+
+    return res;
+}
+
+// Renderer HTML
+static void html_render(__attribute__((unused)) cmark_syntax_extension *extension,
+                        __attribute__((unused)) cmark_html_renderer *renderer,
+                        __attribute__((unused)) cmark_node *node,
+                        cmark_event_type ev_type,
+                        __attribute__((unused)) int options) {
+    const bool entering = ev_type == CMARK_EVENT_ENTER;
+    if (entering) {
+        cmark_strbuf_puts(renderer->html, "<div class=\"custom\">");
+    } else {
+        cmark_strbuf_puts(renderer->html, "</div>");
+    }
+}
+
+// Function to get the namo the node
+static const char *get_type_string(__attribute__((unused)) cmark_syntax_extension *ext, cmark_node *node) {
+    return node->type == CMARK_NODE_TEST ? "my_test" : "<unknown>";
+}
+
+static int can_contain(__attribute__((unused)) cmark_syntax_extension *ext, cmark_node *node,
+                       cmark_node_type child_type) {
+    if (node->type != CMARK_NODE_TEST)
+        return false;
+
+    return CMARK_NODE_TYPE_INLINE_P(child_type);
+}
+
+cmark_syntax_extension *create_test_extension(void) {
+    cmark_syntax_extension *ext = cmark_syntax_extension_new("my_test");
+    cmark_llist *special_chars = NULL;
+
+    cmark_syntax_extension_set_get_type_string_func(ext, get_type_string);
+    cmark_syntax_extension_set_can_contain_func(ext, can_contain);
+    cmark_syntax_extension_set_html_render_func(ext, html_render);
+    CMARK_NODE_TEST = cmark_syntax_extension_add_node(1);
+
+    cmark_syntax_extension_set_match_inline_func(ext, match);
+    cmark_syntax_extension_set_inline_from_delim_func(ext, insert);
+
+    cmark_mem *mem = cmark_get_default_mem_allocator();
+    special_chars = cmark_llist_append(mem, special_chars, (void *)DELIMITER);
+    cmark_syntax_extension_set_special_inline_chars(ext, special_chars);
+
+    cmark_syntax_extension_set_emphasis(ext, 1);
+
+    return ext;
+}
+
+static int register_extra_extensions(cmark_plugin *plugin) {
+    cmark_plugin_register_syntax_extension(plugin, create_test_extension());
+    return 1;
+}
+
+static void my_cmark_init_callback(struct cmark_parser *parser, __attribute__((unused)) const apex_options *options, __attribute__((unused)) int cmark_opts, __attribute__((unused)) void *user_data) {
+    test_result(true, "Custom cmark init callback called");
+    cmark_register_plugin(register_extra_extensions);
+
+    cmark_syntax_extension *ext = cmark_find_syntax_extension("my_test");
+    if (ext) {
+        cmark_parser_attach_syntax_extension(parser, ext);
+        test_result(true, "Custom cmark extension named 'my_test' registered");
+    } else {
+        test_result(false, "Unable to find custom cmark extension named 'my_test'!");
+    }
+}
+
+static void my_cmark_done_callback(__attribute__((unused)) struct cmark_parser *parser, __attribute__((unused)) const apex_options *options, __attribute__((unused)) int cmark_opts, __attribute__((unused)) void *user_data) {
+    test_result(true, "Custom cmark done callback called");
+}
+
+void test_cmark_callback(void) {
+    int suite_failures = suite_start();
+    print_suite_title("Cmark Callbacks Tests", false, true);
+
+    apex_options opts = apex_options_default();
+    opts.cmark_init = my_cmark_init_callback;
+    opts.cmark_done = my_cmark_done_callback;
+
+    char *html;
+
+    const char *s = "#Custom cmark extension test\n\nHi " DELIMITER_STR DELIMITER_STR "this text must be highlighted" DELIMITER_STR DELIMITER_STR "!";
+    html = apex_markdown_to_html(s, strlen(s), &opts);
+    assert_contains(html, "<div class=\"custom\">", "Custom cmark extension");
+    apex_free_string(html);
+
+    bool had_failures = suite_end(suite_failures);
+    print_suite_title("Cmark Callbacks Tests", had_failures, false);
+}