apex-ruby 1.0.17 → 1.0.20

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

@@ -25,20 +25,41 @@ typedef enum {
     APEX_INDEX_LEANPUB = 2
 } apex_index_syntax_t;
 
+/* TextIndex cross-reference (see / see also) */
+typedef struct apex_index_xref {
+    char *target;                  /* Display path, e.g. "safety: of functions" */
+    bool also;                     /* true = see also; false = see */
+    bool inbound;                  /* @ / @+ inbound (applied to target entry) */
+    struct apex_index_xref *next;
+} apex_index_xref;
+
+/* TextIndex alias (#name / ##name) */
+typedef struct apex_index_alias {
+    char *name;                    /* alias id without '#' */
+    char *path;                    /* raw path, e.g. Apple (company)>"OS platforms" */
+    char *item;                    /* top-level heading (HTML) */
+    char *subitem;                 /* nested heading (HTML), optional */
+    char *display;                 /* "item: subitem" display form */
+    struct apex_index_alias *next;
+} apex_index_alias;
+
 /* Index entry structure */
 typedef struct apex_index_entry {
     char *item;                    /* Main index term */
     char *subitem;                 /* Sub-item (optional) */
     bool primary;                  /* Primary entry flag (mmark) */
+    bool suppress_locator;         /* TextIndex see-type mark: no locator */
     int position;                  /* Position in document */
     char *anchor_id;               /* Generated anchor ID (e.g., "idxref-0") */
     apex_index_syntax_t syntax_type;  /* MMARK or TEXTINDEX */
+    apex_index_xref *xrefs;        /* TextIndex see / see-also refs */
     struct apex_index_entry *next;  /* Linked list */
 } apex_index_entry;
 
 /* Index registry */
 typedef struct {
     apex_index_entry *entries;     /* Linked list of index entries */
+    apex_index_alias *aliases;     /* TextIndex aliases */
     size_t count;                  /* Number of entries */
     int next_ref_id;               /* Next reference ID for anchors */
 } apex_index_registry;
@@ -68,6 +89,13 @@ char *apex_generate_index_html(apex_index_registry *registry, const apex_options
  */
 char *apex_insert_index(const char *html, apex_index_registry *registry, const apex_options *options);
 
+/**
+ * Apply TextIndex concordance file(s): scan the document for column-1 patterns
+ * and insert [match]{^col2} marks. Returns a new string if any marks were added,
+ * or NULL if unchanged / no concordance files.
+ */
+char *apex_apply_concordance(const char *text, const apex_options *options);
+
 /**
  * Free index registry
  */

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

@@ -397,11 +397,51 @@ static apex_metadata_item *parse_yaml_metadata(const char *text, size_t *consume
  * Parse MultiMarkdown metadata
  * Format: key: value pairs at start of document, blank line to end
  */
+/* Undelimited MMD keys may contain letters, digits, spaces, hyphens, and
+ * underscores only. Other ASCII punctuation means the line is ordinary text. */
+static bool is_valid_mmd_metadata_key(const char *key) {
+    if (!key || !*key) return false;
+
+    for (const unsigned char *p = (const unsigned char *)key; *p; p++) {
+        if ((*p >= 'A' && *p <= 'Z') ||
+            (*p >= 'a' && *p <= 'z') ||
+            (*p >= '0' && *p <= '9') ||
+            *p == ' ' || *p == '-' || *p == '_') {
+            continue;
+        }
+        /* Allow UTF-8 bytes for non-ASCII keys; reject other ASCII punctuation. */
+        if (*p >= 0x80) continue;
+        return false;
+    }
+    return true;
+}
+
+/* Reject a sole long "Key: value" line that looks like a prose sentence. */
+#define APEX_MMD_SINGLE_LINE_MAX 100
+
 static apex_metadata_item *parse_mmd_metadata(const char *text, size_t *consumed) {
     apex_metadata_item *items = NULL;
     const char *line_start = text;
     const char *line_end;
     bool found_metadata = false;
+    size_t metadata_count = 0;
+    size_t sole_line_len = 0;
+
+    /* Any non-metadata content before/after key:value ends or rejects the block.
+     * Undelimited MMD metadata must start at the very top of the file. */
+    #define APEX_MMD_ABORT_OR_END() do { \
+        if (found_metadata) { \
+            if (metadata_count == 1 && sole_line_len > APEX_MMD_SINGLE_LINE_MAX) { \
+                apex_free_metadata(items); \
+                *consumed = 0; \
+                return NULL; \
+            } \
+            *consumed = line_start - text; \
+            return items; \
+        } \
+        *consumed = 0; \
+        return NULL; \
+    } while (0)
 
     while ((line_end = strchr(line_start, '\n')) != NULL) {
         size_t len = line_end - line_start;
@@ -411,244 +451,132 @@ static apex_metadata_item *parse_mmd_metadata(const char *text, size_t *consumed
         memcpy(line, line_start, len);
         line[len] = '\0';
 
-        /* Check for blank line (end of metadata) */
+        /* Check for blank line (end of metadata). A leading blank means the
+         * document does not start with undelimited MMD metadata. */
         char *trimmed = trim_whitespace(line);
         if (*trimmed == '\0') {
             if (found_metadata) {
+                if (metadata_count == 1 && sole_line_len > APEX_MMD_SINGLE_LINE_MAX) {
+                    apex_free_metadata(items);
+                    *consumed = 0;
+                    return NULL;
+                }
                 *consumed = (line_end + 1) - text;
                 return items;
             }
-            /* Skip leading blank lines */
-            line_start = line_end + 1;
-            continue;
+            *consumed = 0;
+            return NULL;
         }
 
-        /* Skip abbreviation definitions (*[abbr]: expansion or [>abbr]: expansion) */
+        /* Abbreviation definitions (*[abbr]: expansion or [>abbr]: expansion) */
         if ((trimmed[0] == '*' && trimmed[1] == '[') ||
             (trimmed[0] == '[' && trimmed[1] == '>')) {
-            /* This is an abbreviation, not metadata */
-            if (found_metadata) {
-                *consumed = line_start - text;
-                return items;
-            }
-            /* Haven't found metadata yet, skip this line */
-            line_start = line_end + 1;
-            continue;
+            APEX_MMD_ABORT_OR_END();
         }
 
-        /* Skip HTML comments (<!--...-->) */
+        /* HTML comments (<!--...-->) */
         if (strncmp(trimmed, "<!--", 4) == 0) {
-            /* This is an HTML comment, not metadata */
-            if (found_metadata) {
-                *consumed = line_start - text;
-                return items;
-            }
-            /* Haven't found metadata yet, skip this line */
-            line_start = line_end + 1;
-            continue;
+            APEX_MMD_ABORT_OR_END();
         }
 
-        /* Skip Kramdown markers ({::...}) */
+        /* Kramdown markers ({::...}) */
         if (strncmp(trimmed, "{::", 3) == 0) {
-            /* This is a Kramdown marker, not metadata */
-            if (found_metadata) {
-                *consumed = line_start - text;
-                return items;
-            }
-            /* Haven't found metadata yet, skip this line */
-            line_start = line_end + 1;
-            continue;
+            APEX_MMD_ABORT_OR_END();
         }
 
-        /* Skip Markdown headings (# or ##) */
+        /* Markdown headings (# or ##) */
         if (trimmed[0] == '#') {
-            /* This is a Markdown heading, not metadata */
-            if (found_metadata) {
-                *consumed = line_start - text;
-                return items;
-            }
-            /* Haven't found metadata yet, skip this line */
-            line_start = line_end + 1;
-            continue;
+            APEX_MMD_ABORT_OR_END();
         }
 
-        /* Skip IAL/ALD syntax ({: ...}) */
+        /* IAL/ALD syntax ({: ...}) */
         if (strncmp(trimmed, "{:", 2) == 0) {
-            /* This is IAL/ALD, not metadata */
-            if (found_metadata) {
-                *consumed = line_start - text;
-                return items;
-            }
-            /* Haven't found metadata yet, skip this line */
-            line_start = line_end + 1;
-            continue;
+            APEX_MMD_ABORT_OR_END();
         }
 
-        /* Skip Leanpub index syntax ({i: term}) - colon would be parsed as metadata key:value */
+        /* Leanpub index syntax ({i: term}) */
         if (strstr(trimmed, "{i:") != NULL) {
-            if (found_metadata) {
-                *consumed = line_start - text;
-                return items;
-            }
-            *consumed = 0;
-            return NULL;
+            APEX_MMD_ABORT_OR_END();
         }
 
-        /* Skip TOC markers ({{TOC...}}) */
+        /* TOC markers ({{TOC...}}) */
         if (strncmp(trimmed, "{{TOC", 5) == 0) {
-            /* This is a TOC marker, not metadata */
-            if (found_metadata) {
-                *consumed = line_start - text;
-                return items;
-            }
-            /* Haven't found metadata yet, skip this line */
-            line_start = line_end + 1;
-            continue;
+            APEX_MMD_ABORT_OR_END();
         }
 
-        /* Skip list markers (-, +, *, or numbered lists) */
-        /* Check if line starts with a list marker */
+        /* List markers (-, +, *, or numbered lists) */
         const char *list_check = trimmed;
         if (*list_check == '-' || *list_check == '+' || *list_check == '*') {
-            /* Check if followed by space (markdown list syntax) */
             if (list_check[1] == ' ' || list_check[1] == '\t') {
-                /* This is a list item, not metadata */
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
-                }
-                /* Haven't found metadata yet - this isn't metadata */
-                *consumed = 0;
-                return NULL;
+                APEX_MMD_ABORT_OR_END();
             }
         }
-        /* Check for numbered lists (digit followed by . or ) and space) */
         if (isdigit((unsigned char)*list_check)) {
             const char *p = list_check + 1;
-            /* Skip digits */
             while (isdigit((unsigned char)*p)) p++;
-            /* Check for . or ) followed by space */
             if ((*p == '.' || *p == ')') && (p[1] == ' ' || p[1] == '\t')) {
-                /* This is a numbered list item, not metadata */
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
-                }
-                /* Haven't found metadata yet - this isn't metadata */
-                *consumed = 0;
-                return NULL;
+                APEX_MMD_ABORT_OR_END();
             }
         }
 
         /* Parse key: value */
         char *colon = strchr(line, ':');
         if (colon) {
-            /* Skip lines that look like Markdown links or images (e.g. [text](url) or ![alt](url) or ...[](#){: .class })
-             * so that "[![...](#){: .class }" is not parsed as metadata due to the ": " in "{: " */
+            /* Markdown links/images */
             if (strstr(line, "[!") != NULL ||
                 (strchr(line, '[') && strchr(line, ']') && strstr(line, "]("))) {
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
-                }
-                *consumed = 0;
-                return NULL;
+                APEX_MMD_ABORT_OR_END();
             }
-            /* Check if there's a protocol (http://, https://, mailto:) BEFORE the colon */
-            /* If so, this is likely a URL in the key, not metadata */
+            /* Protocol / URL before the colon */
             size_t key_len = (size_t)(colon - line);
             if (key_len >= 7 && (
                 (key_len >= 7 && strncmp(line, "http://", 7) == 0) ||
                 (key_len >= 8 && strncmp(line, "https://", 8) == 0) ||
                 (key_len >= 7 && strncmp(line, "mailto:", 7) == 0) ||
                 strstr(line, "://") != NULL)) {
-                /* Protocol found before colon - this is a URL, not metadata */
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
-                }
-                *consumed = 0;
-                return NULL;
+                APEX_MMD_ABORT_OR_END();
             }
 
-            /* Check if there's a < character BEFORE the colon (HTML/autolink in key) */
+            /* HTML/autolink marker before the colon */
             if (memchr(line, '<', key_len) != NULL) {
-                /* < found before colon - this is HTML/autolink, not metadata */
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
-                }
-                *consumed = 0;
-                return NULL;
+                APEX_MMD_ABORT_OR_END();
             }
 
-            /* Check for space after colon (MMD requires "KEY: VALUE" format) */
+            /* Require space/tab after colon (MMD "KEY: VALUE"; also avoids URLs) */
             char *after_colon = colon + 1;
             if (*after_colon != ' ' && *after_colon != '\t') {
-                /* No space after colon - likely not metadata */
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
-                }
-                *consumed = 0;
-                return NULL;
+                APEX_MMD_ABORT_OR_END();
             }
 
             *colon = '\0';
             char *key = trim_whitespace(line);
             char *value = trim_whitespace(colon + 1);
 
-            if (*key && *value) {
+            if (*key && *value && is_valid_mmd_metadata_key(key)) {
                 add_metadata_item(&items, key, value);
                 found_metadata = true;
-            } else {
-                /* Line has colon but invalid key/value */
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
+                metadata_count++;
+                if (metadata_count == 1) {
+                    sole_line_len = len;
                 }
-                /* No metadata found yet - this isn't metadata */
-                *consumed = 0;
-                return NULL;
+            } else {
+                APEX_MMD_ABORT_OR_END();
             }
         } else {
-            /* No colon - check if line contains URLs (bare URLs without angle brackets) */
-            if (strstr(trimmed, "http://") || strstr(trimmed, "https://") || strstr(trimmed, "mailto:")) {
-                /* This is a bare URL, not metadata */
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
-                }
-                *consumed = 0;
-                return NULL;
-            }
-
-            /* Skip lines with Markdown links or images */
-            if (strchr(trimmed, '[') && strchr(trimmed, ']') && strchr(trimmed, '(')) {
-                /* Contains markdown link/image syntax - not metadata */
-                if (found_metadata) {
-                    *consumed = line_start - text;
-                    return items;
-                }
-                /* Haven't found metadata yet - this isn't metadata */
-                *consumed = 0;
-                return NULL;
-            }
-
-            /* Non-metadata line found (no colon) */
-            if (found_metadata) {
-                *consumed = line_start - text;
-                return items;
-            }
-            /* No metadata found yet and hit non-metadata line - stop */
-            *consumed = 0;
-            return NULL;
+            APEX_MMD_ABORT_OR_END();
         }
 
+        #undef APEX_MMD_ABORT_OR_END
+
         line_start = line_end + 1;
     }
 
     if (found_metadata) {
+        if (metadata_count == 1 && sole_line_len > APEX_MMD_SINGLE_LINE_MAX) {
+            apex_free_metadata(items);
+            *consumed = 0;
+            return NULL;
+        }
         *consumed = strlen(text);
     }
     return items;
@@ -2627,6 +2555,8 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
                     *options = apex_options_for_mode(APEX_MODE_KRAMDOWN);
                 } else if (strcmp(lower, "unified") == 0) {
                     *options = apex_options_for_mode(APEX_MODE_UNIFIED);
+                } else if (strcmp(lower, "quarto") == 0) {
+                    *options = apex_options_for_mode(APEX_MODE_QUARTO);
                 }
                 free(lower);
             }
@@ -2679,6 +2609,12 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
             } else if (is_false_value(value)) {
                 options->relaxed_tables = false;
             }
+        } else if (strcasecmp(key, "grid-tables") == 0 || strcasecmp(key, "grid_tables") == 0) {
+            if (is_true_value(value)) {
+                options->enable_grid_tables = true;
+            } else if (is_false_value(value)) {
+                options->enable_grid_tables = false;
+            }
         } else if (strcasecmp(key, "alpha-lists") == 0 || strcasecmp(key, "alpha_lists") == 0) {
             if (is_true_value(value)) {
                 options->allow_alpha_lists = true;
@@ -2757,6 +2693,97 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
             } else if (is_false_value(value)) {
                 options->enable_math = false;
             }
+        } else if (strcasecmp(key, "callouts") == 0) {
+            if (is_true_value(value)) {
+                options->enable_callouts = true;
+            } else if (is_false_value(value)) {
+                options->enable_callouts = false;
+            }
+        } else if (strcasecmp(key, "py-callouts") == 0 || strcasecmp(key, "py_callouts") == 0) {
+            if (is_true_value(value)) {
+                options->enable_py_callouts = true;
+            } else if (is_false_value(value)) {
+                options->enable_py_callouts = false;
+            }
+        } else if (strcasecmp(key, "quarto-extensions") == 0 || strcasecmp(key, "quarto_extensions") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_extensions = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_extensions = false;
+            }
+        } else if (strcasecmp(key, "quarto-raw") == 0 || strcasecmp(key, "quarto_raw") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_raw = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_raw = false;
+            }
+        } else if (strcasecmp(key, "quarto-list-continuation") == 0 || strcasecmp(key, "quarto_list_continuation") == 0 ||
+                   strcasecmp(key, "quarto-example-lists") == 0 || strcasecmp(key, "quarto_example_lists") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_example_lists = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_example_lists = false;
+            }
+        } else if (strcasecmp(key, "quarto-line-blocks") == 0 || strcasecmp(key, "quarto_line_blocks") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_line_blocks = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_line_blocks = false;
+            }
+        } else if (strcasecmp(key, "quarto-roman-lists") == 0 || strcasecmp(key, "quarto_roman_lists") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_roman_lists = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_roman_lists = false;
+            }
+        } else if (strcasecmp(key, "quarto-code-attrs") == 0 || strcasecmp(key, "quarto_code_attrs") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_code_attrs = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_code_attrs = false;
+            }
+        } else if (strcasecmp(key, "quarto-strict-lists") == 0 || strcasecmp(key, "quarto_strict_lists") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_strict_lists = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_strict_lists = false;
+            }
+        } else if (strcasecmp(key, "quarto-xrefs") == 0 || strcasecmp(key, "quarto_xrefs") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_xrefs = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_xrefs = false;
+            }
+        } else if (strcasecmp(key, "quarto-callouts") == 0 || strcasecmp(key, "quarto_callouts") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_callouts = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_callouts = false;
+            }
+        } else if (strcasecmp(key, "quarto-diagrams") == 0 || strcasecmp(key, "quarto_diagrams") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_diagrams = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_diagrams = false;
+            }
+        } else if (strcasecmp(key, "quarto-shortcodes") == 0 || strcasecmp(key, "quarto_shortcodes") == 0) {
+            if (is_true_value(value)) {
+                options->enable_quarto_shortcodes = true;
+            } else if (is_false_value(value)) {
+                options->enable_quarto_shortcodes = false;
+            }
+        } else if (strcasecmp(key, "divs") == 0) {
+            if (is_true_value(value)) {
+                options->enable_divs = true;
+            } else if (is_false_value(value)) {
+                options->enable_divs = false;
+            }
+        } else if (strcasecmp(key, "spans") == 0) {
+            if (is_true_value(value)) {
+                options->enable_spans = true;
+            } else if (is_false_value(value)) {
+                options->enable_spans = false;
+            }
         } else if (strcasecmp(key, "ids") == 0 || strcasecmp(key, "header-ids") == 0) {
             if (is_true_value(value)) {
                 options->generate_header_ids = true;
@@ -2943,6 +2970,13 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
                 }
                 free(lower);
             }
+        } else if (strcasecmp(key, "toc-min-max") == 0 || strcasecmp(key, "toc_min_max") == 0) {
+            int min = 0, max = 0;
+            if (sscanf(value, "%d,%d", &min, &max) == 2 &&
+                min >= 1 && max <= 6 && min <= max) {
+                options->toc_min = min;
+                options->toc_max = max;
+            }
         } else if (strcasecmp(key, "base-dir") == 0 || strcasecmp(key, "base_dir") == 0) {
             options->base_directory = value;
         } else if (strcasecmp(key, "wikilink-space") == 0 || strcasecmp(key, "wikilink_space") == 0) {
@@ -3001,10 +3035,15 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
         } else if (strcasecmp(key, "paginate") == 0 ||
                    strcasecmp(key, "terminal.paginate") == 0 ||
                    strcasecmp(key, "terminal_paginate") == 0) {
-            if (is_true_value(value)) {
+            if (strcasecmp(value, "symbols") == 0) {
+                options->paginate = true;
+                options->paginate_symbols = true;
+            } else if (is_true_value(value)) {
                 options->paginate = true;
+                options->paginate_symbols = false;
             } else if (is_false_value(value)) {
                 options->paginate = false;
+                options->paginate_symbols = false;
             }
         }
         /* Syntax highlighting options */