apex-ruby 1.0.33 → 1.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7293b4955edf88c3f7e4c94d8b53daf6e951100a954732ed6d4ec39d42e8c27d
-  data.tar.gz: 8e8c7770701a66d0ce072f9f19f4fe8e02a8d3b46d7a53d0837cee391089ec5b
+  metadata.gz: 55f4be7471b1a5d14cc4f772e5a92fed588dfa22f746d2ebc8417fb9b13758d7
+  data.tar.gz: 27aa2109e8bdad8f123f5cdfd6f7dee7a56947f4f47a06d653ca6fde9adf558c
 SHA512:
-  metadata.gz: eddc7cc1d61ff37d0e817c5329ca446a9d7b509c312ad6c74207bcde526e58c7896df3570d4ce395989782bf72a85ed103172b787e8b6296f583569639b4645a
-  data.tar.gz: 44e77a363487d9b97fafb8b98916d1879e6208c308e7585a368053002c81a829bfa11ecb005c25c55c8cfb4f2d6574444eea54eb01676014bde032c2679a3385
+  metadata.gz: e3d8fb224ae6eaebe856a9651319c806e3031d3720a7261c264063f8f0777dd522a8547175dfdd393bb83aafb1f5a7ad8b7ee7a49d18cdae9124f279051e7bf9
+  data.tar.gz: a60e981f839d51dae0b93e4e088ba43fe575800b951e85d97b35379af434a93ef968d84ebcab74e137dd916023682ff06b1023c4a14574a0224a720490054c88

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 35
-#define APEX_VERSION_STRING "1.1.35"
+#define APEX_VERSION_PATCH 36
+#define APEX_VERSION_STRING "1.1.36"
 
 /**
  * Processor compatibility modes
@@ -150,7 +150,7 @@ typedef struct apex_options {
     bool enable_grid_tables;  /* Enable Pandoc grid table syntax (preprocess to pipe tables) */
 
     /* Critic markup mode */
-    int critic_mode;  /* 0=markup (default), 1=accept, 2=reject */
+    int critic_mode;  /* 0=accept, 1=reject, 2=markup (default) */
 
     /* Metadata handling */
     bool strip_metadata;

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

@@ -113,6 +113,22 @@ static all_cell *collect_all_cells(cmark_node *document) {
 /**
  * Walk AST and collect cells with attributes
  */
+/* True when the cell whose opening tag starts at `cell` contains only `marker`
+ * (or `alt`), ignoring surrounding whitespace. */
+static bool cell_is_only_marker(const char *cell, const char *marker, const char *alt) {
+    bool is_th = strncmp(cell, "<th", 3) == 0;
+    const char *content = strchr(cell, '>');
+    if (!content) return false;
+    content++;
+    const char *end = strstr(content, is_th ? "</th>" : "</td>");
+    if (!end) return false;
+    while (content < end && isspace((unsigned char)*content)) content++;
+    while (end > content && isspace((unsigned char)end[-1])) end--;
+    size_t len = (size_t)(end - content);
+    if (len == strlen(marker) && strncmp(content, marker, len) == 0) return true;
+    return alt && len == strlen(alt) && strncmp(content, alt, len) == 0;
+}
+
 static cell_attr *collect_table_cell_attributes(cmark_node *document) {
     cell_attr *list = NULL;
 
@@ -181,8 +197,7 @@ static cell_attr *collect_table_cell_attributes(cmark_node *document) {
                         attr->attributes = strdup(attrs);
                         attr->cell_text = cell_text ? strdup(cell_text) : NULL;
                         attr->next = list;
-                        list = attr;
-                    }
+                        list = attr;                    }
                 }
                 /* Count all cells (including removed ones) to match the column indices
                  * used in advanced_tables.c when finding target cells for rowspan.
@@ -2076,41 +2091,9 @@ char *apex_inject_table_attributes(const char *html, cmark_node *document, int c
                 }
             }
 
-            /* Also check if this cell contains "^^" (rowspan marker) - these should be removed */
-            /* Check both the preview and the actual content in the HTML */
-            bool is_rowspan_marker = (strstr(cell_preview, "^^") != NULL);
-            if (!is_rowspan_marker) {
-                /* Also check the actual HTML content for "^^" */
-                const char *content_check = strstr(read, ">");
-                if (content_check) {
-                    const char *close_check = strstr(content_check + 1, "</td>");
-                    if (!close_check) close_check = strstr(content_check + 1, "</th>");
-                    if (close_check && close_check - content_check - 1 < 100) {
-                        char check_buf[100];
-                        strncpy(check_buf, content_check + 1, close_check - content_check - 1);
-                        check_buf[close_check - content_check - 1] = '\0';
-                        is_rowspan_marker = (strstr(check_buf, "^^") != NULL);
-                    }
-                }
-            }
-
-            /* Also check if this cell contains "<< " or "&lt;&lt;" (colspan marker) - these should be removed */
-            /* Check both the preview and the actual content in the HTML */
-            bool is_colspan_marker = (strstr(cell_preview, "<<") != NULL || strstr(cell_preview, "&lt;&lt;") != NULL);
-            if (!is_colspan_marker) {
-                /* Also check the actual HTML content for "<< " or "&lt;&lt;" */
-                const char *content_check = strstr(read, ">");
-                if (content_check) {
-                    const char *close_check = strstr(content_check + 1, "</td>");
-                    if (!close_check) close_check = strstr(content_check + 1, "</th>");
-                    if (close_check && close_check - content_check - 1 < 100) {
-                        char check_buf[100];
-                        strncpy(check_buf, content_check + 1, close_check - content_check - 1);
-                        check_buf[close_check - content_check - 1] = '\0';
-                        is_colspan_marker = (strstr(check_buf, "<<") != NULL || strstr(check_buf, "&lt;&lt;") != NULL);
-                    }
-                }
-            }
+            /* Cells holding only a span marker (^^ or <<) are removed */
+            bool is_rowspan_marker = cell_is_only_marker(read, "^^", NULL);
+            bool is_colspan_marker = cell_is_only_marker(read, "&lt;&lt;", "<<");
 
             /* Check if this cell should be removed:
              * 1. If it's matched and marked for removal

data/lib/apex/version.rb

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