officeparser 7.6.2 → 7.8.0

package/dist/generators/MarkdownGenerator.js

@@ -27,12 +27,12 @@ const foldLines = (value) => String(value ?? '').replace(/[\r\n]+/g, ' ');
  * exactly (every feature on, GitHub-style admonitions) - the backward-compatibility anchor.
  */
 const MARKDOWN_DIALECT_PRESETS = {
-    extended: { admonitions: 'github', definitionLists: true, footnotes: true, citations: true, wikilinks: true, math: 'dollar', attributeLists: true, strikethrough: true, bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
-    github: { admonitions: 'github', definitionLists: false, footnotes: true, citations: false, wikilinks: false, math: 'dollar', attributeLists: false, strikethrough: true, bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
-    gitlab: { admonitions: 'gitlab', definitionLists: false, footnotes: true, citations: false, wikilinks: false, math: 'dollar', attributeLists: false, strikethrough: true, bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
-    obsidian: { admonitions: 'github', definitionLists: false, footnotes: true, citations: false, wikilinks: true, math: 'dollar', attributeLists: false, strikethrough: true, bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
-    pandoc: { admonitions: 'pandoc', definitionLists: true, footnotes: true, citations: true, wikilinks: false, math: 'dollar', attributeLists: true, strikethrough: true, bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
-    commonmark: { admonitions: 'none', definitionLists: false, footnotes: false, citations: false, wikilinks: false, math: 'none', attributeLists: false, strikethrough: false, bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'html' },
+    extended: { admonitions: 'blockquote', definitionLists: 'colon', footnotes: 'caret', citations: 'at', wikilinks: 'double-bracket', math: 'dollar', attributeLists: 'brace', strikethrough: 'tilde', highlight: 'equals', bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
+    github: { admonitions: 'blockquote', definitionLists: 'none', footnotes: 'caret', citations: 'none', wikilinks: 'none', math: 'dollar', attributeLists: 'none', strikethrough: 'tilde', highlight: 'none', bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
+    gitlab: { admonitions: 'fence', definitionLists: 'none', footnotes: 'caret', citations: 'none', wikilinks: 'none', math: 'dollar', attributeLists: 'none', strikethrough: 'tilde', highlight: 'none', bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
+    obsidian: { admonitions: 'blockquote', definitionLists: 'none', footnotes: 'caret', citations: 'none', wikilinks: 'double-bracket', math: 'dollar', attributeLists: 'none', strikethrough: 'tilde', highlight: 'equals', bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
+    pandoc: { admonitions: 'fence-attribute', definitionLists: 'colon', footnotes: 'caret', citations: 'at', wikilinks: 'none', math: 'dollar', attributeLists: 'brace', strikethrough: 'tilde', highlight: 'none', bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'native' },
+    commonmark: { admonitions: 'none', definitionLists: 'none', footnotes: 'none', citations: 'none', wikilinks: 'none', math: 'none', attributeLists: 'none', strikethrough: 'none', highlight: 'none', bulletListMarker: '-', orderedListMarker: '.', emphasisMarker: 'asterisk', tables: 'html' },
 };
 /**
  * Normalizes `MdGeneratorConfig.dialect` into a fully-resolved preset. A string names a preset
@@ -40,6 +40,30 @@ const MARKDOWN_DIALECT_PRESETS = {
  * omitted field falls back to - NOT "whatever preset was ambient before", since config merging
  * replaces the whole `dialect` field rather than layering an object on top of a prior string.
  */
+/**
+ * Coerces a per-capability field to its canonical syntax variant. An omitted value inherits `base`;
+ * a deprecated boolean maps `true` -> `onValue` and `false` -> `'none'` (the two are the only legacy
+ * inputs, dropped next major); an explicit syntax string passes through unchanged.
+ */
+function resolveToggle(value, onValue, base) {
+    if (value === undefined)
+        return base;
+    if (value === true)
+        return onValue;
+    if (value === false)
+        return 'none';
+    return value;
+}
+/** Maps the deprecated admonition flavor aliases to their syntax names; passes syntax names through. */
+function resolveAdmonitions(value, base) {
+    switch (value) {
+        case undefined: return base;
+        case 'github': return 'blockquote';
+        case 'gitlab': return 'fence';
+        case 'pandoc': return 'fence-attribute';
+        default: return value;
+    }
+}
 function resolveDialect(dialect) {
     if (dialect === undefined)
         return MARKDOWN_DIALECT_PRESETS.extended;
@@ -47,14 +71,15 @@ function resolveDialect(dialect) {
         return MARKDOWN_DIALECT_PRESETS[dialect] ?? MARKDOWN_DIALECT_PRESETS.extended;
     const base = MARKDOWN_DIALECT_PRESETS[dialect.extends ?? 'extended'] ?? MARKDOWN_DIALECT_PRESETS.extended;
     return {
-        admonitions: dialect.admonitions ?? base.admonitions,
-        definitionLists: dialect.definitionLists ?? base.definitionLists,
-        footnotes: dialect.footnotes ?? base.footnotes,
-        citations: dialect.citations ?? base.citations,
-        wikilinks: dialect.wikilinks ?? base.wikilinks,
+        admonitions: resolveAdmonitions(dialect.admonitions, base.admonitions),
+        definitionLists: resolveToggle(dialect.definitionLists, 'colon', base.definitionLists),
+        footnotes: resolveToggle(dialect.footnotes, 'caret', base.footnotes),
+        citations: resolveToggle(dialect.citations, 'at', base.citations),
+        wikilinks: resolveToggle(dialect.wikilinks, 'double-bracket', base.wikilinks),
         math: dialect.math ?? base.math,
-        attributeLists: dialect.attributeLists ?? base.attributeLists,
-        strikethrough: dialect.strikethrough ?? base.strikethrough,
+        attributeLists: resolveToggle(dialect.attributeLists, 'brace', base.attributeLists),
+        strikethrough: resolveToggle(dialect.strikethrough, 'tilde', base.strikethrough),
+        highlight: dialect.highlight ?? base.highlight,
         bulletListMarker: dialect.bulletListMarker ?? base.bulletListMarker,
         orderedListMarker: dialect.orderedListMarker ?? base.orderedListMarker,
         emphasisMarker: dialect.emphasisMarker ?? base.emphasisMarker,
@@ -71,6 +96,7 @@ function resolveFallbackToHtml(fallbackToHtml) {
         // inlineFormatting is opt-in only: it is never enabled by the boolean form, since it changes
         // default output. Every other field follows the boolean.
         textFormatting: on, alignment: on, anchors: on, tables: on, embeds: on, cellLineBreaks: on,
+        itemLineBreaks: on,
         inlineFormatting: false,
     });
     if (fallbackToHtml === undefined || typeof fallbackToHtml === 'boolean')
@@ -83,6 +109,7 @@ function resolveFallbackToHtml(fallbackToHtml) {
         tables: fallbackToHtml.tables ?? on.tables,
         embeds: fallbackToHtml.embeds ?? on.embeds,
         cellLineBreaks: fallbackToHtml.cellLineBreaks ?? on.cellLineBreaks,
+        itemLineBreaks: fallbackToHtml.itemLineBreaks ?? on.itemLineBreaks,
         inlineFormatting: fallbackToHtml.inlineFormatting ?? on.inlineFormatting,
     };
 }
@@ -133,10 +160,19 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
     collectedAbbreviations = new Map();
     resolvedDialect;
     resolvedFallbackToHtml;
+    resolvedEmbeds;
     constructor(ast, config) {
         super('md', ast, config);
         this.resolvedDialect = resolveDialect(this.config.mdConfig.dialect);
         this.resolvedFallbackToHtml = resolveFallbackToHtml(this.config.mdConfig.fallbackToHtml);
+        // `dialect.embeds` is the authority for embed form. It lives in a different config object
+        // than the deprecated `fallbackToHtml.embeds` boolean, and an explicit boolean `false` must
+        // still win over the preset default, so it is resolved here rather than in `resolveDialect`:
+        // an embeds value set on the dialect OBJECT wins; otherwise the boolean maps (`true`/unset ->
+        // `'html'`, `false` -> `'link'`); otherwise the default `'html'`.
+        const dialectCfg = this.config.mdConfig.dialect;
+        const explicitEmbeds = (dialectCfg && typeof dialectCfg === 'object') ? dialectCfg.embeds : undefined;
+        this.resolvedEmbeds = explicitEmbeds ?? (this.resolvedFallbackToHtml.embeds ? 'html' : 'link');
     }
     /**
      * Renders anchor tags if HTML fallback is allowed.
@@ -163,10 +199,13 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
      * ImageMetadata/TableMetadata's width/align fields - the canonical form is always
      * `key=value`, matching MarkdownParser's own vocabulary (MARKDOWN_DIALECT.md §15).
      */
-    renderAttributeList(meta) {
-        if (!this.resolvedDialect.attributeLists)
+    renderAttributeList(meta, options = {}) {
+        if (this.resolvedDialect.attributeLists === 'none')
             return '';
-        if (!meta?.width && !meta?.align)
+        if (!meta)
+            return '';
+        const align = options.skipAlign ? undefined : meta.align;
+        if (!meta.width && !align)
             return '';
         const parts = [];
         // Allowlist, not escape. These land in `metadata.width`/`align` on reparse, which the
@@ -182,8 +221,8 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
         if (meta.width && MD_LENGTH_PATTERN.test(String(meta.width).trim())) {
             parts.push(`width=${String(meta.width).trim()}`);
         }
-        if (meta.align && MD_ALIGN_VALUES.has(String(meta.align).trim().toLowerCase())) {
-            parts.push(`align=${String(meta.align).trim().toLowerCase()}`);
+        if (align && MD_ALIGN_VALUES.has(String(align).trim().toLowerCase())) {
+            parts.push(`align=${String(align).trim().toLowerCase()}`);
         }
         if (parts.length === 0)
             return '';
@@ -283,8 +322,19 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                             text = emphasisAsterisk ? `**${text}**` : `__${text}__`;
                         if (node.formatting.italic)
                             text = emphasisAsterisk ? `*${text}*` : `_${text}_`;
-                        if (node.formatting.strikethrough && this.resolvedDialect.strikethrough)
+                        if (node.formatting.strikethrough && this.resolvedDialect.strikethrough !== 'none')
                             text = `~~${text}~~`;
+                        // `==text==` highlight, in dialects that define it (Obsidian/extended). A plain
+                        // highlight (the default yellow) always becomes `==text==`; a highlight carrying
+                        // a SPECIFIC colour stays a background-color <span> when `inlineFormatting` is on,
+                        // so its exact colour survives. With `inlineFormatting` off (no span to hold it)
+                        // even a coloured highlight degrades to `==` rather than being dropped. In
+                        // GFM/CommonMark `==` is literal, so a highlight falls through to the <span> path.
+                        const isDefaultHighlight = node.formatting.backgroundColor === '#ffff00';
+                        const emitHighlightMark = !!node.formatting.backgroundColor && this.resolvedDialect.highlight !== 'none'
+                            && (isDefaultHighlight || !this.resolvedFallbackToHtml.inlineFormatting);
+                        if (emitHighlightMark)
+                            text = `==${text}==`;
                         // Use HTML tags for formatting not natively supported by standard Markdown
                         if (this.resolvedFallbackToHtml.textFormatting) {
                             if (node.formatting.underline)
@@ -307,14 +357,18 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                                     styles.push(`${prop}: ${safe}`);
                             };
                             pushStyle('color', node.formatting.color);
-                            pushStyle('background-color', node.formatting.backgroundColor);
+                            // Skip the background-color only when it was already emitted as `==text==`
+                            // above; a specific-colour highlight in a highlight dialect still keeps its
+                            // exact colour here.
+                            if (!emitHighlightMark)
+                                pushStyle('background-color', node.formatting.backgroundColor);
                             pushStyle('font-size', node.formatting.size);
                             if (styles.length)
                                 text = `<span style="${styles.join('; ')}">${text}</span>`;
                         }
                     }
                     const meta = node.metadata;
-                    if (meta?.wikilink && this.resolvedDialect.wikilinks) {
+                    if (meta?.wikilink && this.resolvedDialect.wikilinks !== 'none') {
                         // Obsidian syntax: bare page name, or page|alias when the display
                         // text differs from the page name. Strip the `[]|`/newline chars
                         // that would break out of the `[[...]]` wrapper.
@@ -340,8 +394,11 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                                 link = '#' + this.slugify(target);
                             }
                             // Reject javascript:/data: schemes and encode `()`/whitespace so the
-                            // URL can't break out of `](...)` or inject a script link.
-                            text = `[${text}](${(0, sanitize_js_1.sanitizeMarkdownUrl)(link)})`;
+                            // URL can't break out of `](...)` or inject a script link. An advisory
+                            // title follows as `"title"` (quotes inside it escaped), matching what
+                            // the parser reads back.
+                            const linkTitle = meta.title ? ` "${meta.title.replace(/"/g, '\\"')}"` : '';
+                            text = `[${text}](${(0, sanitize_js_1.sanitizeMarkdownUrl)(link)}${linkTitle})`;
                         }
                     }
                     if (meta?.abbreviationTitle) {
@@ -358,7 +415,7 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                         // this branch also replaces `text` wholesale, so a strip that left `<`
                         // behind discarded the escaping applied earlier.
                         const key = String(meta.citationKey).replace(/[^a-zA-Z0-9_:.-]/g, '');
-                        text = this.resolvedDialect.citations ? `[@${key}]` : `[${key}]`;
+                        text = this.resolvedDialect.citations !== 'none' ? `[@${key}]` : `[${key}]`;
                     }
                     return text;
                 }
@@ -408,7 +465,17 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                         ? (meta.checked ? `${bullet}[x] ` : `${bullet}[ ] `)
                         : (meta?.listType === 'ordered' ? `${(meta.itemIndex ?? 0) + 1}${this.resolvedDialect.orderedListMarker} ` : bullet);
                     const anchors = this.renderAnchors(meta);
-                    return `${indent}${marker}${anchors}${childrenOutput}\n`;
+                    // A list item is a single Markdown line. HTML-origin items carry `paragraph`
+                    // children (e.g. `<li><p>a</p><ul>...`), whose renderer appends `\n\n`; dumped
+                    // verbatim that produces `- a\n\n\n    - a1`, whose blank line splits the list
+                    // apart and whose indent is then stripped on reparse, flattening the nesting.
+                    // Collapse the item's internal breaks the same way table cells do (see the
+                    // `cellLineBreaks` handling in renderMarkdownTable): join with `<br>` when the
+                    // fallback is on, a space when off. Block children (code fences, tables) inside
+                    // an item degrade under this join, exactly as they do inside a cell.
+                    const br = this.resolvedFallbackToHtml.itemLineBreaks ? '<br>' : ' ';
+                    const content = childrenOutput.trim().replace(/[ \t]*\n+/g, br);
+                    return `${indent}${marker}${anchors}${content}\n`;
                 }
                 case 'image': {
                     if (!this.config.includeImages)
@@ -427,7 +494,8 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                     // Strip `[]` from alt (would close the `![...]`) and neutralize the URL scheme.
                     const safeAlt = (0, sanitize_js_1.markdownEscapeText)(alt).replace(/[[\]]/g, '');
                     const safeSrc = (0, sanitize_js_1.sanitizeMarkdownUrl)(src, { allowDataImage: true });
-                    return `${anchors}${anchors ? '\n' : ''}![${safeAlt}](${safeSrc})${this.renderAttributeList(meta)}`;
+                    const imgTitle = meta?.title ? ` "${meta.title.replace(/"/g, '\\"')}"` : '';
+                    return `${anchors}${anchors ? '\n' : ''}![${safeAlt}](${safeSrc}${imgTitle})${this.renderAttributeList(meta)}`;
                 }
                 case 'table': {
                     const anchors = this.renderAnchors(node.metadata);
@@ -437,7 +505,7 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                     // only the plain pipe-table form needs the attribute-list syntax for alignment.
                     const usedHtmlFallback = this.resolvedDialect.tables === 'html' ||
                         (this.resolvedFallbackToHtml.tables && (this.hasNestedTable(node) || this.hasColspanOrRowspan(node)));
-                    const attrList = usedHtmlFallback ? '' : this.renderAttributeList(node.metadata);
+                    const attrList = usedHtmlFallback ? '' : this.renderAttributeList(node.metadata, { skipAlign: true });
                     if (attrList) {
                         // Must glue directly below the last row with no blank line, or
                         // MarkdownParser's block splitter won't see it as part of the same block.
@@ -530,7 +598,7 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                 case 'note': {
                     const meta = node.metadata;
                     if (meta?.noteType === 'footnote' || meta?.noteType === 'endnote') {
-                        if (!this.resolvedDialect.footnotes) {
+                        if (this.resolvedDialect.footnotes === 'none') {
                             // Dialect has no footnote syntax - the caller inlines this bare body
                             // as a parenthetical at the reference point instead of collecting it
                             // into an end-of-document "### Notes" section under a [^id] marker.
@@ -544,32 +612,67 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                     return `> **Note:** ${childrenOutput.trim()}\n\n`;
                 }
                 case 'embed': {
-                    // Markdown has no native embed syntax. When fallbackToHtml.embeds is on (our
-                    // save default), emit the exact single-line div MarkdownParser recognises on
-                    // reimport; otherwise degrade to a plain link.
+                    // Markdown has no native embed syntax. `this.resolvedEmbeds` (from
+                    // `dialect.embeds`, honoring the deprecated `fallbackToHtml.embeds` boolean)
+                    // selects the form: 'html' (the single-line block this library has always
+                    // emitted and re-recognises), 'directive' (a remark-directive leaf), 'link'
+                    // (a plain link), 'thumbnail' (YouTube-only clickable preview).
                     const meta = node.metadata;
+                    const mode = this.resolvedEmbeds;
+                    // A directive label sits inside `::name[...]`; strip the `[]`/newline chars that
+                    // would break out of it. An attribute value sits inside `{...}`; percent-encode
+                    // the space/brace chars that would break out (widths/aligns/ids never contain
+                    // them, but a src can).
+                    const dirLabel = (meta?.label || '').replace(/[[\]\r\n]+/g, ' ').trim();
+                    const dirUrl = (u) => (0, sanitize_js_1.sanitizeMarkdownUrl)(u).replace(/[{}\s]/g, c => '%' + c.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0'));
+                    const attrList = (pairs) => {
+                        const kv = pairs.filter(([, v]) => v !== undefined && v !== '').map(([k, v]) => `${k}=${v}`);
+                        return kv.length ? `{${kv.join(' ')}}` : '';
+                    };
                     if (meta?.embedType === 'iframe') {
-                        // sanitizeUrl scheme-checks and HTML-escapes the src (hostile schemes drop
-                        // the node). The single-line <iframe> is what MarkdownParser recognises on
-                        // reimport, gated there on preserveIframes.
-                        const safe = (0, sanitize_js_1.sanitizeUrl)(meta?.url || '');
-                        if (!safe)
-                            return '';
-                        if (this.resolvedFallbackToHtml.embeds) {
+                        const rawUrl = meta?.url || '';
+                        if (mode === 'directive') {
+                            const src = dirUrl(rawUrl);
+                            if (!src)
+                                return '';
+                            const lbl = dirLabel ? `[${dirLabel}]` : '';
+                            return `::embed${lbl}${attrList([['src', src], ['width', meta?.width], ['height', meta?.height], ['align', meta?.align]])}\n\n`;
+                        }
+                        if (mode === 'html') {
+                            // sanitizeUrl scheme-checks and HTML-escapes the src (hostile schemes drop
+                            // the node). The single-line <iframe> is what MarkdownParser recognises on
+                            // reimport, gated there on preserveIframes.
+                            const safe = (0, sanitize_js_1.sanitizeUrl)(rawUrl);
+                            if (!safe)
+                                return '';
                             const w = meta?.width ? ` width="${(0, sanitize_js_1.escapeHtml)(meta.width)}"` : '';
                             const h = meta?.height ? ` height="${(0, sanitize_js_1.escapeHtml)(meta.height)}"` : '';
                             return `\n<iframe src="${safe}"${w}${h}></iframe>\n\n`;
                         }
-                        return `[Embed](${(0, sanitize_js_1.sanitizeMarkdownUrl)(meta?.url || '')})\n\n`;
+                        // 'link' and 'thumbnail' (thumbnail is YouTube-only, so a generic iframe
+                        // degrades to a link) both emit a plain link.
+                        const safe = (0, sanitize_js_1.sanitizeMarkdownUrl)(rawUrl);
+                        return safe ? `[${meta?.label || 'Embed'}](${safe})\n\n` : '';
                     }
                     const id = meta?.videoId || '';
-                    if (this.resolvedFallbackToHtml.embeds) {
+                    if (mode === 'directive') {
+                        const lbl = dirLabel ? `[${dirLabel}]` : '';
+                        return `::youtube${lbl}${attrList([['id', id], ['width', meta?.width], ['align', meta?.align]])}\n\n`;
+                    }
+                    if (mode === 'html') {
                         const width = meta?.width ? ` data-width="${(0, sanitize_js_1.escapeHtml)(meta.width)}"` : '';
                         const align = meta?.align ? ` data-align="${(0, sanitize_js_1.escapeHtml)(meta.align)}"` : '';
-                        return `\n<div data-youtube-video="${(0, sanitize_js_1.escapeHtml)(id)}"${width}${align}></div>\n\n`;
+                        const lbl = meta?.label ? ` data-embed-label="${(0, sanitize_js_1.escapeHtml)(meta.label)}"` : '';
+                        return `\n<div data-youtube-video="${(0, sanitize_js_1.escapeHtml)(id)}"${width}${align}${lbl}></div>\n\n`;
                     }
+                    if (mode === 'thumbnail' && id) {
+                        const watch = (0, sanitize_js_1.sanitizeMarkdownUrl)(`https://www.youtube.com/watch?v=${id}`);
+                        const thumb = (0, sanitize_js_1.sanitizeMarkdownUrl)(`https://img.youtube.com/vi/${id}/hqdefault.jpg`);
+                        return `[![${meta?.label || 'YouTube'}](${thumb})](${watch})\n\n`;
+                    }
+                    // 'link' (and 'thumbnail' with no id): a plain link.
                     const url = meta?.url || (id ? `https://youtu.be/${id}` : '');
-                    return url ? `[YouTube](${(0, sanitize_js_1.sanitizeMarkdownUrl)(url)})\n\n` : '';
+                    return url ? `[${meta?.label || 'YouTube'}](${(0, sanitize_js_1.sanitizeMarkdownUrl)(url)})\n\n` : '';
                 }
                 case 'admonition': {
                     const meta = node.metadata;
@@ -586,12 +689,12 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                     const title = meta?.title ? (0, sanitize_js_1.markdownEscapeText)(foldLines(meta.title)) : '';
                     const body = childrenOutput.trim();
                     switch (this.resolvedDialect.admonitions) {
-                        case 'gitlab':
+                        case 'fence':
                             // GLFM fenced-div: no dedicated title syntax, so a custom title (if
                             // any) is folded into the body as a bold first line.
                             return `:::${type}\n${title ? `**${title}**\n\n` : ''}${body}\n:::\n\n`;
-                        case 'pandoc':
-                            // Pandoc's own fenced-div-with-class syntax; same title handling as gitlab.
+                        case 'fence-attribute':
+                            // Pandoc's own fenced-div-with-class syntax; same title handling as fence.
                             return `::: {.${type}}\n${title ? `**${title}**\n\n` : ''}${body}\n:::\n\n`;
                         case 'none': {
                             // Degrade to a plain bold-labeled blockquote, no special marker.
@@ -599,7 +702,7 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                             const heading = title || label.charAt(0) + label.slice(1).toLowerCase();
                             return `> **${heading}:**\n${quotedLines}\n\n`;
                         }
-                        case 'github':
+                        case 'blockquote':
                         default: {
                             // Canonical GitHub blockquote form. No dedicated title syntax either
                             // (matches this library's historical output).
@@ -609,15 +712,15 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                     }
                 }
                 case 'definitionList':
-                    if (!this.resolvedDialect.definitionLists)
+                    if (this.resolvedDialect.definitionLists === 'none')
                         return `${childrenOutput}\n`;
                     return `${childrenOutput}\n`;
                 case 'definitionTerm':
-                    if (!this.resolvedDialect.definitionLists)
+                    if (this.resolvedDialect.definitionLists === 'none')
                         return `**${childrenOutput}**\n\n`;
                     return `${childrenOutput}\n`;
                 case 'definitionDescription':
-                    if (!this.resolvedDialect.definitionLists)
+                    if (this.resolvedDialect.definitionLists === 'none')
                         return `${childrenOutput}\n\n`;
                     return `: ${childrenOutput}\n`;
                 case 'chart':
@@ -732,7 +835,7 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
         // end-of-document "### Notes" section, or its content would be duplicated.
         const isInlinedFootnote = (note) => {
             const meta = note.metadata;
-            return (meta?.noteType === 'footnote' || meta?.noteType === 'endnote') && !this.resolvedDialect.footnotes;
+            return (meta?.noteType === 'footnote' || meta?.noteType === 'endnote') && this.resolvedDialect.footnotes === 'none';
         };
         this.collectNotesFrom(node);
         let result = await processor(node, childrenOutput);
@@ -848,7 +951,7 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
             return;
         const isInlinedFootnote = (note) => {
             const meta = note.metadata;
-            return (meta?.noteType === 'footnote' || meta?.noteType === 'endnote') && !this.resolvedDialect.footnotes;
+            return (meta?.noteType === 'footnote' || meta?.noteType === 'endnote') && this.resolvedDialect.footnotes === 'none';
         };
         this.collectedNotes.push(...node.notes.filter(note => !isInlinedFootnote(note)));
     }
@@ -892,7 +995,9 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                         let cellContent = await this.processNodeRecursive(cellNode, processor);
                         // Use <br> fallback only if allowed, otherwise space
                         const br = this.resolvedFallbackToHtml.cellLineBreaks ? '<br>' : ' ';
-                        cellContent = cellContent.trim().replace(/\n+/g, br).replace(/\|/g, '\\|');
+                        // Consume any trailing spaces before the newline(s) too, so a hard-break's
+                        // `  \n` collapses to a single `<br>` instead of leaving `  <br>` in the cell.
+                        cellContent = cellContent.trim().replace(/[ \t]*\n+/g, br).replace(/\|/g, '\\|');
                         rowCells.push(cellContent);
                         // Handle colspan by adding empty cells
                         const colSpan = cellNode.metadata?.colSpan || 1;
@@ -909,7 +1014,17 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
                 this.inImplicitBold = wasInImplicitBold;
             }
         }
-        // Second pass: Build table string with separator
+        // Second pass: Build table string with separator. The separator carries standard GFM
+        // per-column alignment (`:---`/`:---:`/`---:`) from columnAlignments, or the single table-level
+        // align applied to every column, rather than a non-standard trailing `{align}` attribute list.
+        const tableMeta = node.metadata;
+        // Column alignment lives on each cell (CellMetadata.align); read it off the header row.
+        // Fall back to the single table-level align (an editor's data-align) for every column.
+        const headerCells = (node.children?.[0]?.children || []).filter(c => c.type === 'cell');
+        const alignMarker = (i) => {
+            const a = headerCells[i]?.metadata?.align ?? tableMeta?.align;
+            return a === 'center' ? ':---:' : a === 'left' ? ':---' : a === 'right' ? '---:' : '---';
+        };
         for (let i = 0; i < processedRows.length; i++) {
             const row = processedRows[i];
             // Pad row with empty cells if it has fewer than maxCols
@@ -918,7 +1033,7 @@ class MarkdownGenerator extends BaseGenerator_js_1.BaseGenerator {
             tableOutput += `| ${row.join(' | ')} |\n`;
             if (i === 0) {
                 // Header separator
-                tableOutput += `| ${Array(maxCols).fill(' --- ').join(' | ')} |\n`;
+                tableOutput += `| ${Array.from({ length: maxCols }, (_, i) => alignMarker(i)).join(' | ')} |\n`;
             }
         }
         return `\n${tableOutput}\n`;