apex-ruby 1.0.35 → 1.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b213f78349fcb6d156e9cae279f5f161f145001e4aebe8b1441813cdd2408e7d
-  data.tar.gz: 0255dcf57b9a66d64c5b264b786e388b305097e6461d34c7e33423ee88095510
+  metadata.gz: 70423c8b7b3f13723cfee24afc52bbf12c049950b241aee21e8f53dc3b971f4f
+  data.tar.gz: 1ea75f8a208a30aa92d886b4435d6bf246dbecb1d5fe627e87c3f211dcb9f656
 SHA512:
-  metadata.gz: 554d9a71943f8e42901269a03c7ba3f20e3d1b3ff5a9122e70d1ecc0c23544b0d47472829be3bce9fb31d39e589547d4f0cd5a4f684805830f0366c5debd81a6
-  data.tar.gz: 127e6d7d384cca60b47331f0a2034be2a00ac37ffb78c0772802bc9f548f2622ee02cb6ddade0a8a5dc2a8b9d073a9e6bc607dc64623957ab367f27181f4dd90
+  metadata.gz: 35f0ff23c943b29e0cc7d73fd75a8d28304a7e8bcaf490705c60dcbfe97096b2357174e77270ec00abfda417a8f9dfc0d863682e56468619f40b1275d7eb7e80
+  data.tar.gz: 0aa1da7ad8a6d607b1b54467e25ef386e644a653221d2cf01abf7a0455571d6607340cb19b143ae718344ec2ce660ddf9480155cc0be5cfb3ee198b9913f6e99

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 37
-#define APEX_VERSION_STRING "1.1.37"
+#define APEX_VERSION_PATCH 39
+#define APEX_VERSION_STRING "1.1.39"
 
 /**
  * Processor compatibility modes

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

@@ -140,8 +140,11 @@ static int parse_pandoc_citation(const char *text, int pos, int len,
     char *suffix = NULL;
     char *key = NULL;
 
-    /* Check for @key (author-in-text, no brackets) */
-    if (*p == '@') {
+    /* Check for @key (author-in-text, no brackets).
+     * Same boundary as the early-out scan: start of text, whitespace, or '('.
+     * Mid-token '@' (ah-original@2x.png, user@example.com) is not a citation. */
+    if (*p == '@' &&
+        (p == text || isspace((unsigned char)p[-1]) || p[-1] == '(')) {
         p++;
         int key_len = extract_citation_key(text, apex_ptrdiff_to_int(p - text), len, &key);
         if (key_len > 0 && key) {

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

@@ -364,6 +364,32 @@ static header_item *collect_headers(cmark_node *node, header_item **tail,
     return headers;
 }
 
+typedef struct {
+    char *data;
+    size_t length;
+    size_t capacity;
+    bool failed;
+} toc_buffer;
+
+static void toc_buffer_append(toc_buffer *buf, const char *str) {
+    if (buf->failed || !str) return;
+    size_t len = strlen(str);
+    if (buf->length + len + 1 > buf->capacity) {
+        size_t capacity = buf->capacity ? buf->capacity : 4096;
+        while (buf->length + len + 1 > capacity) capacity *= 2;
+        char *grown = realloc(buf->data, capacity);
+        if (!grown) {
+            buf->failed = true;
+            return;
+        }
+        buf->data = grown;
+        buf->capacity = capacity;
+    }
+    memcpy(buf->data + buf->length, str, len);
+    buf->length += len;
+    buf->data[buf->length] = '\0';
+}
+
 /**
  * Generate TOC HTML from headers
  * Produces valid ul > li > ul nesting (nested lists inside list items)
@@ -371,81 +397,64 @@ static header_item *collect_headers(cmark_node *node, header_item **tail,
 static char *generate_toc_html(header_item *headers, int min_level, int max_level) {
     if (!headers) return strdup("");
 
-    size_t capacity = 4096;
-    char *html = malloc(capacity);
-    if (!html) return strdup("");
+    toc_buffer buf = {0};
+    /* depth: open <ul> elements. level_at[d] is the shallowest heading level
+     * listed at depth d. A deeper heading nests one level under the open <li>,
+     * however many heading levels it skips; headings at that same level stay
+     * siblings. */
+    int depth = 0;
+    int level_at[8] = {0};
+    bool li_open = false;
 
-    char *write = html;
-    size_t remaining = capacity;
-    int current_level = 0;
-    int last_level = 0;  /* normalized level of last item added (0 = none yet) */
-
-    #define APPEND(str) do { \
-        size_t len = strlen(str); \
-        if (len < remaining) { \
-            memcpy(write, str, len); \
-            write += len; \
-            remaining -= len; \
-        } \
-    } while(0)
-
-    APPEND("<nav class=\"toc\">\n");
+    toc_buffer_append(&buf, "<nav class=\"toc\">\n");
 
     for (header_item *h = headers; h; h = h->next) {
-        /* Skip headers outside min/max range */
         if (h->level < min_level || h->level > max_level) continue;
         int target_level = h->level - min_level + 1;
         if (target_level < 1) target_level = 1;
 
-        /* Going up: close </ul></li> for each level (nested ul inside parent li) */
-        while (current_level > target_level) {
-            APPEND("</ul>\n</li>\n");
-            current_level--;
-        }
-
-        /* Going down: open one <ul> inside the previous li before adding child.
-         * At root (current_level 0): only open one ul - never ul > ul.
-         * When going deeper: open exactly one ul per step - never ul > ul. */
-        while (current_level < target_level) {
-            if (current_level == 0) {
-                APPEND("<ul>\n");
-                current_level = 1;
-                break;
-            }
-            if (last_level > 0) {
-                APPEND("<ul>\n");
-                current_level++;
-                break;
-            } else {
-                break;  /* No parent li - add as direct child of root ul */
+        if (depth == 0) {
+            toc_buffer_append(&buf, "<ul>\n");
+            depth = 1;
+            level_at[depth] = target_level;
+        } else if (target_level > level_at[depth] && li_open && depth < 7) {
+            toc_buffer_append(&buf, "<ul>\n");
+            depth++;
+            level_at[depth] = target_level;
+            li_open = false;
+        } else {
+            while (depth > 1 && target_level <= level_at[depth - 1]) {
+                if (li_open) toc_buffer_append(&buf, "</li>\n");
+                toc_buffer_append(&buf, "</ul>\n");
+                depth--;
+                li_open = true;
             }
+            if (li_open) toc_buffer_append(&buf, "</li>\n");
+            if (target_level < level_at[depth]) level_at[depth] = target_level;
         }
 
-        /* Close previous li when adding sibling (same or shallower level) */
-        if (last_level > 0 && target_level <= last_level) {
-            APPEND("</li>\n");
-        }
-
-        /* Add list item (leave open - may contain nested ul) */
-        char item[1024];
-        snprintf(item, sizeof(item), "<li><a href=\"#%s\">%s</a>",
-                 h->id, h->text);
-        APPEND(item);
-        last_level = target_level;
+        toc_buffer_append(&buf, "<li><a href=\"#");
+        toc_buffer_append(&buf, h->id);
+        toc_buffer_append(&buf, "\">");
+        toc_buffer_append(&buf, h->text);
+        toc_buffer_append(&buf, "</a>");
+        li_open = true;
     }
 
-    /* Close remaining: </li></ul> for each open level */
-    while (current_level > 0) {
-        APPEND("</li>\n</ul>\n");
-        current_level--;
+    while (depth > 0) {
+        if (li_open) toc_buffer_append(&buf, "</li>\n");
+        toc_buffer_append(&buf, "</ul>\n");
+        depth--;
+        li_open = depth > 0;
     }
 
-    APPEND("</nav>\n");
+    toc_buffer_append(&buf, "</nav>\n");
 
-    #undef APPEND
-
-    *write = '\0';
-    return html;
+    if (buf.failed || !buf.data) {
+        free(buf.data);
+        return strdup("");
+    }
+    return buf.data;
 }
 
 void apex_toc_entries_free(apex_toc_entry *entries, size_t count) {

data/lib/apex/version.rb

@@ -6,7 +6,7 @@ module Apex
   # via Apex::Native.version.
   module Version
     # Current gem version.
-    VERSION = "1.0.35"
+    VERSION = "1.0.37"
   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.35
+  version: 1.0.37
 platform: ruby
 authors:
 - Brett Terpstra