apex-ruby 1.0.6 → 1.0.7

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

@@ -48,6 +48,28 @@ static char *read_file_contents(const char *filepath) {
     return content;
 }
 
+/**
+ * Decode percent-encoded path in place (RFC 3986: %XX -> byte).
+ * Used so include paths like with%20space.txt resolve to files with spaces.
+ */
+static void percent_decode_inplace(char *path) {
+    if (!path) return;
+    char *r = path;
+    char *w = path;
+    while (*r) {
+        if (r[0] == '%' && r[1] && r[2] &&
+            isxdigit((unsigned char)r[1]) && isxdigit((unsigned char)r[2])) {
+            int hi = (r[1] <= '9') ? (r[1] - '0') : ((r[1] & 0x0f) + 9);
+            int lo = (r[2] <= '9') ? (r[2] - '0') : ((r[2] & 0x0f) + 9);
+            *w++ = (char)((hi << 4) | lo);
+            r += 3;
+        } else {
+            *w++ = *r++;
+        }
+    }
+    *w = '\0';
+}
+
 /**
  * Resolve relative path from base directory
  */
@@ -174,15 +196,18 @@ static apex_file_type_t apex_detect_file_type(const char *filepath) {
  * - First row is always treated as header.
  * - If the second row cells are all one of: left, right, center, auto (case-insensitive),
  *   it is treated as an alignment row and converted to :---, ---:, :---:, or ---.
+ * - Alternatively, if the second row cells contain only colons and dashes (e.g. :--, --:,
+ *   :--:), they are parsed as Markdown-style alignment specs:
+ *   :-- or :--- (colon at start) = left; --: or ---: (colon at end) = right;
+ *   :--: or :---: (colon both ends) = center; --- (no colon) = auto.
  *   The alignment row itself is NOT emitted as a data row.
  * - Otherwise, a default '---' separator row is generated after the header.
- *   The second row (including rows that contain only '-' and ':' characters) is emitted
- *   as normal data.
+ *   The second row is emitted as normal data.
  */
-char *apex_csv_to_table(const char *csv_content, bool is_tsv) {
+char *apex_csv_to_table_with_delimiter(const char *csv_content, bool is_tsv, char delimiter_override) {
     if (!csv_content) return NULL;
 
-    char delim = is_tsv ? '\t' : ',';
+    char delim = delimiter_override ? delimiter_override : (is_tsv ? '\t' : ',');
     size_t len = strlen(csv_content);
     if (len == 0) return NULL;
 
@@ -368,6 +393,59 @@ char *apex_csv_to_table(const char *csv_content, bool is_tsv) {
                 has_alignment_row = true;
             }
         }
+
+        /* If keywords failed, try Markdown-style alignment (:--, --:, :--:) */
+        if (!has_alignment_row && arow->cell_count == col_count) {
+            align = malloc((size_t)col_count * sizeof(*align));
+            if (align) {
+                bool all_colon_dash = true;
+                for (int i = 0; i < col_count && all_colon_dash; i++) {
+                    char *cell = arow->cells[i];
+                    char *start = cell;
+                    while (*start && isspace((unsigned char)*start)) start++;
+                    char *end = start + strlen(start);
+                    while (end > start && isspace((unsigned char)end[-1])) end--;
+                    size_t tlen = (size_t)(end - start);
+
+                    if (tlen == 0) {
+                        all_colon_dash = false;
+                        break;
+                    }
+
+                    bool has_dash = false;
+                    for (size_t j = 0; j < tlen; j++) {
+                        char ch = start[j];
+                        if (ch == '-') has_dash = true;
+                        else if (ch != ':') {
+                            all_colon_dash = false;
+                            break;
+                        }
+                    }
+                    if (!all_colon_dash || !has_dash) {
+                        all_colon_dash = false;
+                        break;
+                    }
+
+                    bool colon_start = (start[0] == ':');
+                    bool colon_end = (end > start && end[-1] == ':');
+                    if (colon_start && colon_end) {
+                        align[i] = ALIGN_CENTER;
+                    } else if (colon_start) {
+                        align[i] = ALIGN_LEFT;
+                    } else if (colon_end) {
+                        align[i] = ALIGN_RIGHT;
+                    } else {
+                        align[i] = ALIGN_AUTO;
+                    }
+                }
+                if (all_colon_dash) {
+                    has_alignment_row = true;
+                } else {
+                    free(align);
+                    align = NULL;
+                }
+            }
+        }
     }
 
     /* Allocate output buffer: original size * 4 should be enough with extra alignment row */
@@ -452,6 +530,10 @@ char *apex_csv_to_table(const char *csv_content, bool is_tsv) {
     return output;
 }
 
+char *apex_csv_to_table(const char *csv_content, bool is_tsv) {
+    return apex_csv_to_table_with_delimiter(csv_content, is_tsv, '\0');
+}
+
 /**
  * Free address specification
  */
@@ -1069,6 +1151,118 @@ static char *normalize_fence_delimiters(const char *text) {
     return output;
 }
 
+/* Parse optional delimiter override tokens used after CSV/TSV includes.
+ * Supported forms:
+ *   {;}
+ *   {delimiter=;}
+ *   {delimiter=\t}
+ */
+static bool parse_include_delimiter_override(const char *start, const char **after_out, char *delimiter_out) {
+    if (!start || !after_out || !delimiter_out) return false;
+
+    const char *p = start;
+    while (*p == ' ' || *p == '\t') p++;
+    if (*p != '{') return false;
+
+    const char *close = strchr(p + 1, '}');
+    if (!close || close <= p + 1) return false;
+
+    char inner[64];
+    size_t inner_len = (size_t)(close - (p + 1));
+    if (inner_len >= sizeof(inner)) return false;
+    memcpy(inner, p + 1, inner_len);
+    inner[inner_len] = '\0';
+
+    char *s = inner;
+    while (*s && isspace((unsigned char)*s)) s++;
+    char *e = s + strlen(s);
+    while (e > s && isspace((unsigned char)e[-1])) e--;
+    *e = '\0';
+
+    if (s[0] == '\0') return false;
+
+    /* Shorthand: {;} */
+    if (s[0] && s[1] == '\0') {
+        *delimiter_out = s[0];
+        *after_out = close + 1;
+        return true;
+    }
+
+    /* Verbose: {delimiter=;} */
+    const char *key = "delimiter";
+    size_t key_len = strlen(key);
+    if (strncasecmp(s, key, key_len) != 0) return false;
+    s += key_len;
+    while (*s && isspace((unsigned char)*s)) s++;
+    if (*s != '=') return false;
+    s++;
+    while (*s && isspace((unsigned char)*s)) s++;
+
+    if (s[0] == '\\' && s[1] == 't' && s[2] == '\0') {
+        *delimiter_out = '\t';
+        *after_out = close + 1;
+        return true;
+    }
+    if (s[0] && s[1] == '\0') {
+        *delimiter_out = s[0];
+        *after_out = close + 1;
+        return true;
+    }
+
+    return false;
+}
+
+/* Parse delimiter override embedded at end of filepath, e.g.:
+ *   data.csv{;}
+ *   data.csv{delimiter=;}
+ * If found, trims filepath in-place and sets delimiter_out.
+ */
+static bool parse_embedded_delimiter_override(char *filepath, char *delimiter_out) {
+    if (!filepath || !delimiter_out) return false;
+
+    char *brace = strrchr(filepath, '{');
+    if (!brace) return false;
+    size_t tail_len = strlen(brace);
+    if (tail_len < 3) return false; /* at least "{x}" */
+    if (brace[tail_len - 1] != '}') return false;
+
+    const char *after = NULL;
+    char parsed = '\0';
+    if (!parse_include_delimiter_override(brace, &after, &parsed)) return false;
+    if (after == NULL || *after != '\0') return false;
+
+    *brace = '\0';
+    *delimiter_out = parsed;
+    return true;
+}
+
+/* Find closing "}}" for MMD transclusion, allowing embedded single-brace
+ * segments inside filepath (e.g. {{data.csv{;}}}). */
+static const char *find_mmd_transclusion_end(const char *filepath_start) {
+    if (!filepath_start) return NULL;
+
+    int brace_depth = 0;
+    const char *p = filepath_start;
+    while (*p) {
+        if (p[0] == '{') {
+            brace_depth++;
+            p++;
+            continue;
+        }
+        if (p[0] == '}' && brace_depth > 0) {
+            brace_depth--;
+            p++;
+            continue;
+        }
+        if (p[0] == '}' && p[1] == '}' && brace_depth == 0) {
+            return p;
+        }
+        p++;
+    }
+
+    return NULL;
+}
+
 /**
  * Process file includes in text
  */
@@ -1132,8 +1326,11 @@ char *apex_process_includes(const char *text, const char *base_dir, apex_metadat
             if (filepath_end > filepath_start && (filepath_end - filepath_start) < 1024) {
                 char filepath[1024];
                 size_t filepath_len = filepath_end - filepath_start;
+                char ia_delimiter_override = '\0';
                 memcpy(filepath, filepath_start, filepath_len);
                 filepath[filepath_len] = '\0';
+                percent_decode_inplace(filepath);
+                parse_embedded_delimiter_override(filepath, &ia_delimiter_override);
 
                 /* Resolve and check file exists */
                 char *resolved_path = resolve_path(filepath, effective_base_dir);
@@ -1151,7 +1348,13 @@ char *apex_process_includes(const char *text, const char *base_dir, apex_metadat
                             if (to_insert) snprintf(to_insert, buf_size, "![](%s)\n", filepath);
                         } else if (file_type == FILE_TYPE_CSV || file_type == FILE_TYPE_TSV) {
                             /* CSV/TSV: convert to table */
-                            to_insert = apex_csv_to_table(content, file_type == FILE_TYPE_TSV);
+                            char delimiter_override = ia_delimiter_override;
+                            const char *override_end = filepath_end;
+                            if (delimiter_override == '\0' &&
+                                parse_include_delimiter_override(filepath_end, &override_end, &delimiter_override)) {
+                                filepath_end = override_end;
+                            }
+                            to_insert = apex_csv_to_table_with_delimiter(content, file_type == FILE_TYPE_TSV, delimiter_override);
                         } else if (file_type == FILE_TYPE_CODE) {
                             /* Code: wrap in fenced code block */
                             const char *ext = strrchr(filepath, '.');
@@ -1212,14 +1415,17 @@ char *apex_process_includes(const char *text, const char *base_dir, apex_metadat
         /* Look for MMD transclusion {{file}} */
         if (!processed_include && !in_code_span && read_pos[0] == '{' && read_pos[1] == '{') {
             const char *filepath_start = read_pos + 2;
-            const char *filepath_end = strstr(filepath_start, "}}");
+            const char *filepath_end = find_mmd_transclusion_end(filepath_start);
 
             if (filepath_end && (filepath_end - filepath_start) > 0 && (filepath_end - filepath_start) < 1024) {
                 /* Extract filepath */
                 int filepath_len = filepath_end - filepath_start;
                 char filepath[1024];
+                char mmd_delimiter_override = '\0';
                 memcpy(filepath, filepath_start, filepath_len);
                 filepath[filepath_len] = '\0';
+                percent_decode_inplace(filepath);
+                parse_embedded_delimiter_override(filepath, &mmd_delimiter_override);
 
                 /* Check for address specification [address] */
                 const char *address_start = filepath_end + 2;
@@ -1275,7 +1481,11 @@ char *apex_process_includes(const char *text, const char *base_dir, apex_metadat
 
                         /* Convert CSV/TSV to table */
                         if (file_type == FILE_TYPE_CSV || file_type == FILE_TYPE_TSV) {
-                            char *table = apex_csv_to_table(extracted_content, file_type == FILE_TYPE_TSV);
+                            char *table = apex_csv_to_table_with_delimiter(
+                                extracted_content,
+                                file_type == FILE_TYPE_TSV,
+                                mmd_delimiter_override
+                            );
                             if (table) {
                                 to_process = table;
                                 free_to_process = true;
@@ -1361,9 +1571,14 @@ char *apex_process_includes(const char *text, const char *base_dir, apex_metadat
                 /* Extract filepath */
                 int filepath_len = filepath_end - filepath_start;
                 char filepath[1024];
+                char marked_delimiter_override = '\0';
                 if (filepath_len > 0 && filepath_len < (int)sizeof(filepath)) {
                     memcpy(filepath, filepath_start, filepath_len);
                     filepath[filepath_len] = '\0';
+                    percent_decode_inplace(filepath);
+                    if (bracket_type == '[') {
+                        parse_embedded_delimiter_override(filepath, &marked_delimiter_override);
+                    }
 
                     /* Check for address specification [address] */
                     const char *address_start = filepath_end + 1;
@@ -1418,7 +1633,11 @@ char *apex_process_includes(const char *text, const char *base_dir, apex_metadat
 
                                 /* Convert CSV/TSV to table */
                                 if (file_type == FILE_TYPE_CSV || file_type == FILE_TYPE_TSV) {
-                                    char *table = apex_csv_to_table(extracted_content, file_type == FILE_TYPE_TSV);
+                                    char *table = apex_csv_to_table_with_delimiter(
+                                        extracted_content,
+                                        file_type == FILE_TYPE_TSV,
+                                        marked_delimiter_override
+                                    );
                                     if (table) {
                                         to_process = table;
                                         free_to_process = true;
@@ -1505,9 +1724,21 @@ char *apex_process_includes(const char *text, const char *base_dir, apex_metadat
 
                     /* Skip past the include syntax */
                     if (address_end) {
-                        read_pos = address_end + 1;
+                        const char *override_end = address_end + 1;
+                        char delimiter_unused = '\0';
+                        if (parse_include_delimiter_override(address_end + 1, &override_end, &delimiter_unused)) {
+                            read_pos = override_end;
+                        } else {
+                            read_pos = address_end + 1;
+                        }
                     } else {
-                        read_pos = filepath_end + 1;
+                        const char *override_end = filepath_end + 1;
+                        char delimiter_unused = '\0';
+                        if (parse_include_delimiter_override(filepath_end + 1, &override_end, &delimiter_unused)) {
+                            read_pos = override_end;
+                        } else {
+                            read_pos = filepath_end + 1;
+                        }
                     }
                     if (address_spec) free_address_spec(address_spec);
                     processed_include = true;

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

@@ -39,6 +39,7 @@ char *apex_process_includes(const char *text, const char *base_dir, apex_metadat
 bool apex_file_exists(const char *filepath);
 
 char *apex_csv_to_table(const char *csv_content, bool is_tsv);
+char *apex_csv_to_table_with_delimiter(const char *csv_content, bool is_tsv, char delimiter_override);
 
 /**
  * Resolve wildcard path (e.g., file.* -> file.html)

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

@@ -654,6 +654,116 @@ static apex_metadata_item *parse_mmd_metadata(const char *text, size_t *consumed
     return items;
 }
 
+/* Check if a line consists only of at least min_count of delim_char (ignoring
+ * surrounding whitespace). */
+static bool is_delimiter_line(const char *line, char delim_char, size_t min_count) {
+    if (!line) return false;
+    char temp[1024];
+    size_t len = strlen(line);
+    if (len >= sizeof(temp)) len = sizeof(temp) - 1;
+    memcpy(temp, line, len);
+    temp[len] = '\0';
+
+    char *trimmed = trim_whitespace(temp);
+    size_t tlen = strlen(trimmed);
+    if (tlen < min_count) return false;
+    for (size_t i = 0; i < tlen; i++) {
+        if (trimmed[i] != delim_char) return false;
+    }
+    return true;
+}
+
+/* Parse MultiMarkdown metadata when wrapped in delimiter lines.
+ * Opening delimiter: --- (or longer)
+ * Closing delimiter: --- (or longer) OR ... (or longer)
+ */
+static apex_metadata_item *parse_mmd_metadata_delimited(const char *text, size_t *consumed) {
+    apex_metadata_item *items = NULL;
+    const char *line_start = text;
+    const char *line_end = strchr(line_start, '\n');
+    bool found_metadata = false;
+
+    if (!line_end) return NULL;
+
+    /* First line must be a dash delimiter */
+    {
+        size_t len = line_end - line_start;
+        char line[1024];
+        if (len >= sizeof(line)) len = sizeof(line) - 1;
+        memcpy(line, line_start, len);
+        line[len] = '\0';
+        if (!is_delimiter_line(line, '-', 3)) return NULL;
+    }
+
+    line_start = line_end + 1;
+    while ((line_end = strchr(line_start, '\n')) != NULL) {
+        size_t len = line_end - line_start;
+        char line[1024];
+        if (len >= sizeof(line)) len = sizeof(line) - 1;
+        memcpy(line, line_start, len);
+        line[len] = '\0';
+        char *trimmed = trim_whitespace(line);
+
+        /* End markers supported by MultiMarkdown compatibility */
+        if (is_delimiter_line(trimmed, '-', 3) || is_delimiter_line(trimmed, '.', 3)) {
+            if (found_metadata) {
+                *consumed = (line_end + 1) - text;
+                return items;
+            }
+            *consumed = 0;
+            return NULL;
+        }
+
+        /* Blank line also terminates metadata block */
+        if (*trimmed == '\0') {
+            if (found_metadata) {
+                *consumed = (line_end + 1) - text;
+                return items;
+            }
+            *consumed = 0;
+            return NULL;
+        }
+
+        char *colon = strchr(line, ':');
+        if (!colon) {
+            if (found_metadata) {
+                *consumed = line_start - text;
+                return items;
+            }
+            *consumed = 0;
+            return NULL;
+        }
+
+        if (colon[1] != ' ' && colon[1] != '\t') {
+            if (found_metadata) {
+                *consumed = line_start - text;
+                return items;
+            }
+            *consumed = 0;
+            return NULL;
+        }
+
+        *colon = '\0';
+        char *key = trim_whitespace(line);
+        char *value = trim_whitespace(colon + 1);
+        if (*key && *value) {
+            add_metadata_item(&items, key, value);
+            found_metadata = true;
+        } else {
+            if (found_metadata) {
+                *consumed = line_start - text;
+                return items;
+            }
+            *consumed = 0;
+            return NULL;
+        }
+
+        line_start = line_end + 1;
+    }
+
+    return NULL;
+}
+
 /**
  * Parse Pandoc title block metadata
  * Format: % Title, % Author, % Date as first three lines
@@ -701,15 +811,27 @@ static apex_metadata_item *parse_pandoc_metadata(const char *text, size_t *consu
  * This modifies the input by removing the metadata section
  * Returns the extracted metadata
  */
-apex_metadata_item *apex_extract_metadata(char **text_ptr) {
+apex_metadata_item *apex_extract_metadata_for_mode(char **text_ptr, apex_mode_t mode) {
     if (!text_ptr || !*text_ptr || !**text_ptr) return NULL;
 
     char *text = *text_ptr;
     size_t consumed = 0;
     apex_metadata_item *items = NULL;
 
-    /* Try YAML first (most explicit) */
-    if (strncmp(text, "---", 3) == 0) {
+    if (mode == APEX_MODE_MULTIMARKDOWN && strncmp(text, "---", 3) == 0) {
+        /* In MMD mode, delimiter blocks are treated as MultiMarkdown metadata,
+         * including dot-delimited closers (.../......). */
+        items = parse_mmd_metadata_delimited(text, &consumed);
+        if (!items) {
+            /* Keep YAML compatibility in MMD mode when content is actual YAML. */
+            items = parse_yaml_metadata(text, &consumed);
+        }
+        if (!items) {
+            items = parse_mmd_metadata(text, &consumed);
+        }
+    }
+    /* Try YAML first (most explicit) for non-MMD modes */
+    else if (strncmp(text, "---", 3) == 0) {
         items = parse_yaml_metadata(text, &consumed);
     }
     /* Try Pandoc */
@@ -730,6 +852,10 @@ apex_metadata_item *apex_extract_metadata(char **text_ptr) {
     return items;
 }
 
+apex_metadata_item *apex_extract_metadata(char **text_ptr) {
+    return apex_extract_metadata_for_mode(text_ptr, APEX_MODE_UNIFIED);
+}
+
 /**
  * Placeholder extension creation - for future full integration
  * For now, metadata is handled via preprocessing
@@ -2580,6 +2706,12 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
             } else if (is_false_value(value)) {
                 options->enable_footnotes = false;
             }
+        } else if (strcasecmp(key, "one-line-definitions") == 0 || strcasecmp(key, "one_line_definitions") == 0) {
+            if (is_true_value(value)) {
+                options->enable_definition_lists = true;
+            } else if (is_false_value(value)) {
+                options->enable_definition_lists = false;
+            }
         } else if (strcasecmp(key, "smart") == 0 || strcasecmp(key, "smart-typography") == 0) {
             if (is_true_value(value)) {
                 options->enable_smart_typography = true;
@@ -2803,6 +2935,32 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
         } else if (strcasecmp(key, "wikilink-sanitize") == 0 || strcasecmp(key, "wikilink_sanitize") == 0) {
             options->wikilink_sanitize = (strcasecmp(value, "true") == 0 || strcmp(value, "1") == 0);
         }
+        /* Terminal-specific options from config/metadata.
+         * Keys are typically flattened from YAML mappings, e.g.:
+         * terminal.theme  (from terminal: { theme: brett })
+         * terminal.width  (from terminal: { width: 80 })
+         */
+        else if (strcasecmp(key, "terminal.theme") == 0 ||
+                 strcasecmp(key, "terminal_theme") == 0) {
+            /* Only set theme_name if it wasn't already set by CLI or previous metadata. */
+            if (!options->theme_name || !options->theme_name[0]) {
+                options->theme_name = value;
+            }
+        } else if (strcasecmp(key, "terminal.width") == 0 ||
+                   strcasecmp(key, "terminal_width") == 0) {
+            int w = atoi(value);
+            if (w > 0) {
+                options->terminal_width = w;
+            }
+        } else if (strcasecmp(key, "paginate") == 0 ||
+                   strcasecmp(key, "terminal.paginate") == 0 ||
+                   strcasecmp(key, "terminal_paginate") == 0) {
+            if (is_true_value(value)) {
+                options->paginate = true;
+            } else if (is_false_value(value)) {
+                options->paginate = false;
+            }
+        }
         /* Syntax highlighting options */
         else if (strcasecmp(key, "code-highlight") == 0 || strcasecmp(key, "code_highlight") == 0) {
             /* Accept full names and abbreviations */
@@ -2815,6 +2973,8 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
                     options->code_highlighter = "pygments";
                 } else if (strcmp(lower, "skylighting") == 0 || strcmp(lower, "s") == 0 || strcmp(lower, "sky") == 0) {
                     options->code_highlighter = "skylighting";
+                } else if (strcmp(lower, "shiki") == 0 || strcmp(lower, "sh") == 0) {
+                    options->code_highlighter = "shiki";
                 } else if (is_false_value(lower) || strcmp(lower, "none") == 0) {
                     options->code_highlighter = NULL;
                 }
@@ -2832,6 +2992,9 @@ void apex_apply_metadata_to_options(apex_metadata_item *metadata, apex_options *
             } else if (is_false_value(value)) {
                 options->highlight_language_only = false;
             }
+        } else if (strcasecmp(key, "code-highlight-theme") == 0 || strcasecmp(key, "code_highlight_theme") == 0) {
+            /* Theme name for external highlighters (tool-specific). */
+            options->code_highlight_theme = value;
         }
 
         item = item->next;

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

@@ -47,6 +47,13 @@ cmark_syntax_extension *create_metadata_extension(void);
  */
 apex_metadata_item *apex_extract_metadata(char **text_ptr);
 
+/**
+ * Extract metadata from the beginning of text using mode-aware precedence.
+ * In MultiMarkdown mode, MMD metadata parsing takes precedence over YAML-style
+ * block parsing when an MMD delimiter block is detected.
+ */
+apex_metadata_item *apex_extract_metadata_for_mode(char **text_ptr, apex_mode_t mode);
+
 /**
  * Get metadata from a document node
  * Returns a linked list of key-value pairs

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

@@ -10,6 +10,31 @@
 #include <stdbool.h>
 #include <ctype.h>
 
+/** 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 == '+')
+        return (p[1] == ' ' || p[1] == '\t');
+    if (isdigit((unsigned char)*p)) {
+        while (isdigit((unsigned char)*p)) p++;
+        return (*p == '.' && (p[1] == ' ' || p[1] == '\t'));
+    }
+    return false;
+}
+
+/** True if we're at the start of a line that is an indented code block (4+ spaces or tab)
+ * and not a list line. List lines (nested or continuation) should still get sup/sub. */
+static bool line_is_indented_code_block(const char *read) {
+    if (*read == '\t') {
+        return !looks_like_list_marker(read + 1);
+    }
+    if (read[0] != ' ' || read[1] != ' ' || read[2] != ' ' || read[3] != ' ')
+        return false;
+    const char *content = read + 4;
+    while (*content == ' ')
+        content++;
+    return !looks_like_list_marker(content);
+}
+
 /**
  * Process superscript and subscript syntax as preprocessing
  * Converts to <sup>text</sup> and <sub>text</sub> before parsing
@@ -31,11 +56,17 @@ char *apex_process_sup_sub(const char *text) {
 
     bool in_code_block = false;
     bool in_inline_code = false;
+    bool in_indented_code_block = false;
     bool in_math_inline = false;
     bool in_math_display = false;
     bool in_liquid = false;
 
     while (*read) {
+        /* At line start: indented code block only if 4+ spaces/tab and not a list line */
+        if (read == text || read[-1] == '\n') {
+            in_indented_code_block = line_is_indented_code_block(read);
+        }
+
         /* Track Liquid tags (skip processing inside them) */
         if (!in_liquid && *read == '{' && read[1] == '%') {
             in_liquid = true;
@@ -66,7 +97,7 @@ char *apex_process_sup_sub(const char *text) {
             }
             continue;
         }
-        /* Track code blocks (skip processing inside them) */
+        /* Track fenced code blocks (skip processing inside them) */
         if (*read == '`') {
             if (read[1] == '`' && read[2] == '`') {
                 in_code_block = !in_code_block;
@@ -77,7 +108,7 @@ char *apex_process_sup_sub(const char *text) {
 
         /* Track math spans (skip processing inside them) */
         bool handled_math = false;
-        if (!in_code_block && !in_inline_code) {
+        if (!in_code_block && !in_inline_code && !in_indented_code_block) {
             /* Check for display math: $$...$$ */
             if (*read == '$' && read[1] == '$') {
                 in_math_display = !in_math_display;
@@ -123,7 +154,7 @@ char *apex_process_sup_sub(const char *text) {
         }
 
         /* Skip processing inside code or math */
-        if (handled_math || in_code_block || in_inline_code || in_math_inline || in_math_display) {
+        if (handled_math || in_code_block || in_inline_code || in_indented_code_block || in_math_inline || in_math_display) {
             if (!handled_math && remaining > 0) {
                 *write++ = *read++;
                 remaining--;