apex-ruby 1.0.8 → 1.0.10

data/ext/apex_ext/apex_src/man/apex.1.md

@@ -77,6 +77,15 @@ Pagination is ignored when the output format is not a terminal format or when
 `-o/--output` is used to write to a file. You can also enable pagination via
 metadata or config by setting `paginate: true`.
 
+**--theme** *NAME*
+: Terminal theme name for **--to terminal** / **--to terminal256**. Themes are YAML files under `~/.config/apex/terminal/themes/` (see the Apex wiki).
+
+**--no-terminal-images**
+: Disable inline terminal rendering of Markdown images for **--to terminal** / **--to terminal256**. Default is to render when **stdout** is a TTY, a supported viewer exists on **PATH**, and inline images are enabled (see **METADATA CONTROL OF OPTIONS** for `terminal.inline_images`).
+
+**--terminal-image-width** *N*
+: Maximum width in character cells passed to the image viewer (default: 50). The first of **imgcat**, **chafa**, **viu**, **catimg** found on **PATH** is used, in that order. For `http://` and `https://` image URLs, Apex downloads with **curl** (60 second timeout, 10 MiB maximum size) to a file under **$TMPDIR** or `/tmp`, then displays it. If **curl** is missing, download fails, no viewer is found, **stdout** is not a TTY, or **--no-terminal-images** is set, images are emitted as styled link text and URL (like hyperlinks), not as Markdown `![alt](url)` syntax.
+
 **--code-highlight** *TOOL*
 : Use external tool for syntax highlighting of code blocks.
 *TOOL* must be **pygments** (or **p**, **pyg**), **skylighting**
@@ -141,6 +150,8 @@ output more accessible. Default: disabled.
 : Output format. One of:
 
 - **html** (default) - Rendered HTML
+- **xhtml** - Same as **html** with **`--xhtml`** (self-closing void tags). Alias; **`--xhtml`** remains valid.
+- **strict-xhtml** - Same as **html** with **`--strict-xhtml`** (polyglot XHTML when used with **--standalone**). Alias; **`--strict-xhtml`** remains valid.
 - **json**, **json-filtered**, **ast-json**, **ast** - JSON output (before or after filters)
 - **markdown**, **md**, **mmd**, **commonmark**, **cmark**, **kramdown**, **gfm** - Markdown variants
 - **terminal**, **cli**, **terminal256** - ANSI-colored output for TTYs and terminal emulators
@@ -616,6 +627,8 @@ directly.
 `id-format`, `base-dir`, `mode`, `wikilink-space`,
 `wikilink-extension`
 
+**Terminal output metadata** (for **--to terminal** / **terminal256**): `terminal.theme` (`terminal_theme`), `terminal.width` (`terminal_width`, wrap width), `terminal.inline_images` (`terminal_inline_images`, boolean), `terminal.image_width` (`terminal_image_width`, viewer width in character cells), `terminal.paginate` (`terminal_paginate`), `paginate`, `code-highlight`, `code-highlight-theme`.
+
 **Example YAML front matter:**
 ```
 ---

data/ext/apex_ext/apex_src/src/_README.md

@@ -1,5 +1,5 @@
 <!--README-->
-[![Version: <!--VER-->0.1.97<!--END VER-->](https://img.shields.io/badge/Version-<!--VER-->0.1.97<!--END VER-->-528c9e)](https://github.com/ApexMarkdown/apex/releases/latest) ![](https://img.shields.io/badge/CMake-064F8C?style=for-the-badge&logo=cmake&logoColor=white) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) <!--TESTS_BADGE-->![Tests passing 1475/1475](https://img.shields.io/badge/Tests-1475/1475-a5da78)<!--END TESTS_BADGE-->
+[![Version: <!--VER-->1.0.3<!--END VER-->](https://img.shields.io/badge/Version-<!--VER-->1.0.3<!--END VER-->-528c9e)](https://github.com/ApexMarkdown/apex/releases/latest) ![](https://img.shields.io/badge/CMake-064F8C?style=for-the-badge&logo=cmake&logoColor=white) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) <!--TESTS_BADGE-->![Tests passing 1502/1502](https://img.shields.io/badge/Tests-1502/1502-a5da78)<!--END TESTS_BADGE-->
 
 <!--GITHUB-->
 # Apex
@@ -121,10 +121,12 @@ one tool.
 - **Custom styling**: Link multiple external CSS files in standalone mode (use `--css` multiple times or comma-separated list)
 - **Syntax highlighting**: External syntax highlighting via Pygments, Skylighting, or Shiki with `--code-highlight` flag, includes automatic GitHub-style CSS in standalone mode
 - **Pretty-print**: Formatted HTML with proper indentation for readability
+- **XHTML output**: `--xhtml` writes void/empty elements in XML form (`<br />`, `<meta ... />`). `--strict-xhtml` adds polyglot XHTML document scaffolding when used with `--standalone` (XML declaration, XHTML namespace, `Content-Type` meta). You can also select the same behavior with `-t xhtml` or `-t strict-xhtml` (aliases for HTML output with those flags). In **fragment** mode, strict mode does not validate or repair all markup as XML—raw HTML can still be ill-formed; see the main README.
 - **Header ID generation**: Automatic or manual header IDs with multiple format options (GFM, MMD, Kramdown)
 - **Emoji-to-name conversion**: In GFM mode, emojis in headers are converted to their textual names in IDs (e.g., `# 😄 Support` → `id="smile-support"`), matching Pandoc's GFM behavior
 - **Header anchors**: Option to generate `<a>` anchor tags instead of header IDs
 - **ARIA accessibility**: Add ARIA labels and accessibility attributes (`--aria`) for better screen reader support, including aria-label on TOC navigation, role attributes on figures and tables, and aria-describedby linking tables to their captions
+- **Terminal inline images**: With `-t terminal` / `-t terminal256`, when stdout is a TTY and a viewer is available on `PATH`, Markdown images are rendered as inline terminal graphics (viewer order: `imgcat`, `chafa`, `viu`, `catimg`). Width is controlled with `--terminal-image-width` (default 50 character cells). HTTP(S) URLs are downloaded with `curl` (60s timeout, 10 MiB max) to a temp file under `TMPDIR` or `/tmp`. Use `--no-terminal-images` to always show images as styled link text plus URL instead. Metadata: `terminal.inline_images` / `terminal_inline_images`, `terminal.image_width` / `terminal_image_width`.
 
 ### Advanced Features
 

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

@@ -432,7 +432,7 @@ static const char *apex_detect_mime_type(const char *filepath) {
 /**
  * Resolve relative path from base directory
  */
-static char *apex_resolve_image_path(const char *filepath, const char *base_dir) {
+char *apex_resolve_local_image_path(const char *filepath, const char *base_dir) {
     if (!filepath) return NULL;
 
     /* If absolute path, return as-is */
@@ -556,7 +556,7 @@ static char *apex_embed_images(const char *html, const apex_options *options, co
 
                         if (!is_data_url && !is_remote && options->embed_images) {
                             /* Local image */
-                            char *resolved_path = apex_resolve_image_path(url, base_directory);
+                            char *resolved_path = apex_resolve_local_image_path(url, base_directory);
                             if (resolved_path) {
                                 struct stat st;
                                 if (stat(resolved_path, &st) == 0 && S_ISREG(st.st_mode)) {
@@ -2221,6 +2221,7 @@ static char *apex_preprocess_alpha_lists(const char *text) {
     char *write = output;
     size_t remaining = output_capacity;
     bool in_alpha_list = false;
+    size_t alpha_list_indent = 0;
     char expected_lower = 'a';
     char expected_upper = 'A';
     bool is_upper = false;
@@ -2238,6 +2239,7 @@ static char *apex_preprocess_alpha_lists(const char *text) {
         while (p < line_end && (*p == ' ' || *p == '\t')) {
             p++;
         }
+        size_t current_indent = (size_t)(p - line_start);
 
         /* Check if line starts with alpha marker */
         bool is_alpha_marker = false;
@@ -2262,7 +2264,7 @@ static char *apex_preprocess_alpha_lists(const char *text) {
             /* Check if this continues an existing alpha list */
             bool continues_list = false;
             if (in_alpha_list) {
-                if (alpha_is_upper == is_upper) {
+                if (alpha_is_upper == is_upper && current_indent == alpha_list_indent) {
                     if (alpha_is_upper) {
                         if (alpha_char == expected_upper) {
                             continues_list = true;
@@ -2279,6 +2281,7 @@ static char *apex_preprocess_alpha_lists(const char *text) {
                 /* Start new alpha list */
                 in_alpha_list = true;
                 is_upper = alpha_is_upper;
+                alpha_list_indent = current_indent;
                 item_number = 1;
                 blank_lines_since_alpha = 0;
                 if (alpha_is_upper) {
@@ -2341,6 +2344,9 @@ static char *apex_preprocess_alpha_lists(const char *text) {
                     if (blank_lines_since_alpha >= 2) {
                         in_alpha_list = false;
                     }
+                } else if (current_indent > alpha_list_indent) {
+                    /* Nested content inside current alpha list item; keep list open. */
+                    blank_lines_since_alpha = 0;
                 } else {
                     /* Check if it's a numbered list marker starting with "1." after blank lines */
                     bool had_blank_lines = (blank_lines_since_alpha > 0);
@@ -2397,6 +2403,110 @@ static char *apex_preprocess_alpha_lists(const char *text) {
     return output;
 }
 
+/**
+ * Insert a blank line before indented ordered sublists that directly follow
+ * a parent list item line, so they parse as nested <ol> blocks.
+ */
+static char *apex_preprocess_nested_ordered_sublists(const char *text) {
+    if (!text) return NULL;
+
+    size_t text_len = strlen(text);
+    size_t output_capacity = text_len * 2 + 1;
+    char *output = malloc(output_capacity);
+    if (!output) return NULL;
+
+    const char *read = text;
+    char *write = output;
+    size_t remaining = output_capacity;
+
+    bool prev_line_was_blank = true;
+    bool prev_line_was_list_item = false;
+    size_t prev_line_indent = 0;
+
+    while (*read) {
+        const char *line_start = read;
+        const char *line_end = strchr(read, '\n');
+        if (!line_end) line_end = read + strlen(read);
+        bool has_newline = (*line_end == '\n');
+
+        const char *p = line_start;
+        while (p < line_end && (*p == ' ' || *p == '\t')) p++;
+        size_t current_indent = (size_t)(p - line_start);
+
+        bool current_line_blank = (p >= line_end);
+        bool current_line_ordered_marker = false;
+        if (!current_line_blank && *p >= '0' && *p <= '9') {
+            const char *num_p = p;
+            while (num_p < line_end && *num_p >= '0' && *num_p <= '9') num_p++;
+            if (num_p < line_end && *num_p == '.' &&
+                (num_p + 1 >= line_end || num_p[1] == ' ' || num_p[1] == '\t')) {
+                current_line_ordered_marker = true;
+            }
+        }
+
+        bool current_line_list_item = false;
+        if (!current_line_blank) {
+            if (current_line_ordered_marker) {
+                current_line_list_item = true;
+            } else if ((*p == '-' || *p == '*' || *p == '+') &&
+                       (p + 1 >= line_end || p[1] == ' ' || p[1] == '\t')) {
+                current_line_list_item = true;
+            }
+        }
+
+        if (!prev_line_was_blank && prev_line_was_list_item &&
+            current_line_ordered_marker && current_indent > prev_line_indent) {
+            if (remaining < 1) {
+                size_t used = (size_t)(write - output);
+                size_t new_capacity = output_capacity * 2 + 64;
+                char *new_output = realloc(output, new_capacity);
+                if (!new_output) {
+                    free(output);
+                    return NULL;
+                }
+                output = new_output;
+                write = output + used;
+                remaining = new_capacity - used;
+                output_capacity = new_capacity;
+            }
+            *write++ = '\n';
+            remaining--;
+            prev_line_was_blank = true;
+        }
+
+        size_t line_len = (size_t)(line_end - line_start) + (has_newline ? 1 : 0);
+        if (remaining < line_len) {
+            size_t used = (size_t)(write - output);
+            size_t needed = used + line_len + 1;
+            size_t new_capacity = output_capacity;
+            while (new_capacity < needed) new_capacity *= 2;
+            char *new_output = realloc(output, new_capacity);
+            if (!new_output) {
+                free(output);
+                return NULL;
+            }
+            output = new_output;
+            write = output + used;
+            remaining = new_capacity - used;
+            output_capacity = new_capacity;
+        }
+
+        memcpy(write, line_start, line_len);
+        write += line_len;
+        remaining -= line_len;
+
+        prev_line_was_blank = current_line_blank;
+        prev_line_was_list_item = current_line_list_item;
+        prev_line_indent = current_indent;
+
+        read = line_end;
+        if (has_newline) read++;
+    }
+
+    *write = '\0';
+    return output;
+}
+
 /**
  * Post-process HTML to add style attributes to alpha lists
  * Finds HTML comments like <!-- apex-alpha-list-lower --> or <!-- apex-alpha-list-upper -->
@@ -2439,6 +2549,21 @@ static char *apex_postprocess_alpha_lists_html(const char *html) {
     /* Single-pass optimization: look for markers as we go */
     const char *read_start = read;  /* Track where we started reading from */
     while (*read) {
+        /* Drop any stray raw markers that did not form a standalone paragraph. */
+        if (strncmp(read, "[apex-alpha-list:lower]", 23) == 0 ||
+            strncmp(read, "[apex-alpha-list:upper]", 23) == 0) {
+            size_t copy_len = read - read_start;
+            ENSURE_SPACE(copy_len);
+            if (copy_len > 0) {
+                memcpy(write, read_start, copy_len);
+                write += copy_len;
+                remaining -= copy_len;
+            }
+            read += 23;
+            read_start = read;
+            continue;
+        }
+
         /* Check for marker patterns */
         if (read[0] == '<' && read[1] == 'p' && read[2] == '>' && read[3] == '[') {
             /* Potential marker start */
@@ -2685,6 +2810,9 @@ apex_options apex_options_default(void) {
 
     /* Enable all features by default in unified mode; plugins are opt-in */
     opts.enable_plugins = false;
+    opts.allow_external_plugin_detection = true;
+    opts.plugin_register = NULL;
+
     opts.enable_tables = true;
     opts.enable_footnotes = true;
     opts.enable_definition_lists = true;
@@ -2832,6 +2960,8 @@ apex_options apex_options_default(void) {
     opts.theme_name = NULL;
     opts.terminal_width = 0;
     opts.paginate = false;
+    opts.terminal_inline_images = true;
+    opts.terminal_image_width = 50;
 
     return opts;
 }
@@ -4359,9 +4489,9 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
     PROFILE_START(total);
 
     /* Use default options if none provided, and create a mutable copy */
-    apex_options default_opts;
     apex_options local_opts;
     if (!options) {
+        apex_options default_opts;
         default_opts = apex_options_default();
         local_opts = default_opts;
     } else {
@@ -4702,6 +4832,8 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
         }
     }
 
+    char *nested_ordered_sublists_processed = NULL;
+
     /* Process emoji autocorrect before parsing (preprocessing) */
     char *emoji_autocorrect_processed = NULL;
     if (options->enable_emoji_autocorrect && (options->mode == APEX_MODE_UNIFIED || options->mode == APEX_MODE_GFM)) {
@@ -5340,6 +5472,16 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
         text_ptr = liquid_protected;
     }
 
+    /* Keep this late so later preprocessors do not collapse inserted separation. */
+    if (options->mode == APEX_MODE_UNIFIED) {
+        PROFILE_START(nested_ordered_sublists);
+        nested_ordered_sublists_processed = apex_preprocess_nested_ordered_sublists(text_ptr);
+        PROFILE_END(nested_ordered_sublists);
+        if (nested_ordered_sublists_processed) {
+            text_ptr = nested_ordered_sublists_processed;
+        }
+    }
+
     /* Normalize input after ALL preprocessing: ensure it ends with a newline.
      * This is critical because various preprocessing steps (definition lists,
      * HTML markdown, critic markup, liquid protection) might remove the trailing
@@ -5894,8 +6036,10 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
         }
     }
 
-    /* Process TOC markers if enabled (Marked extensions) */
-    if (options->enable_marked_extensions && html) {
+    /* Process TOC markers if enabled (Marked extensions) or in MultiMarkdown mode.
+     * MultiMarkdown uses {{TOC}} syntax even when Marked extensions are disabled.
+     */
+    if ((options->enable_marked_extensions || options->mode == APEX_MODE_MULTIMARKDOWN) && html) {
         PROFILE_START(toc);
         char *with_toc = apex_process_toc(html, document, options->id_format);
         PROFILE_END(toc);
@@ -6099,6 +6243,7 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
     if (highlights_processed) free(highlights_processed);
     if (inserts_processed) free(inserts_processed);
     if (alpha_lists_processed) free(alpha_lists_processed);
+    if (nested_ordered_sublists_processed) free(nested_ordered_sublists_processed);
     if (relaxed_tables_processed) free(relaxed_tables_processed);
     if (headerless_tables_processed) free(headerless_tables_processed);
     if (table_captions_processed) free(table_captions_processed);