apex-ruby 1.0.30 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35c03e0851fc4ed201411e6ec0ac5636ef777f79660e3e7e7f8c407b4628c5a0
-  data.tar.gz: adb73b30adc188832d061028f36842baba138950f06338620f285601a1775ec6
+  metadata.gz: 89a42e9eb766a3bae89c288dad1c44f1f8db2adcc558053835c64a157359a49b
+  data.tar.gz: 12da83980eb83177a45bc3796df1d52e0e62edd9c3ff94974db77f02099fc90b
 SHA512:
-  metadata.gz: f7e1f3a167773acd203921bdc766b0df5d99ecf4144aedf9840ad4afb04f0b0dd8e823f9a207b1dd6d460cfa0abf2da5bf4ed28c2b235f6ad70391956c94ed80
-  data.tar.gz: 398ac1c545addf85a3a6f6635e6b4ebb51a227de53cd559a2086344cd01985db50668d8546ad74af1bbe45d407c0ecb4741ce1a719f8a3918cb6ecaa2a3121bf
+  metadata.gz: 1da4b9b6b8cf73e42f8034584975c8b11b9be7833c7e22bcb6dee7151f5426836edf8984c27dbaabc67e5e855d4cf092f4cd8b45d8fd7f87851c37ca448c53a9
+  data.tar.gz: 599ee35216be91ff2fa7cf1b981e8c6d7001744310f6ae463277068331317440cdeab9e8edbcd299ecd29e459ce5932004dbb3776eaeca200efdfe5ad3f11762

data/README.md

@@ -10,15 +10,9 @@ Query the underlying C library version with `Apex::Native.version`.
 
 ## Requirements
 
-Before installing the gem, you must have the **cmark-gfm** C library available on your system. The gem compiles a native extension that links against it.
+The gem compiles a native extension, so you need a C compiler (Xcode Command Line Tools on macOS, `build-essential` or equivalent on Linux). Apex's patched copy of [cmark-gfm](https://github.com/ApexMarkdown/cmark-gfm) is bundled and compiled into the extension; a system cmark-gfm is not needed and is not used.
 
-- **macOS (Homebrew):**  
-  ```sh
-  brew install cmark-gfm
-  ```
-- **Other platforms:** Install the `cmark-gfm` package for your distribution and ensure development headers and `pkg-config` are available. See [cmark-gfm](https://github.com/github/cmark-gfm) for build instructions.
-
-If you run `gem install apex-ruby` without cmark-gfm installed, the build will fail with a clear error message and the same installation instructions.
+libyaml is optional. If it is installed (e.g. `brew install libyaml`), Apex uses it for nested YAML front matter; otherwise it falls back to its simple key: value parser.
 
 ## Installation
 

data/apex-ruby.gemspec

@@ -13,15 +13,26 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 3.0'
 
+  # Only the tracked Apex and cmark-gfm sources the extension build needs;
+  # the rest of the apex checkout (tests, docs, build dirs, logs) stays out.
+  apex_src_dir = File.join(__dir__, 'ext', 'apex_ext', 'apex_src')
+  apex_src_pattern = %r{\A(?:LICENSE|include/.+\.(?:h|modulemap)|src/.+\.[ch]|PackageSupport/cmark-gfm/[^/]+\.h|
+                          vendor/cmark-gfm/(?:COPYING|src/[^/]+\.(?:c|h|inc)|extensions/[^/]+\.[ch]))\z}x
+  apex_src_files = Dir.chdir(apex_src_dir) do
+    tracked = `git ls-files -z --recurse-submodules 2>/dev/null`.split("\0")
+    tracked = Dir.glob('**/*') if tracked.empty?
+    tracked.grep(apex_src_pattern)
+  end
+
   spec.files = Dir.chdir(__dir__) do
     Dir[
       'README.md',
       'apex-ruby.gemspec',
       'lib/**/*.rb',
-      'ext/**/*.{c,h,rb}',
-      'ext/apex_ext/apex_src/**/*'
+      'ext/apex_ext/apex_ext.c',
+      'ext/apex_ext/extconf.rb'
     ]
-  end
+  end + apex_src_files.map { |f| "ext/apex_ext/apex_src/#{f}" }
 
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/apex_ext/extconf.rb']

data/ext/apex_ext/apex_src/include/apex/apex.h

@@ -21,8 +21,8 @@ typedef struct cmark_node cmark_node;
 
 #define APEX_VERSION_MAJOR 1
 #define APEX_VERSION_MINOR 1
-#define APEX_VERSION_PATCH 20
-#define APEX_VERSION_STRING "1.1.20"
+#define APEX_VERSION_PATCH 34
+#define APEX_VERSION_STRING "1.1.34"
 
 /**
  * Processor compatibility modes
@@ -271,6 +271,7 @@ typedef struct apex_options {
     bool enable_aria;  /* Add ARIA labels and accessibility attributes to HTML output */
 
     /* Emoji options */
+    bool enable_emoji;  /* Replace :name: with Unicode/image emoji (GFM/unified family by default) */
     bool enable_emoji_autocorrect;  /* Enable emoji name autocorrect (enabled by default in unified mode) */
 
     /* Syntax highlighting options */
@@ -359,6 +360,14 @@ apex_options apex_options_for_mode(apex_mode_t mode);
  */
 bool apex_options_apply_meta_file(apex_options *options, const char *path);
 
+/**
+ * Register cmark-gfm's core extensions once.
+ * cmark_gfm_core_extensions_ensure_registered() is not thread-safe: a second
+ * overlapping call aborts in cmark_register_node_flag. Marked converts on a
+ * concurrent queue, so every cmark entry point must go through this.
+ */
+void apex_ensure_cmark_extensions(void);
+
 /**
  * Main conversion function: Markdown to HTML
  *

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

@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <pthread.h>
 
 /* cmark-gfm headers */
 #include "cmark-gfm.h"
@@ -2510,6 +2511,48 @@ static char *apex_preprocess_nested_ordered_sublists(const char *text,
     return output;
 }
 
+/* cmark-gfm's tasklist scanner matches from the start of the physical line,
+ * so "> - [ ] item" (including callout bodies) is never recognized. Convert
+ * those items after parsing. */
+static void apex_fix_blockquote_tasklists(cmark_node *node, cmark_syntax_extension *tasklist_ext,
+                                          int blockquote_depth) {
+    if (!node || !tasklist_ext) return;
+
+    cmark_node_type type = cmark_node_get_type(node);
+    if (type == CMARK_NODE_BLOCK_QUOTE) {
+        blockquote_depth++;
+    } else if (type == CMARK_NODE_ITEM && blockquote_depth > 0 &&
+               cmark_node_get_syntax_extension(node) != tasklist_ext) {
+        cmark_node *para = cmark_node_first_child(node);
+        cmark_node *text = para && cmark_node_get_type(para) == CMARK_NODE_PARAGRAPH
+                               ? cmark_node_first_child(para) : NULL;
+        const char *lit = text && cmark_node_get_type(text) == CMARK_NODE_TEXT
+                              ? cmark_node_get_literal(text) : NULL;
+        if (lit && lit[0] == '[' && (lit[1] == ' ' || lit[1] == 'x' || lit[1] == 'X') &&
+            lit[2] == ']' && (lit[3] == ' ' || lit[3] == '\t' ||
+                              (lit[3] == '\0' && !cmark_node_next(text)))) {
+            bool checked = lit[1] != ' ';
+            const char *rest = lit + 3;
+            while (*rest == ' ' || *rest == '\t') rest++;
+            if (*rest) {
+                char *copy = strdup(rest);
+                if (copy) {
+                    cmark_node_set_literal(text, copy);
+                    free(copy);
+                }
+            } else {
+                cmark_node_free(text);
+            }
+            cmark_node_set_syntax_extension(node, tasklist_ext);
+            cmark_gfm_extensions_set_tasklist_item_checked(node, checked);
+        }
+    }
+
+    for (cmark_node *child = cmark_node_first_child(node); child; child = cmark_node_next(child)) {
+        apex_fix_blockquote_tasklists(child, tasklist_ext, blockquote_depth);
+    }
+}
+
 /* Force tight rendering for lists synthesized from nested ordered sublist fixes. */
 static void apex_tighten_nested_ordered_list_items(cmark_node *node) {
     if (!node) return;
@@ -3039,6 +3082,7 @@ apex_options apex_options_default(void) {
     opts.enable_aria = false;
 
     /* Emoji options */
+    opts.enable_emoji = true;  /* :name: replacement on by default (unified); modes may turn off */
     opts.enable_emoji_autocorrect = true;  /* Enabled by default in unified mode */
 
     /* Syntax highlighting options */
@@ -3127,6 +3171,7 @@ apex_options apex_options_for_mode(apex_mode_t mode) {
             opts.enable_autolink = false;  /* CommonMark: no autolinks */
             opts.enable_image_captions = false; /* CommonMark: no automatic image figure captions */
             opts.enable_citations = false;  /* CommonMark: no citations */
+            opts.enable_emoji = false;  /* CommonMark: no :name: emoji replacement */
             opts.enable_emoji_autocorrect = false;  /* CommonMark: no emoji autocorrect */
             /* Disable HTML markdown processing in strict CommonMark */
             opts.enable_markdown_in_html = false;
@@ -3164,6 +3209,7 @@ apex_options apex_options_for_mode(apex_mode_t mode) {
             opts.enable_autolink = true;  /* GFM: autolinks enabled */
             opts.enable_image_captions = false; /* GFM: no automatic image figure captions */
             opts.enable_citations = false;  /* GFM: no citations */
+            opts.enable_emoji = true;  /* GFM: :name: emoji replacement enabled */
             opts.enable_emoji_autocorrect = false;  /* GFM: no emoji autocorrect by default */
             /* Disable HTML markdown processing in GFM mode */
             opts.enable_markdown_in_html = false;
@@ -3203,6 +3249,7 @@ apex_options apex_options_for_mode(apex_mode_t mode) {
             opts.enable_mmark_index_syntax = false;  /* Disabled by default - use --indices to enable */
             opts.enable_textindex_syntax = false;  /* Disabled by default - use --indices to enable */
             opts.enable_leanpub_index_syntax = false;  /* Disabled by default - use --indices to enable */
+            opts.enable_emoji = false;  /* MMD: no :name: emoji replacement by default */
             opts.enable_emoji_autocorrect = false;  /* MMD: no emoji autocorrect by default */
             opts.enable_image_captions = true; /* MultiMarkdown: image captions enabled by default */
             break;
@@ -3240,6 +3287,7 @@ apex_options apex_options_for_mode(apex_mode_t mode) {
             opts.enable_strikethrough = false;  /* Kramdown: no strikethrough by default */
             opts.enable_autolink = true;  /* Kramdown: autolinks enabled */
             opts.enable_citations = false;  /* Kramdown: no citations (different system) */
+            opts.enable_emoji = false;  /* Kramdown: no :name: emoji replacement by default */
             opts.enable_emoji_autocorrect = false;  /* Kramdown: no emoji autocorrect by default */
             opts.enable_image_captions = false; /* Kramdown: no automatic image figure captions */
             break;
@@ -3266,6 +3314,7 @@ apex_options apex_options_for_mode(apex_mode_t mode) {
             opts.enable_quarto_callouts = false;  /* Unified default: off unless explicitly enabled */
             opts.enable_divs = true;  /* Unified: Pandoc fenced divs enabled */
             opts.enable_spans = true;  /* Unified: bracketed spans enabled */
+            opts.enable_emoji = true;  /* Unified: :name: emoji replacement enabled */
             opts.enable_emoji_autocorrect = true;  /* Unified: emoji autocorrect enabled */
             opts.enable_image_captions = true;     /* Unified: image captions enabled by default */
             break;
@@ -3443,12 +3492,18 @@ static int apex_to_cmark_options(const apex_options *options) {
     return cmark_opts;
 }
 
+/* One-time cmark-gfm core extension registration. Not thread-safe on its own. */
+void apex_ensure_cmark_extensions(void) {
+    static pthread_once_t once = PTHREAD_ONCE_INIT;
+    pthread_once(&once, cmark_gfm_core_extensions_ensure_registered);
+}
+
 /**
  * Register cmark-gfm extensions based on Apex options
  */
 static void apex_register_extensions(cmark_parser *parser, const apex_options *options) {
     /* Ensure core extensions are registered */
-    cmark_gfm_core_extensions_ensure_registered();
+    apex_ensure_cmark_extensions();
 
     /* Note: Metadata is handled via preprocessing, not as an extension */
 
@@ -5531,7 +5586,7 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
     char *html_markdown_processed = NULL;
     if (options->enable_markdown_in_html) {
         PROFILE_START(html_markdown);
-        html_markdown_processed = apex_process_html_markdown(text_ptr, img_attrs);
+        html_markdown_processed = apex_process_html_markdown(text_ptr, img_attrs, options);
         PROFILE_END(html_markdown);
         if (html_markdown_processed) {
             text_ptr = html_markdown_processed;
@@ -6032,6 +6087,10 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
         return NULL;
     }
 
+    if (options->enable_task_lists) {
+        apex_fix_blockquote_tasklists(document, cmark_find_syntax_extension("tasklist"), 0);
+    }
+
     /* If output format is JSON, emit JSON right after parsing (before AST filters) */
     if (options->output_format == APEX_OUTPUT_JSON) {
         char *json = apex_cmark_to_pandoc_json(document, options);
@@ -6098,7 +6157,7 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
 
     /* Postprocess callouts if enabled */
     if (options->enable_callouts) {
-        apex_process_callouts_in_tree(document, options->enable_py_callouts);
+        apex_process_callouts_in_tree(document, options->enable_py_callouts, cmark_opts);
     }
 
     /* Process IAL (Inline Attribute Lists) BEFORE manual header IDs.
@@ -6594,8 +6653,8 @@ char *apex_markdown_to_html(const char *markdown, size_t len, const apex_options
         }
     }
 
-    /* Replace GitHub emoji if in GFM or Unified mode */
-    if ((options->mode == APEX_MODE_GFM || apex_mode_is_unified_family(options->mode)) && html) {
+    /* Replace GitHub emoji if enabled (default on in GFM / unified family) */
+    if (options->enable_emoji && html) {
         PROFILE_START(emoji);
         char *with_emoji = apex_replace_emoji(html);
         PROFILE_END(emoji);

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

@@ -1704,12 +1704,10 @@ static void serialize_inline(terminal_buffer *buf,
                 }
 
                 /* Optionally replace :emoji: with Unicode for terminal output
-                 * when in GFM or unified mode, matching HTML behavior. */
+                 * when enable_emoji is set (default on in GFM / unified). */
                 const char *text_src = literal;
                 char *emoji_replaced = NULL;
-                if (options &&
-                    (options->mode == APEX_MODE_GFM ||
-                     apex_mode_is_unified_family(options->mode))) {
+                if (options && options->enable_emoji) {
                     emoji_replaced = apex_replace_emoji_text(literal);
                     if (emoji_replaced) {
                         text_src = emoji_replaced;

data/ext/apex_ext/apex_src/src/extensions/callouts.c

@@ -66,9 +66,13 @@ static const char *callout_type_name(callout_type_t type) {
 /**
  * Check if a blockquote is a Bear/Obsidian style callout
  * Pattern: > [!TYPE] Title or > [!TYPE]+ Title or > [!TYPE]- Title
+ *
+ * On success, *marker_len is the number of bytes at the start of the first
+ * text node taken up by the marker and the whitespace after it. Everything
+ * else on the marker line (including inline markup) is the title.
  */
 static bool is_bear_callout(cmark_node *blockquote, bool enable_py_callouts, callout_type_t *type,
-                            char **title, bool *collapsible, bool *default_open) {
+                            size_t *marker_len, bool *collapsible, bool *default_open) {
     if (cmark_node_get_type(blockquote) != CMARK_NODE_BLOCK_QUOTE) return false;
 
     /* Get first child (should be paragraph) */
@@ -96,14 +100,7 @@ static bool is_bear_callout(cmark_node *blockquote, bool enable_py_callouts, cal
                     *default_open = false;
                     const char *title_start = p + 1;
                     while (*title_start == ' ' || *title_start == '\t') title_start++;
-                    if (*title_start) {
-                        const char *title_end = strchr(title_start, '\n');
-                        if (title_end) {
-                            *title = strndup(title_start, title_end - title_start);
-                        } else {
-                            *title = strdup(title_start);
-                        }
-                    }
+                    *marker_len = (size_t)(title_start - text);
                     return true;
                 }
             }
@@ -138,106 +135,149 @@ static bool is_bear_callout(cmark_node *blockquote, bool enable_py_callouts, cal
         type_end++;
     }
 
-    /* Extract title (rest of the line after ] or +/-) */
     const char *title_start = type_end + 1;
     while (*title_start == ' ' || *title_start == '\t') title_start++;
+    *marker_len = (size_t)(title_start - text);
+
+    return true;
+}
+
+static bool is_line_break(cmark_node *node) {
+    cmark_node_type t = cmark_node_get_type(node);
+    return t == CMARK_NODE_SOFTBREAK || t == CMARK_NODE_LINEBREAK;
+}
+
+/**
+ * Move the inlines on the marker line out of the first paragraph and render
+ * them as the title HTML. Returns NULL when the marker line has no title.
+ */
+static char *extract_callout_title_html(cmark_node *para, int render_options) {
+    /* The HTML renderer dereferences a paragraph's parent, so render from a document */
+    cmark_node *title_doc = cmark_node_new(CMARK_NODE_DOCUMENT);
+    cmark_node *title_para = cmark_node_new(CMARK_NODE_PARAGRAPH);
+    if (!title_doc || !title_para || !cmark_node_append_child(title_doc, title_para)) {
+        if (title_para) cmark_node_free(title_para);
+        if (title_doc) cmark_node_free(title_doc);
+        return NULL;
+    }
+
+    cmark_node *child = cmark_node_first_child(para);
+    while (child && !is_line_break(child)) {
+        cmark_node *next = cmark_node_next(child);
+        cmark_node_append_child(title_para, child);
+        child = next;
+    }
+    if (child) {
+        cmark_node_free(child);
+    }
 
-    if (*title_start) {
-        /* Find end of line */
-        const char *title_end = strchr(title_start, '\n');
-        if (title_end) {
-            *title = strndup(title_start, title_end - title_start);
-        } else {
-            *title = strdup(title_start);
+    char *title = NULL;
+    if (cmark_node_first_child(title_para)) {
+        char *html = cmark_render_html(title_doc, render_options & ~CMARK_OPT_SOURCEPOS, NULL);
+        if (html) {
+            const char *start = html;
+            if (strncmp(start, "<p>", 3) == 0) start += 3;
+            const char *end = start + strlen(start);
+            while (end > start && isspace((unsigned char)end[-1])) end--;
+            if (end - start >= 4 && strncmp(end - 4, "</p>", 4) == 0) end -= 4;
+            while (end > start && isspace((unsigned char)end[-1])) end--;
+            while (start < end && isspace((unsigned char)*start)) start++;
+            if (end > start) {
+                title = strndup(start, (size_t)(end - start));
+            }
+            free(html);
         }
     }
 
-    return true;
+    cmark_node_free(title_doc);
+    return title;
 }
 
 /**
  * Convert blockquote to callout HTML
  */
 static void convert_blockquote_to_callout(cmark_node *blockquote, callout_type_t type,
-                                         const char *title, bool collapsible, bool default_open) {
+                                         size_t marker_len, bool collapsible, bool default_open,
+                                         int render_options) {
     const char *type_name = callout_type_name(type);
 
-    /* Build callout HTML */
-    char html_start[1024];
-    char html_end[256];
+    /* Strip the marker from the first text node, then lift the rest of the
+     * marker line into the title */
+    cmark_node *first_para = cmark_node_first_child(blockquote);
+    cmark_node *first_text = cmark_node_first_child(first_para);
+    const char *text = cmark_node_get_literal(first_text);
+    if (text && strlen(text) > marker_len) {
+        char *rest = strdup(text + marker_len);
+        if (rest) {
+            cmark_node_set_literal(first_text, rest);
+            free(rest);
+        }
+    } else {
+        cmark_node_free(first_text);
+    }
+
+    char *title = extract_callout_title_html(first_para, render_options);
+    if (!cmark_node_first_child(first_para)) {
+        cmark_node_free(first_para);
+    }
+
+    const char *title_html = title ? title : type_name;
+    size_t start_size = strlen(title_html) + 256;
+    char *html_start = malloc(start_size);
+    if (!html_start) {
+        free(title);
+        return;
+    }
+    const char *html_end;
 
     if (collapsible) {
-        snprintf(html_start, sizeof(html_start),
+        snprintf(html_start, start_size,
                 "<details class=\"callout callout-%s\"%s>\n<summary>%s</summary>\n<div class=\"callout-content\">\n",
-                type_name, default_open ? " open" : "", title ? title : type_name);
-        strcpy(html_end, "\n</div>\n</details>");
+                type_name, default_open ? " open" : "", title_html);
+        html_end = "\n</div>\n</details>";
     } else {
-        snprintf(html_start, sizeof(html_start),
+        snprintf(html_start, start_size,
                 "<div class=\"callout callout-%s\">\n<div class=\"callout-title\">%s</div>\n<div class=\"callout-content\">\n",
-                type_name, title ? title : type_name);
-        strcpy(html_end, "\n</div>\n</div>");
-    }
-
-    /* Get blockquote content (skip first paragraph with [!TYPE]) */
-    cmark_node *first_para = cmark_node_first_child(blockquote);
-    if (first_para) {
-        /* Remove the [!TYPE] line from first paragraph */
-        cmark_node *first_text = cmark_node_first_child(first_para);
-        if (first_text && cmark_node_get_type(first_text) == CMARK_NODE_TEXT) {
-            const char *text = cmark_node_get_literal(first_text);
-            if (text) {
-                /* Skip to content after the title line */
-                const char *newline = strchr(text, '\n');
-                if (newline && *(newline + 1)) {
-                    cmark_node_set_literal(first_text, newline + 1);
-                } else {
-                    /* Remove the text node entirely if it's just the [!TYPE] line */
-                    cmark_node_unlink(first_text);
-                    cmark_node_free(first_text);
-                }
-            }
-        }
+                type_name, title_html);
+        html_end = "\n</div>\n</div>";
     }
+    free(title);
 
-    /* Create HTML wrapper */
+    /* Wrap the blockquote; its content renders normally inside the wrapper */
     cmark_node *html_before = cmark_node_new(CMARK_NODE_HTML_BLOCK);
     cmark_node_set_literal(html_before, html_start);
+    free(html_start);
 
     cmark_node *html_after = cmark_node_new(CMARK_NODE_HTML_BLOCK);
     cmark_node_set_literal(html_after, html_end);
 
-    /* Insert HTML nodes */
     cmark_node_insert_before(blockquote, html_before);
     cmark_node_insert_after(blockquote, html_after);
-
-    /* Convert blockquote to div (we'll let the content render normally) */
-    /* Actually, we can just keep it as blockquote and wrap it */
 }
 
 /**
  * Process callouts in AST
  */
-void apex_process_callouts_in_tree(cmark_node *node, bool enable_py_callouts) {
+void apex_process_callouts_in_tree(cmark_node *node, bool enable_py_callouts, int render_options) {
     if (!node) return;
 
-    /* Check if current node is a blockquote callout */
     if (cmark_node_get_type(node) == CMARK_NODE_BLOCK_QUOTE) {
         callout_type_t type;
-        char *title = NULL;
+        size_t marker_len = 0;
         bool collapsible, default_open;
 
-        if (is_bear_callout(node, enable_py_callouts, &type, &title, &collapsible, &default_open)) {
-            convert_blockquote_to_callout(node, type, title, collapsible, default_open);
-            free(title);
-            return;  /* Don't recurse into modified node */
+        if (is_bear_callout(node, enable_py_callouts, &type, &marker_len, &collapsible, &default_open)) {
+            convert_blockquote_to_callout(node, type, marker_len, collapsible, default_open,
+                                          render_options);
         }
     }
 
-    /* Recursively process children */
+    /* Recurse into children, including converted callouts, so nested
+     * callouts (> > [!TYPE]) are converted too */
     cmark_node *child = cmark_node_first_child(node);
     while (child) {
         cmark_node *next = cmark_node_next(child);
-        apex_process_callouts_in_tree(child, enable_py_callouts);
+        apex_process_callouts_in_tree(child, enable_py_callouts, render_options);
         child = next;
     }
 }

data/ext/apex_ext/apex_src/src/extensions/callouts.h

@@ -38,9 +38,10 @@ typedef enum {
 } callout_type_t;
 
 /**
- * Process callouts in AST (postprocessing)
+ * Process callouts in AST (postprocessing). render_options are the cmark
+ * options used to render inline markup in callout titles.
  */
-void apex_process_callouts_in_tree(cmark_node *document, bool enable_py_callouts);
+void apex_process_callouts_in_tree(cmark_node *document, bool enable_py_callouts, int render_options);
 
 /**
  * Preprocess Python-Markdown callouts into Obsidian-style blockquotes.

data/ext/apex_ext/apex_src/src/extensions/citations.c

@@ -83,10 +83,10 @@ static int extract_citation_key(const char *text, int pos, int len, char **key_o
 
     /* If we started with {, skip past it */
     if (text[pos] == '{') {
-        return (p - text) - pos + 1;  /* +1 for closing } */
+        return apex_ptrdiff_to_int((p - text) - pos + 1);  /* +1 for closing } */
     }
 
-    return p - start;
+    return apex_ptrdiff_to_int(p - start);
 }
 
 /**
@@ -145,6 +145,19 @@ static int parse_pandoc_citation(const char *text, int pos, int len,
         p++;
         int key_len = extract_citation_key(text, apex_ptrdiff_to_int(p - text), len, &key);
         if (key_len > 0 && key) {
+            /* `@Name: …` in prose (iA Writer Annotations dumps) must not swallow
+             * the trailing colon into the key — that yields <!--CITE:Name:--> which
+             * emoji then corrupts, and leaves the rest of the line as orphan text. */
+            size_t key_strlen = strlen(key);
+            if (key_strlen > 0 && key[key_strlen - 1] == ':') {
+                const char *after_colon_key = p + key_len;
+                if (after_colon_key >= text + len ||
+                    isspace((unsigned char)*after_colon_key) ||
+                    isdigit((unsigned char)*after_colon_key)) {
+                    key[key_strlen - 1] = '\0';
+                    key_len--;
+                }
+            }
             if (options && options->enable_quarto_xrefs && apex_citation_key_is_quarto_xref(key)) {
                 free(key);
                 return 0;