apex-ruby 1.0.43 → 1.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa99154791a5f1be0a4beab63a0165635067fed9488a9326fb5191aecbf6d43c
-  data.tar.gz: 2a079dc8f17c2acf9fbda21bf6c84cc858ab4bc9e20487f811b7d900931ff3ea
+  metadata.gz: 8d77d8965ecbf89a0c4ddd71f80d3cd571befb6100237caed8ddbb818c1d279c
+  data.tar.gz: b9513bc2aa33e52fd347859e923b039cf205ff052c27ab07eedf08fe94d10e10
 SHA512:
-  metadata.gz: 37d89512a545e58f6936f538dbe3dffa37988fabeee0164e9a82ca212ac66f99b2ff65974a8c1b374dceb36b6f4e9e8365aaf48f29b9614709ce8612e5e291d7
-  data.tar.gz: 0c71583002c433c95043d06426cf04060747f47efadf4f8ab8a178f174f93b0d24bc092aa74abfb69118d3942ca240535af00d8fc82cfb03a3324d5591a5708a
+  metadata.gz: 30075af84e9c76146a51c0f43bbf5b2a90458cb342a957720d9d1d3214333b8063b7c2a3fcca92a99012e07e6899d51063d0703267b64a941f0d536a32a81407
+  data.tar.gz: 59b50d96ce5709e024d5f83f1d70ff961402c2759daa2b12978cd32f4f48d9e91f8fa9b417cdedcde03c8ffed18acf5027c40403f83bec57e4fd6539eee0425b

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 49
-#define APEX_VERSION_STRING "1.1.49"
+#define APEX_VERSION_PATCH 50
+#define APEX_VERSION_STRING "1.1.50"
 
 /**
  * Processor compatibility modes

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

@@ -9,6 +9,58 @@
 #include <stdbool.h>
 #include <ctype.h>
 
+/* Just past the closing ')' of a markdown link or image destination.
+ * Quotes hide parentheses. A newline means the destination is unclosed. */
+static const char *markdown_destination_end(const char *after_open_paren) {
+    int depth = 1;
+    bool in_quote = false;
+    char quote = 0;
+    const char *p = after_open_paren;
+
+    if (!p) 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 + 1;
+        }
+        p++;
+    }
+    return NULL;
+}
+
+static bool append_verbatim(char **output, char **write, size_t *remaining,
+                            size_t *capacity, const char *src, size_t len) {
+    if (len >= *remaining) {
+        size_t written = (size_t)(*write - *output);
+        *capacity = (written + len + 1) * 2;
+        char *grown = realloc(*output, *capacity);
+        if (!grown) return false;
+        *output = grown;
+        *write = grown + written;
+        *remaining = *capacity - written;
+    }
+    memcpy(*write, src, len);
+    *write += len;
+    *remaining -= len;
+    return true;
+}
+
 /** True if content at p looks like a list marker (- , * , + , or digit+. ) */
 static bool looks_like_list_marker(const char *p) {
     if (*p == '-' || *p == '*' || *p == '+')
@@ -60,6 +112,22 @@ char *apex_process_highlights(const char *text) {
             in_indented_code_block = line_is_indented_code_block(read);
         }
 
+        /* Copy markdown link/image destinations verbatim. Base64 padding
+         * is ==, which is not a highlight. */
+        if (!in_code_block && !in_inline_code && !in_indented_code_block &&
+            *read == ']' && read[1] == '(') {
+            const char *dest_end = markdown_destination_end(read + 2);
+            if (dest_end) {
+                size_t dest_len = (size_t)(dest_end - read);
+                if (!append_verbatim(&output, &write, &remaining, &capacity, read, dest_len)) {
+                    free(output);
+                    return NULL;
+                }
+                read = dest_end;
+                continue;
+            }
+        }
+
         /* Track fenced and inline code (skip highlighting inside them) */
         if (*read == '`') {
             if (read[1] == '`' && read[2] == '`') {

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

@@ -40,6 +40,58 @@ static const char *find_ial_after(const char *text, const char **ial_end) {
     return NULL;
 }
 
+/* Just past the closing ')' of a markdown link or image destination.
+ * Quotes hide parentheses. A newline means the destination is unclosed. */
+static const char *markdown_destination_end(const char *after_open_paren) {
+    int depth = 1;
+    bool in_quote = false;
+    char quote = 0;
+    const char *p = after_open_paren;
+
+    if (!p) 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 + 1;
+        }
+        p++;
+    }
+    return NULL;
+}
+
+static bool append_verbatim(char **output, char **write, size_t *remaining,
+                            size_t *capacity, const char *src, size_t len) {
+    if (len >= *remaining) {
+        size_t written = (size_t)(*write - *output);
+        *capacity = (written + len + 1) * 2;
+        char *grown = realloc(*output, *capacity);
+        if (!grown) return false;
+        *output = grown;
+        *write = grown + written;
+        *remaining = *capacity - written;
+    }
+    memcpy(*write, src, len);
+    *write += len;
+    *remaining -= len;
+    return true;
+}
+
 /**
  * If text starts an HTML tag (<name or </name), return a pointer just past its
  * closing '>' (quote-aware), or NULL. Gives up at a blank line outside quotes
@@ -87,6 +139,19 @@ char *apex_process_inserts(const char *text) {
     bool in_inline_code = false;
 
     while (*read) {
+        /* Copy markdown link/image destinations verbatim. A data URI's
+         * base64 contains ++, which is not an insert. */
+        if (!in_code_block && !in_inline_code && *read == ']' && read[1] == '(') {
+            const char *dest_end = markdown_destination_end(read + 2);
+            if (dest_end) {
+                size_t dest_len = (size_t)(dest_end - read);
+                if (!append_verbatim(&output, &write, &remaining, &capacity, read, dest_len))
+                    goto cleanup;
+                read = dest_end;
+                continue;
+            }
+        }
+
         /* Copy HTML tags verbatim so ++ inside attribute values (e.g. base64
          * data: URIs) is not converted */
         if (!in_code_block && !in_inline_code && *read == '<') {

data/lib/apex/version.rb

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