apex-ruby 1.0.39 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f037626c97e2d9d1da593da4e5cfe66b74bac805d7bad91e8f5547ff676cb394
-  data.tar.gz: a1ef5604a103f328a970246606c4e9c79b2ea6ffece769532250da7499dc287d
+  metadata.gz: e6a2086248dff794040d84d718d1d68309370ba7e7c45fe49d4b2fcb1fc81754
+  data.tar.gz: 7810a4e7ff7eab5ef22ad8bc0c95ba5a22daeede9257f8ccd74bf27a51863bbc
 SHA512:
-  metadata.gz: b6f994047113301b183aa7529089d6342f6847ace386ceb281cd80675b5ef79afc6a7c423318357533c03102b24916e8b7e20405c750b903189674a2cb321380
-  data.tar.gz: 90101aea55503ce808d9cc4f6018c466ff9a03791deac096f4e13e85858536beb5abe6dabc7d90e89a0f2fe91b7fde7bdd9d054bc841d99b54fd45679b98d344
+  metadata.gz: 045ccea76529a5a5309049c5ca786a84927c573e5a69b9c24b230f4cf62868b4327a2fc3dd7123ee6d7410bc767e820a3265b3eb425a1fe00d5816c7cf8073d6
+  data.tar.gz: 1a573a1fe4be54962bfd8841742f86d74ed4271aab401420d17cbc7d8f0cc9f82af7211535be030786704bde6bce419ba3b00bcd93900a4838bf0a37e07ca493

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 41
-#define APEX_VERSION_STRING "1.1.41"
+#define APEX_VERSION_PATCH 46
+#define APEX_VERSION_STRING "1.1.46"
 
 /**
  * Processor compatibility modes

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

@@ -993,6 +993,17 @@ static bool extract_ial_from_paragraph(cmark_node *para, apex_attributes **attrs
     return extract_ial_from_text(text, attrs_out, alds);
 }
 
+/* Drop a softbreak or hard break that only separated a removed IAL. */
+static void ial_drop_break_before(cmark_node *node) {
+    cmark_node *prev = cmark_node_previous(node);
+    if (!prev) return;
+    cmark_node_type prev_type = cmark_node_get_type(prev);
+    if (prev_type == CMARK_NODE_SOFTBREAK || prev_type == CMARK_NODE_LINEBREAK) {
+        cmark_node_unlink(prev);
+        cmark_node_free(prev);
+    }
+}
+
 /**
  * Handle span-level IAL (inline elements with attributes)
  * Example: [Link](url){: .class} or ![Image](img){: #id}
@@ -1210,9 +1221,17 @@ static bool process_span_ial_in_container(cmark_node *container, ald_entry *alds
              * Content before IAL can be: a previous sibling (e.g. text + softbreak + IAL text node), or text before IAL in this node (e.g. single node "Text\n{: .lead }"). */
             bool has_preceding_content = (cmark_node_previous(child) != NULL) || (ial_start > text);
             if (container_type == CMARK_NODE_PARAGRAPH && has_preceding_content) {
-                /* IAL was at end of text - apply to paragraph (e.g. "Text\n{: .lead }" on one block) */
+                /* IAL was at end of text - apply to this paragraph (e.g. "Text\n{: .lead }" on one block).
+                 * Inside a blockquote, "> {: .class}" follows the paragraph, so the class stays on that paragraph.
+                 * On the list marker line, the IAL belongs to the item. A later paragraph inside the item keeps its own class. */
+                cmark_node *attr_node = container;
+                cmark_node *parent = cmark_node_parent(container);
+                if (parent && cmark_node_get_type(parent) == CMARK_NODE_ITEM &&
+                    cmark_node_first_child(parent) == container) {
+                    attr_node = parent;
+                }
                 char *attr_str = attributes_to_html(attrs);
-                cmark_node_set_user_data(container, attr_str);
+                cmark_node_set_user_data(attr_node, attr_str);
                 apex_free_attributes(attrs);
 
                 /* Remove the IAL from the text node */
@@ -1235,6 +1254,7 @@ static bool process_span_ial_in_container(cmark_node *container, ald_entry *alds
                             while (end >= new_text && isspace((unsigned char)*end)) *end-- = '\0';
                         }
                         if (strlen(new_text) == 0) {
+                            ial_drop_break_before(child);
                             cmark_node_unlink(child);
                             cmark_node_free(child);
                             free(new_text);
@@ -1244,6 +1264,7 @@ static bool process_span_ial_in_container(cmark_node *container, ald_entry *alds
                         }
                     }
                 } else {
+                    ial_drop_break_before(child);
                     cmark_node_unlink(child);
                     cmark_node_free(child);
                 }
@@ -1526,6 +1547,138 @@ static bool is_pure_ial_paragraph(cmark_node *para) {
  * Returns the node to free (if any), or NULL
  * Caller must free the returned node after iteration is complete
  */
+/* Copy attrs without one key="value" attribute. */
+static char *ial_attrs_without(const char *attrs, const char *name) {
+    size_t nlen = strlen(name);
+    char *out = malloc(strlen(attrs) + 1);
+    if (!out) return NULL;
+    char *write = out;
+    const char *p = attrs;
+    while (*p) {
+        while (*p && isspace((unsigned char)*p)) p++;
+        if (!*p) break;
+        const char *start = p;
+        bool drop = strncmp(p, name, nlen) == 0 && p[nlen] == '=' &&
+                    (p[nlen + 1] == '"' || p[nlen + 1] == '\'');
+        if (drop) {
+            char quote = p[nlen + 1];
+            p += nlen + 2;
+            while (*p && *p != quote) p++;
+            if (*p == quote) p++;
+            continue;
+        }
+        while (*p && !isspace((unsigned char)*p)) p++;
+        if (write != out) *write++ = ' ';
+        memcpy(write, start, (size_t)(p - start));
+        write += p - start;
+    }
+    *write = '\0';
+    return out;
+}
+
+/* True when an HTML block is only a closing tag (and comments), so a
+ * following IAL still belongs to the block before it. */
+static bool ial_html_is_closer_only(cmark_node *node) {
+    const char *html = cmark_node_get_literal(node);
+    if (!html) return false;
+    for (const char *p = html; *p; p++) {
+        if (*p == '<' && p[1] && p[1] != '/' && p[1] != '!' && p[1] != '?') {
+            return false;
+        }
+    }
+    return true;
+}
+
+/* Insert IAL attributes into the first opening tag of an HTML block.
+ * An existing class is extended instead of adding a second class attribute. */
+static char *ial_html_with_attrs(const char *html, const char *attrs) {
+    if (!html || !attrs || !*attrs) return NULL;
+
+    const char *tag = NULL;
+    for (const char *p = html; *p; p++) {
+        if (*p == '<' && p[1] && p[1] != '/' && p[1] != '!' && p[1] != '?') {
+            tag = p;
+            break;
+        }
+    }
+    if (!tag) return NULL;
+    const char *gt = strchr(tag, '>');
+    if (!gt) return NULL;
+
+    const char *class_at = NULL;
+    const char *class_val = NULL;
+    const char *class_end = NULL;
+    for (const char *p = tag + 1; p + 7 < gt; p++) {
+        if ((p == tag + 1 || isspace((unsigned char)p[-1])) && strncmp(p, "class=\"", 7) == 0) {
+            class_at = p;
+            class_val = p + 7;
+            class_end = memchr(class_val, '"', (size_t)(gt - class_val));
+            break;
+        }
+    }
+
+    const char *ial_class = NULL;
+    const char *ial_class_end = NULL;
+    const char *ial_at = strstr(attrs, "class=\"");
+    if (ial_at && (ial_at == attrs || isspace((unsigned char)ial_at[-1]))) {
+        ial_class = ial_at + 7;
+        ial_class_end = strchr(ial_class, '"');
+        if (!ial_class_end) ial_class = NULL;
+    }
+
+    char *extra = NULL;
+    char *merged_class = NULL;
+    if (class_at && class_end && ial_class) {
+        size_t old_len = (size_t)(class_end - class_val);
+        size_t add_len = (size_t)(ial_class_end - ial_class);
+        merged_class = malloc(old_len + add_len + 2);
+        if (!merged_class) return NULL;
+        memcpy(merged_class, class_val, old_len);
+        merged_class[old_len] = ' ';
+        memcpy(merged_class + old_len + 1, ial_class, add_len);
+        merged_class[old_len + 1 + add_len] = '\0';
+        extra = ial_attrs_without(attrs, "class");
+    } else {
+        extra = strdup(attrs);
+    }
+    if (!extra) {
+        free(merged_class);
+        return NULL;
+    }
+
+    size_t html_len = strlen(html);
+    size_t extra_len = strlen(extra);
+    size_t merged_len = merged_class ? strlen(merged_class) : 0;
+    char *out = malloc(html_len + extra_len + merged_len + 2);
+    if (!out) {
+        free(extra);
+        free(merged_class);
+        return NULL;
+    }
+    char *write = out;
+    if (merged_class && class_val && class_end) {
+        memcpy(write, html, (size_t)(class_val - html));
+        write += class_val - html;
+        memcpy(write, merged_class, merged_len);
+        write += merged_len;
+        memcpy(write, class_end, (size_t)(gt - class_end));
+        write += gt - class_end;
+    } else {
+        memcpy(write, html, (size_t)(gt - html));
+        write += gt - html;
+    }
+    if (extra_len > 0) {
+        *write++ = ' ';
+        memcpy(write, extra, extra_len);
+        write += extra_len;
+    }
+    memcpy(write, gt, html_len - (size_t)(gt - html) + 1);
+
+    free(extra);
+    free(merged_class);
+    return out;
+}
+
 static cmark_node *process_node_ial(cmark_node *node, ald_entry *alds) {
     if (!node) return NULL;
 
@@ -1570,30 +1723,34 @@ static cmark_node *process_node_ial(cmark_node *node, ald_entry *alds) {
         /* No span IAL found, fall through to check for next-line IAL */
     }
 
-    /* Only certain block types can have IAL after them */
+    /* Any block can take an IAL on the following line. */
     if (type != CMARK_NODE_HEADING &&
         type != CMARK_NODE_PARAGRAPH &&
         type != CMARK_NODE_BLOCK_QUOTE &&
         type != CMARK_NODE_CODE_BLOCK &&
         type != CMARK_NODE_LIST &&
         type != CMARK_NODE_ITEM &&
-        type != CMARK_NODE_TABLE) {  /* Tables can have IAL */
+        type != CMARK_NODE_TABLE &&
+        type != CMARK_NODE_THEMATIC_BREAK &&
+        type != CMARK_NODE_HTML_BLOCK) {
         return NULL;  /* No node to free */
     }
 
 
-    /* Look at next sibling(s) for IAL paragraph (skip over HTML blocks; cmark may put </div> between paragraph and IAL) */
+    /* A pure IAL paragraph is the marker, not a block that takes another IAL. */
+    if (type == CMARK_NODE_PARAGRAPH && is_pure_ial_paragraph(node)) {
+        return NULL;
+    }
+
+    /* Look at the next sibling for an IAL paragraph. A closing-tag HTML
+     * block can sit between a paragraph and its IAL. */
     cmark_node *next = cmark_node_next(node);
     if (!next) {
         return NULL;  /* No node to free */
     }
 
-    /* Skip HTML/custom blocks so we find a following IAL paragraph (e.g. paragraph, </div> html_block, {: .lead} paragraph) */
-    while (next) {
-        cmark_node_type next_type = cmark_node_get_type(next);
-        if (next_type != CMARK_NODE_HTML_BLOCK && next_type != CMARK_NODE_CUSTOM_BLOCK) {
-            break;
-        }
+    while (next && cmark_node_get_type(next) == CMARK_NODE_HTML_BLOCK &&
+           ial_html_is_closer_only(next)) {
         next = cmark_node_next(next);
     }
 
@@ -1605,10 +1762,18 @@ static cmark_node *process_node_ial(cmark_node *node, ald_entry *alds) {
     if (is_pure_ial_paragraph(next)) {
         apex_attributes *attrs = NULL;
         if (extract_ial_from_paragraph(next, &attrs, alds)) {
-            /* Store attributes in this node */
             char *attr_str = attributes_to_html(attrs);
-            cmark_node_set_user_data(node, attr_str);
             apex_free_attributes(attrs);
+            if (type == CMARK_NODE_HTML_BLOCK) {
+                const char *literal = cmark_node_get_literal(node);
+                char *merged = ial_html_with_attrs(literal, attr_str);
+                free(attr_str);
+                if (!merged) return NULL;
+                cmark_node_set_literal(node, merged);
+                free(merged);
+            } else {
+                cmark_node_set_user_data(node, attr_str);
+            }
 
             /* Return node to be unlinked and freed after iteration completes */
             /* Don't unlink here - that invalidates the iterator */
@@ -1642,6 +1807,14 @@ void apex_process_ial_in_tree(cmark_node *node, ald_entry *alds) {
             /* Process node and collect any nodes that need to be freed */
             cmark_node *node_to_free = process_node_ial(cur, alds);
             if (node_to_free) {
+                bool already_queued = false;
+                for (size_t i = 0; i < free_count; i++) {
+                    if (nodes_to_free[i] == node_to_free) {
+                        already_queued = true;
+                        break;
+                    }
+                }
+                if (already_queued) continue;
                 /* Expand array if needed */
                 if (free_count >= free_capacity) {
                     free_capacity = free_capacity ? free_capacity * 2 : 16;
@@ -2908,6 +3081,42 @@ static bool ial_append_verbatim(char **buf, char **write, size_t *remaining,
 /**
  * Preprocess markdown to extract image attributes and URL-encode all link URLs
  */
+/* Closing ')' of a link or image destination.
+ * Quotes hide parentheses, and unquoted '(' must be balanced, so a title
+ * like "Output options (Markdown)" does not end the destination early. */
+static const char *ial_destination_closer(const char *start) {
+    int depth = 1;
+    bool in_quote = false;
+    char quote = 0;
+    const char *p = start;
+
+    if (!start) return NULL;
+    while (*p && *p != '\n' && *p != '\r') {
+        if (in_quote) {
+            if (*p == '\\' && p[1]) {
+                p += 2;
+                continue;
+            }
+            if (*p == quote) in_quote = false;
+            p++;
+            continue;
+        }
+        if (*p == '"' || *p == '\'') {
+            in_quote = true;
+            quote = *p++;
+            continue;
+        }
+        if (*p == '(') {
+            depth++;
+        } else if (*p == ')') {
+            depth--;
+            if (depth == 0) return p;
+        }
+        p++;
+    }
+    return NULL;
+}
+
 char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_attrs, apex_mode_t mode) {
     if (!text) return NULL;
 
@@ -2976,12 +3185,10 @@ char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_
                 const char *attr_start = NULL;
                 const char *paren_end = NULL;
 
-                /* Find the closing paren first */
-                p = url_start;
-                while (*p && *p != ')' && *p != '\n') p++;
-                if (*p == ')') {
-                    paren_end = p;
-                } else {
+                /* Find the closing paren first. Parentheses inside a quoted
+                 * title, and balanced parentheses in the URL, do not count. */
+                paren_end = ial_destination_closer(url_start);
+                if (!paren_end) {
                     /* Malformed - skip just the ! and continue */
                     read = img_start + 1;
                     continue;
@@ -4064,12 +4271,13 @@ char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_
                 const char *url_end = NULL;
                 const char *paren_end = NULL;
 
-                /* Find the closing paren first */
-                while (*p && *p != ')' && *p != '\n') p++;
-                if (*p == ')') {
+                /* Find the closing paren first. A quoted title may contain
+                 * parentheses; stop at a newline when the destination never closes. */
+                paren_end = ial_destination_closer(url_start);
+                if (!paren_end) {
+                    p = url_start;
+                    while (*p && *p != '\n' && *p != '\r') p++;
                     paren_end = p;
-                } else {
-                    paren_end = p; /* End at newline or end of string */
                 }
 
                 /* Scan forward looking for titles: "title", 'title', or (title) */
@@ -4483,10 +4691,9 @@ char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_
                                 const char *attr_start = NULL;
                                 const char *paren_end = NULL;
 
-                                /* Find closing paren */
-                                while (*p && *p != ')' && *p != '\n') p++;
-                                if (*p == ')') {
-                                    paren_end = p;
+                                /* Find closing paren, skipping parentheses inside quotes. */
+                                paren_end = ial_destination_closer(url_start);
+                                if (paren_end) {
                                     p = url_start;
 
                                     /* Look for attributes */

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

@@ -350,6 +350,7 @@ typedef struct {
     int strong_count;
     int emph_count;
     int code_inline_count;
+    int hr_count;
 } element_counters;
 
 /**
@@ -482,6 +483,7 @@ static void collect_nodes_with_attrs_recursive(cmark_node *node, attr_node **lis
     else if (type == CMARK_NODE_LIST) elem_idx = counters->list_count++;
     else if (type == CMARK_NODE_ITEM) elem_idx = counters->item_count++;
     else if (type == CMARK_NODE_CODE_BLOCK) elem_idx = counters->code_count++;
+    else if (type == CMARK_NODE_THEMATIC_BREAK) elem_idx = counters->hr_count++;
     /* Inline elements need indices too - each type has its own counter */
     else if (type == CMARK_NODE_LINK) elem_idx = counters->link_count++;
     else if (type == CMARK_NODE_IMAGE) elem_idx = counters->image_count++;
@@ -623,6 +625,9 @@ char *apex_render_html_with_attributes(cmark_node *document, int options) {
             } else if (tag_len == 2 && memcmp(tag_start, "li", 2) == 0) {
                 elem_type = CMARK_NODE_ITEM;
                 elem_idx = html_counters.item_count++;
+            } else if (tag_len == 2 && memcmp(tag_start, "hr", 2) == 0) {
+                elem_type = CMARK_NODE_THEMATIC_BREAK;
+                elem_idx = html_counters.hr_count++;
             } else if (tag_len == 3 && memcmp(tag_start, "pre", 3) == 0) {
                 elem_type = CMARK_NODE_CODE_BLOCK;
                 elem_idx = html_counters.code_count++;
@@ -776,13 +781,19 @@ char *apex_render_html_with_attributes(cmark_node *document, int options) {
                     }
                     html_fingerprint[fp_idx] = '\0';
                 } else {
-                    /* For block elements, extract text content */
+                    /* For block elements, extract text content.
+                     * Paragraph attributes are fingerprinted from the first text
+                     * node, which ends at a softbreak, so stop at the first newline. */
                     const char *content_start = tag_name_end;
                     while (*content_start && *content_start != '>') content_start++;
                     if (*content_start == '>') content_start++;
 
                     const char *text_p = content_start;
                     while (*text_p && *text_p != '<' && fp_idx < 50) {
+                        if (elem_type == CMARK_NODE_PARAGRAPH &&
+                            (*text_p == '\n' || *text_p == '\r')) {
+                            break;
+                        }
                         html_fingerprint[fp_idx++] = *text_p++;
                     }
                     html_fingerprint[fp_idx] = '\0';

data/lib/apex/version.rb

@@ -6,7 +6,7 @@ module Apex
   # via Apex::Native.version.
   module Version
     # Current gem version.
-    VERSION = "1.0.39"
+    VERSION = "1.0.41"
   end
 
   # Shortcut to gem version string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apex-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.39
+  version: 1.0.41
 platform: ruby
 authors:
 - Brett Terpstra