docrev 0.9.18 → 0.10.0

package/dist/lib/macro-filter.lua

@@ -0,0 +1,201 @@
+--[[
+docrev macro filter.
+
+Reads a JSON sidecar describing one-argument LaTeX-style macros and expands
+them per output FORMAT. Used for the built-in \tofill{X} (bold orange [X]
+placeholder) and any user-declared macros from rev.yaml.
+
+Sidecar path is passed via the DOCREV_MACROS_FILE environment variable, set
+by build.ts before spawning pandoc. Env vars (not metadata) because pandoc's
+filter traversal runs RawInline/RawBlock BEFORE Meta, so by the time we'd
+read metadata the inline expansions have already happened.
+
+Why raw OpenXML for docx? Pandoc 3.x's docx writer does NOT honor
+`Span{style="color: #..."}` — those spans render as plain text with no
+<w:color> run property. So for docx we emit raw <w:r> nodes directly. Same
+reasoning for the pptx-color-filter.
+
+For latex/pdf/beamer the markdown source already contains \tofill{X} as a raw
+LaTeX inline; we leave it alone because build.ts injects a \providecommand
+into header-includes. For html we emit a raw <span> with inline style. For
+everything else (markdown, gfm, plain) we degrade to **bold [X]** so the
+placeholder never silently disappears.
+]]
+
+local json = require('pandoc.json')
+
+local macros_by_name = {}
+
+local function load_sidecar()
+  local path = os.getenv('DOCREV_MACROS_FILE')
+  if not path or path == '' then
+    return
+  end
+  local fh = io.open(path, 'r')
+  if not fh then
+    io.stderr:write('docrev macro-filter: cannot read sidecar: ' .. path .. '\n')
+    return
+  end
+  local content = fh:read('*a')
+  fh:close()
+  local ok, parsed = pcall(json.decode, content)
+  if not ok or type(parsed) ~= 'table' or type(parsed.macros) ~= 'table' then
+    io.stderr:write('docrev macro-filter: malformed sidecar JSON\n')
+    return
+  end
+  for _, m in ipairs(parsed.macros) do
+    if type(m) == 'table' and type(m.name) == 'string' then
+      macros_by_name[m.name] = m
+    end
+  end
+end
+
+load_sidecar()
+
+local function xml_escape(s)
+  return (s:gsub('&', '&amp;'):gsub('<', '&lt;'):gsub('>', '&gt;'))
+end
+
+local function html_escape(s)
+  return (s
+    :gsub('&', '&amp;')
+    :gsub('<', '&lt;')
+    :gsub('>', '&gt;')
+    :gsub('"', '&quot;'))
+end
+
+-- Resolve effective style for a macro in the current pandoc format.
+-- Per-format entry wins over `default` (replacement, not merge — matches
+-- macros.ts semantics).
+local function pick_style(macro, format)
+  if macro.formats and macro.formats[format] then
+    return macro.formats[format]
+  end
+  return macro.default or {}
+end
+
+-- Build the inside of the bracket: [prefix][arg][suffix], optionally without
+-- brackets when style.bracket == false.
+local function compose_text(style, arg)
+  local prefix = style.prefix or ''
+  local suffix = style.suffix or ''
+  local inner = prefix .. arg .. suffix
+  if style.bracket == false then
+    return inner
+  end
+  return '[' .. inner .. ']'
+end
+
+local function render_docx_run(style, arg)
+  local rpr = {}
+  if style.color then
+    table.insert(rpr, '<w:color w:val="' .. style.color .. '"/>')
+  end
+  if style.bold then
+    table.insert(rpr, '<w:b/>')
+  end
+  if style.italic then
+    table.insert(rpr, '<w:i/>')
+  end
+  local rpr_xml = ''
+  if #rpr > 0 then
+    rpr_xml = '<w:rPr>' .. table.concat(rpr) .. '</w:rPr>'
+  end
+  local text = xml_escape(compose_text(style, arg))
+  return '<w:r>' .. rpr_xml ..
+         '<w:t xml:space="preserve">' .. text .. '</w:t></w:r>'
+end
+
+local function render_html(style, arg)
+  local css = {}
+  if style.color then
+    table.insert(css, 'color:#' .. style.color)
+  end
+  if style.bold then
+    table.insert(css, 'font-weight:bold')
+  end
+  if style.italic then
+    table.insert(css, 'font-style:italic')
+  end
+  local text = html_escape(compose_text(style, arg))
+  if #css == 0 then
+    return '<span>' .. text .. '</span>'
+  end
+  return '<span style="' .. table.concat(css, ';') .. '">' .. text .. '</span>'
+end
+
+-- Fallback path: produce native pandoc inlines so the macro never silently
+-- disappears in markdown/gfm/plain output. Used when the current format has
+-- no native rich-text path (or we couldn't open the sidecar).
+local function fallback_inlines(style, arg)
+  local doc = pandoc.read(compose_text(style, arg), 'markdown')
+  local inlines = pandoc.utils.blocks_to_inlines(doc.blocks)
+  if style.bold then
+    inlines = { pandoc.Strong(inlines) }
+  end
+  if style.italic then
+    inlines = { pandoc.Emph(inlines) }
+  end
+  return inlines
+end
+
+-- Match `\NAME{...}` (with balanced braces inside the argument is NOT
+-- supported — the use case is plain placeholder text, mirroring the reference
+-- filter; users who need nested braces should use a different mechanism).
+local function parse_call(text)
+  local name, arg = text:match('^\\([A-Za-z][A-Za-z0-9]*)%s*{(.*)}%s*$')
+  if name and arg and macros_by_name[name] then
+    return name, arg
+  end
+  return nil, nil
+end
+
+local function expand_inline(el)
+  if el.format ~= 'tex' and el.format ~= 'latex' then
+    return nil
+  end
+  local name, arg = parse_call(el.text)
+  if not name then return nil end
+  local macro = macros_by_name[name]
+  local style = pick_style(macro, FORMAT)
+
+  if FORMAT == 'docx' then
+    return pandoc.RawInline('openxml', render_docx_run(style, arg))
+  elseif FORMAT == 'html' or FORMAT == 'html4' or FORMAT == 'html5' or FORMAT == 'chunkedhtml' then
+    return pandoc.RawInline('html', render_html(style, arg))
+  elseif FORMAT == 'latex' or FORMAT == 'beamer' or FORMAT == 'context' then
+    -- Leave the raw LaTeX as-is. build.ts injects \providecommand into
+    -- header-includes, so the LaTeX engine renders it directly.
+    return nil
+  else
+    return fallback_inlines(style, arg)
+  end
+end
+
+local function expand_block(el)
+  if el.format ~= 'tex' and el.format ~= 'latex' then
+    return nil
+  end
+  local name, arg = parse_call(el.text)
+  if not name then return nil end
+  local macro = macros_by_name[name]
+  local style = pick_style(macro, FORMAT)
+
+  if FORMAT == 'docx' then
+    return pandoc.RawBlock('openxml', '<w:p>' .. render_docx_run(style, arg) .. '</w:p>')
+  elseif FORMAT == 'html' or FORMAT == 'html4' or FORMAT == 'html5' or FORMAT == 'chunkedhtml' then
+    return pandoc.RawBlock('html', '<p>' .. render_html(style, arg) .. '</p>')
+  elseif FORMAT == 'latex' or FORMAT == 'beamer' or FORMAT == 'context' then
+    return nil
+  else
+    return pandoc.Para(fallback_inlines(style, arg))
+  end
+end
+
+function RawInline(el)
+  return expand_inline(el)
+end
+
+function RawBlock(el)
+  return expand_block(el)
+end

package/dist/lib/macros.d.ts

@@ -0,0 +1,102 @@
+/**
+ * Placeholder/highlight macros for docrev.
+ *
+ * Users write `\tofill{X}` (or any custom macro they declare) in markdown
+ * source and the build pipeline expands it per output format:
+ *
+ *   - docx: raw OpenXML run with explicit color + bold (Span+style is NOT
+ *     honored by pandoc's docx writer, so we emit raw <w:r> nodes).
+ *   - pdf / tex / beamer: a `\providecommand` is injected via header-includes,
+ *     so the LaTeX command works directly. `\providecommand` means the user
+ *     can still override with `\renewcommand` in their own preamble.
+ *   - html: raw HTML span with inline style.
+ *   - everything else (markdown, gfm, etc.): bold [X] fallback. Never silently
+ *     dropped.
+ *
+ * The mechanism is generic: `\tofill` is the first built-in. Users can add
+ * their own macros under `macros:` in rev.yaml, and override the built-in by
+ * declaring a macro with the same name.
+ */
+/**
+ * Per-format rendering rules for a macro.
+ *
+ * Fields are independent — set any subset. Unset fields fall back to defaults
+ * (no color, no bold, no italic, bracket wrap on, etc.).
+ */
+export interface MacroFormatStyle {
+    /** Hex color without '#' (e.g. "C2410C"). */
+    color?: string;
+    /** Wrap the rendered content in bold. */
+    bold?: boolean;
+    /** Wrap the rendered content in italic. */
+    italic?: boolean;
+    /** Wrap the content in [...] brackets. Default: true. */
+    bracket?: boolean;
+    /** Optional literal prefix string inside the brackets (e.g. "NOTE: "). */
+    prefix?: string;
+    /** Optional literal suffix string inside the brackets. */
+    suffix?: string;
+}
+/**
+ * Macro definition. `name` is the LaTeX command name without the leading
+ * backslash (e.g. "tofill" → \tofill{...}). `formats` holds per-format rules;
+ * a missing format key inherits from `default`.
+ */
+export interface MacroDef {
+    name: string;
+    /** Default rendering rules; used when a format-specific override is absent. */
+    default?: MacroFormatStyle;
+    /** Per-format overrides, keyed by pandoc format (docx, pdf, html, ...). */
+    formats?: Record<string, MacroFormatStyle>;
+}
+/**
+ * Built-in macros shipped with docrev. The first entry is the original use
+ * case: \tofill{X} → bold orange [X] placeholder.
+ */
+export declare const BUILTIN_MACROS: MacroDef[];
+/**
+ * Validate a user-declared macro entry. Returns a list of error strings;
+ * empty means the macro is valid.
+ */
+export declare function validateMacro(macro: unknown): string[];
+/**
+ * Merge built-in macros with user-declared macros. User entries override
+ * built-ins by `name` (case-sensitive). Invalid entries are dropped with a
+ * console warning so a malformed user macro never silently disables the
+ * built-in.
+ */
+export declare function mergeMacros(userMacros: unknown): MacroDef[];
+/**
+ * Generate `\providecommand` definitions for all macros. `\providecommand`
+ * means user-supplied `\renewcommand` (in a custom header-includes file) still
+ * wins, preserving backwards compat with existing projects.
+ *
+ * Returns an empty string when the macro list is empty.
+ */
+export declare function generateLatexPreamble(macros: MacroDef[]): string;
+/**
+ * Resolve the effective style for a macro in a given pandoc format. Per-format
+ * override wins over the macro's default; both can be partial — fields are
+ * not merged across `default` and `formats[fmt]` (the format-specific entry
+ * replaces `default` entirely when present), keeping rev.yaml semantics
+ * predictable.
+ *
+ * Falls back to `default` when no `formats[fmt]` exists, and to an empty
+ * style ({}) when neither is set.
+ */
+export declare function pickStyle(macro: MacroDef, format: string): MacroFormatStyle;
+/**
+ * Serialize the macro list to a compact JSON sidecar consumed by the lua
+ * filter at build time. The lua filter reads this file at startup and uses it
+ * to expand `\tofill{X}` (or any other declared macro) per FORMAT.
+ *
+ * Returns the absolute path to the written sidecar.
+ */
+export declare function writeMacrosSidecar(directory: string, macros: MacroDef[]): string;
+/**
+ * Resolve the absolute path to the bundled lua filter. Works both from source
+ * (`lib/macro-filter.lua`) and from the compiled package (`dist/lib/...`)
+ * because the postbuild script copies .lua files alongside the .js output.
+ */
+export declare function getMacroFilterPath(): string;
+//# sourceMappingURL=macros.d.ts.map

package/dist/lib/macros.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"macros.d.ts","sourceRoot":"","sources":["../../lib/macros.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAUH;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,6CAA6C;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,2CAA2C;IAC3C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC5C;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,QAAQ,EAKpC,CAAC;AASF;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAgDtD;AAMD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,QAAQ,EAAE,CAqB3D;AAuBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAehE;AAeD;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAI3E;AAMD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAIhF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAS3C"}

package/dist/lib/macros.js

@@ -0,0 +1,218 @@
+/**
+ * Placeholder/highlight macros for docrev.
+ *
+ * Users write `\tofill{X}` (or any custom macro they declare) in markdown
+ * source and the build pipeline expands it per output format:
+ *
+ *   - docx: raw OpenXML run with explicit color + bold (Span+style is NOT
+ *     honored by pandoc's docx writer, so we emit raw <w:r> nodes).
+ *   - pdf / tex / beamer: a `\providecommand` is injected via header-includes,
+ *     so the LaTeX command works directly. `\providecommand` means the user
+ *     can still override with `\renewcommand` in their own preamble.
+ *   - html: raw HTML span with inline style.
+ *   - everything else (markdown, gfm, etc.): bold [X] fallback. Never silently
+ *     dropped.
+ *
+ * The mechanism is generic: `\tofill` is the first built-in. Users can add
+ * their own macros under `macros:` in rev.yaml, and override the built-in by
+ * declaring a macro with the same name.
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+/**
+ * Built-in macros shipped with docrev. The first entry is the original use
+ * case: \tofill{X} → bold orange [X] placeholder.
+ */
+export const BUILTIN_MACROS = [
+    {
+        name: 'tofill',
+        default: { color: 'C2410C', bold: true, bracket: true },
+    },
+];
+// =============================================================================
+// Validation
+// =============================================================================
+const MACRO_NAME_RE = /^[A-Za-z][A-Za-z0-9]*$/;
+const HEX_COLOR_RE = /^[0-9A-Fa-f]{6}$/;
+/**
+ * Validate a user-declared macro entry. Returns a list of error strings;
+ * empty means the macro is valid.
+ */
+export function validateMacro(macro) {
+    const errors = [];
+    if (!macro || typeof macro !== 'object' || Array.isArray(macro)) {
+        return ['macro must be an object'];
+    }
+    const m = macro;
+    if (!m.name || typeof m.name !== 'string') {
+        errors.push('macro.name is required');
+    }
+    else if (!MACRO_NAME_RE.test(m.name)) {
+        errors.push(`macro.name "${m.name}" must match [A-Za-z][A-Za-z0-9]*`);
+    }
+    const checkStyle = (style, key) => {
+        if (style === undefined)
+            return;
+        if (!style || typeof style !== 'object' || Array.isArray(style)) {
+            errors.push(`${key} must be an object`);
+            return;
+        }
+        const s = style;
+        if (s.color !== undefined && (typeof s.color !== 'string' || !HEX_COLOR_RE.test(s.color))) {
+            errors.push(`${key}.color must be a 6-digit hex string without '#' (got "${s.color}")`);
+        }
+        for (const flag of ['bold', 'italic', 'bracket']) {
+            if (s[flag] !== undefined && typeof s[flag] !== 'boolean') {
+                errors.push(`${key}.${flag} must be a boolean`);
+            }
+        }
+        for (const text of ['prefix', 'suffix']) {
+            if (s[text] !== undefined && typeof s[text] !== 'string') {
+                errors.push(`${key}.${text} must be a string`);
+            }
+        }
+    };
+    checkStyle(m.default, 'macro.default');
+    if (m.formats !== undefined) {
+        if (!m.formats || typeof m.formats !== 'object' || Array.isArray(m.formats)) {
+            errors.push('macro.formats must be an object keyed by format name');
+        }
+        else {
+            for (const [fmt, style] of Object.entries(m.formats)) {
+                checkStyle(style, `macro.formats.${fmt}`);
+            }
+        }
+    }
+    return errors;
+}
+// =============================================================================
+// Merge
+// =============================================================================
+/**
+ * Merge built-in macros with user-declared macros. User entries override
+ * built-ins by `name` (case-sensitive). Invalid entries are dropped with a
+ * console warning so a malformed user macro never silently disables the
+ * built-in.
+ */
+export function mergeMacros(userMacros) {
+    const builtins = new Map();
+    for (const m of BUILTIN_MACROS)
+        builtins.set(m.name, m);
+    if (!userMacros)
+        return [...builtins.values()];
+    if (!Array.isArray(userMacros)) {
+        console.warn('macros: rev.yaml `macros` must be a list; ignoring');
+        return [...builtins.values()];
+    }
+    for (const raw of userMacros) {
+        const errors = validateMacro(raw);
+        if (errors.length > 0) {
+            console.warn(`macros: skipping invalid macro: ${errors.join('; ')}`);
+            continue;
+        }
+        const def = raw;
+        builtins.set(def.name, def);
+    }
+    return [...builtins.values()];
+}
+// =============================================================================
+// LaTeX preamble generation (PDF / tex / beamer)
+// =============================================================================
+/**
+ * Build the LaTeX color spec for a style. Returns the wrapping LaTeX with a
+ * `#1` placeholder where the argument lands.
+ */
+function latexCommandBody(style) {
+    const prefix = style.prefix ? escapeLatex(style.prefix) : '';
+    const suffix = style.suffix ? escapeLatex(style.suffix) : '';
+    const inner = `${prefix}#1${suffix}`;
+    const bracketed = style.bracket === false ? inner : `[${inner}]`;
+    let body = bracketed;
+    if (style.italic)
+        body = `\\textit{${body}}`;
+    if (style.bold)
+        body = `\\textbf{${body}}`;
+    if (style.color)
+        body = `\\textcolor[HTML]{${style.color.toUpperCase()}}{${body}}`;
+    return body;
+}
+/**
+ * Generate `\providecommand` definitions for all macros. `\providecommand`
+ * means user-supplied `\renewcommand` (in a custom header-includes file) still
+ * wins, preserving backwards compat with existing projects.
+ *
+ * Returns an empty string when the macro list is empty.
+ */
+export function generateLatexPreamble(macros) {
+    const lines = ['% docrev: placeholder macros'];
+    // \textcolor in [HTML]{...} requires xcolor with the [HTML] option.
+    lines.push('\\PassOptionsToPackage{HTML}{xcolor}');
+    // Some templates already load xcolor; \usepackage tolerates duplicates with
+    // the same options.
+    lines.push('\\usepackage[HTML]{xcolor}');
+    for (const m of macros) {
+        const style = pickStyle(m, 'latex');
+        const body = latexCommandBody(style);
+        lines.push(`\\providecommand{\\${m.name}}[1]{${body}}`);
+    }
+    return lines.join('\n');
+}
+function escapeLatex(s) {
+    // Conservative escape — these are user-authored short literals (prefix/suffix).
+    return s
+        .replace(/\\/g, '\\textbackslash{}')
+        .replace(/([&%$#_{}])/g, '\\$1')
+        .replace(/~/g, '\\textasciitilde{}')
+        .replace(/\^/g, '\\textasciicircum{}');
+}
+// =============================================================================
+// Style resolution per format
+// =============================================================================
+/**
+ * Resolve the effective style for a macro in a given pandoc format. Per-format
+ * override wins over the macro's default; both can be partial — fields are
+ * not merged across `default` and `formats[fmt]` (the format-specific entry
+ * replaces `default` entirely when present), keeping rev.yaml semantics
+ * predictable.
+ *
+ * Falls back to `default` when no `formats[fmt]` exists, and to an empty
+ * style ({}) when neither is set.
+ */
+export function pickStyle(macro, format) {
+    const fmt = macro.formats?.[format];
+    if (fmt)
+        return fmt;
+    return macro.default ?? {};
+}
+// =============================================================================
+// Lua filter sidecar
+// =============================================================================
+/**
+ * Serialize the macro list to a compact JSON sidecar consumed by the lua
+ * filter at build time. The lua filter reads this file at startup and uses it
+ * to expand `\tofill{X}` (or any other declared macro) per FORMAT.
+ *
+ * Returns the absolute path to the written sidecar.
+ */
+export function writeMacrosSidecar(directory, macros) {
+    const sidecarPath = path.join(directory, '.macros.json');
+    fs.writeFileSync(sidecarPath, JSON.stringify({ macros }), 'utf-8');
+    return sidecarPath;
+}
+/**
+ * Resolve the absolute path to the bundled lua filter. Works both from source
+ * (`lib/macro-filter.lua`) and from the compiled package (`dist/lib/...`)
+ * because the postbuild script copies .lua files alongside the .js output.
+ */
+export function getMacroFilterPath() {
+    // import.meta.url points to the running file: lib/macros.ts in source,
+    // dist/lib/macros.js when published. The filter sits next to it.
+    //
+    // Use fileURLToPath so paths with spaces (Windows: "C:\Users\Gilles Colling\…")
+    // resolve correctly. The naive `new URL(...).pathname` returns URL-encoded
+    // `%20` segments and fs.existsSync silently fails.
+    const here = path.dirname(fileURLToPath(import.meta.url));
+    return path.join(here, 'macro-filter.lua');
+}
+//# sourceMappingURL=macros.js.map

package/dist/lib/macros.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"macros.js","sourceRoot":"","sources":["../../lib/macros.ts"],"names":[],"mappings":"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"}

package/dist/lib/pptx-color-filter.lua

@@ -0,0 +1,37 @@
+-- Pandoc Lua filter to add color support for PPTX
+-- Handles [text]{color=#RRGGBB} syntax
+
+function Span(elem)
+  local color = elem.attributes['color']
+  if color then
+    -- Remove # if present
+    color = color:gsub('^#', '')
+
+    -- Create raw OpenXML for colored text
+    local content_text = pandoc.utils.stringify(elem.content)
+
+    -- Check if content has bold
+    local is_bold = false
+    for _, item in ipairs(elem.content) do
+      if item.t == 'Strong' then
+        is_bold = true
+        content_text = pandoc.utils.stringify(item.content)
+        break
+      end
+    end
+
+    local bold_attr = ''
+    if is_bold then
+      bold_attr = ' b="1"'
+    end
+
+    -- Return raw OOXML span with color
+    local ooxml = string.format(
+      '<a:r><a:rPr%s><a:solidFill><a:srgbClr val="%s"/></a:solidFill></a:rPr><a:t>%s</a:t></a:r>',
+      bold_attr, color, content_text
+    )
+
+    return pandoc.RawInline('openxml', ooxml)
+  end
+  return elem
+end

package/dist/lib/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../lib/schema.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,gBAAgB;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,MAsK3B,CAAC;AA6HF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,gBAAgB,CAkDhF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,gBAAgB,EACxB,KAAK,EAAE;IAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,GACjG,MAAM,CAuBR"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../lib/schema.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,gBAAgB;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,MAwM3B,CAAC;AA6HF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,gBAAgB,CAkDhF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,gBAAgB,EACxB,KAAK,EAAE;IAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,GACjG,MAAM,CAuBR"}

package/dist/lib/schema.js

@@ -168,6 +168,40 @@ export const revYamlSchema = {
             },
             additionalProperties: true,
         },
+        macros: {
+            type: 'array',
+            description: 'Placeholder/highlight macros (e.g. \\tofill{X}). Built-in macros are merged automatically; entries here add new macros or override built-ins by name.',
+            items: {
+                type: 'object',
+                properties: {
+                    name: {
+                        type: 'string',
+                        description: 'Macro command name without leading backslash, e.g. "tofill" for \\tofill{...}',
+                        pattern: '^[A-Za-z][A-Za-z0-9]*$',
+                    },
+                    default: {
+                        type: 'object',
+                        description: 'Default rendering rules across formats',
+                        properties: {
+                            color: { type: 'string', pattern: '^[0-9A-Fa-f]{6}$' },
+                            bold: { type: 'boolean' },
+                            italic: { type: 'boolean' },
+                            bracket: { type: 'boolean', default: true },
+                            prefix: { type: 'string' },
+                            suffix: { type: 'string' },
+                        },
+                        additionalProperties: false,
+                    },
+                    formats: {
+                        type: 'object',
+                        description: 'Per-format overrides (keys: docx, pdf, latex, html, ...)',
+                        additionalProperties: true,
+                    },
+                },
+                required: ['name'],
+                additionalProperties: false,
+            },
+        },
     },
     additionalProperties: true,
 };