@inshapardaz/likhari-converters 0.1.18-dev.156 → 0.1.18-dev.162

package/dist/html/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/html/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiCjD,kEAAkE;AAClE,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIlD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKvD;AAsWD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAMvF"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/html/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAkCjD,kEAAkE;AAClE,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIlD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKvD;AAoVD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAMvF"}

package/dist/html/parse.js

@@ -1,3 +1,4 @@
+import { layoutOrDefault, scaleOrDefault } from '../shared/poetry.js';
 import { FORMAT_BOLD, FORMAT_CODE, FORMAT_HIGHLIGHT, FORMAT_ITALIC, FORMAT_STRIKETHROUGH, FORMAT_SUBSCRIPT, FORMAT_SUPERSCRIPT, FORMAT_UNDERLINE, INDENT_PX, elementBase, makeState, paragraph, textNode, } from '../shared/serialized.js';
 const ALIGNMENTS = new Set(['left', 'right', 'center', 'justify', 'start', 'end']);
 const TAG_FORMATS = {
@@ -251,43 +252,30 @@ function convertLayout(container) {
     const templateColumns = container.style.gridTemplateColumns || `repeat(${Math.max(items.length, 2)}, 1fr)`;
     return elementBase('layout-container', items.length > 0 ? items : [elementBase('layout-item', [paragraph()])], { templateColumns });
 }
-const POETRY_LAYOUTS = new Set(['single', 'two-column', 'alternating']);
-const POETRY_ALIGNS = new Set(['justify', 'left', 'right', 'start']);
-function convertPoetryCouplet(el) {
-    const centered = el.getAttribute('data-likhari-poetry-couplet-centered') === 'true';
-    const children = flowBlocks(el);
-    return elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { centered });
-}
 function convertPoetry(el) {
-    const rawLayout = el.getAttribute('data-likhari-poetry-layout') ?? 'single';
-    const layout = POETRY_LAYOUTS.has(rawLayout) ? rawLayout : 'single';
-    const rawAlign = el.getAttribute('data-likhari-poetry-align') ?? 'justify';
-    const align = POETRY_ALIGNS.has(rawAlign) ? rawAlign : 'justify';
-    // Couplets may mix wrapper types within one block — a two-column layout
-    // row (data-likhari-layout-container) and a centered single couplet
-    // (data-likhari-poetry-couplet) can sit side by side — grab all of them,
-    // not just the first, or every couplet past the first silently disappears.
-    const couplets = Array.from(el.children)
-        .map((c) => {
-        if (c.hasAttribute('data-likhari-layout-container'))
-            return convertLayout(c);
-        if (c.hasAttribute('data-likhari-poetry-couplet'))
-            return convertPoetryCouplet(c);
-        return null;
-    })
-        .filter((n) => n !== null);
-    if (couplets.length > 0)
-        return elementBase('poetry-block', couplets, { layout, align });
-    // Fallback: legacy markup with no explicit couplet wrappers at all.
+    const layout = layoutOrDefault(el.getAttribute('data-likhari-poetry-layout'));
+    const settings = {
+        layout,
+        spacing: scaleOrDefault(el.getAttribute('data-likhari-poetry-spacing')),
+        gutter: scaleOrDefault(el.getAttribute('data-likhari-poetry-gutter')),
+        stagger: scaleOrDefault(el.getAttribute('data-likhari-poetry-stagger')),
+        ...(Number(el.getAttribute('data-likhari-poetry-width')) > 0 ? { width: Number(el.getAttribute('data-likhari-poetry-width')) } : {}),
+    };
     if (layout === 'two-column') {
-        return elementBase('poetry-block', [
-            elementBase('layout-container', [elementBase('layout-item', [paragraph()]), elementBase('layout-item', [paragraph()])], {
-                templateColumns: 'repeat(2, 1fr)',
-            }),
-        ], { layout, align });
+        // One LayoutContainerNode row per couplet — grab all of them, not just
+        // the first, or every couplet past the first silently disappears.
+        const containerEls = Array.from(el.children).filter((c) => c.hasAttribute('data-likhari-layout-container'));
+        const containers = containerEls.length > 0
+            ? containerEls.map((c) => convertLayout(c))
+            : [
+                elementBase('layout-container', [elementBase('layout-item', [paragraph()]), elementBase('layout-item', [paragraph()])], {
+                    templateColumns: 'repeat(2, 1fr)',
+                }),
+            ];
+        return elementBase('poetry-couplet', containers, settings);
     }
     const children = flowBlocks(el);
-    return elementBase('poetry-block', [elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { centered: false })], { layout, align });
+    return elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], settings);
 }
 function convertFootnoteList(el) {
     const items = [];
@@ -304,6 +292,8 @@ function convertFootnoteList(el) {
         Array.from(clone.querySelectorAll('a'))
             .filter((a) => a.getAttribute('href') === `#fnref-${footnoteId}`)
             .forEach((a) => a.remove());
+        // Likewise the "[n]" marker our serializer writes in front of the note.
+        clone.querySelectorAll('[data-likhari-footnote-number]').forEach((n) => n.remove());
         const children = flowBlocks(clone);
         items.push(elementBase('footnote-item', children.length > 0 ? children : [paragraph()], { footnoteId }));
     });

package/dist/html/serialize.d.ts

@@ -4,5 +4,7 @@ import { type SNode } from '../shared/serialized.js';
 export declare function escapeHtml(value: string): string;
 export declare function escapeAttr(value: string): string;
 export declare function nodeToHtml(node: SNode, ctx?: ConverterContext): string;
+/** Lets another converter (Markdown's HTML-table fallback) number footnotes the same way. */
+export declare function setFootnoteOrder(blocks: SNode[]): void;
 export declare function serializeHtml(state: SerializedEditorState, ctx?: ConverterContext): string;
 //# sourceMappingURL=serialize.d.ts.map

package/dist/html/serialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/html/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAEkG,KAAK,KAAK,EAClH,MAAM,sBAAsB,CAAC;AAE9B,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AA8ID,wBAAgB,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAiDtE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAI1F"}
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/html/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAIjD,OAAO,EAEkG,KAAK,KAAK,EAClH,MAAM,sBAAsB,CAAC;AAE9B,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAiOD,wBAAgB,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CA+CtE;AAED,6FAA6F;AAC7F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAEtD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAI1F"}

package/dist/html/serialize.js

@@ -1,3 +1,4 @@
+import { POETRY_CENTERED_WIDTH, POETRY_COUPLET_GAP, POETRY_GUTTER_PX, POETRY_RULE, POETRY_STAGGER_WIDTH, layoutOrDefault, scaleOrDefault, } from '../shared/poetry.js';
 import { FORMAT_BOLD, FORMAT_CODE, FORMAT_HIGHLIGHT, FORMAT_ITALIC, FORMAT_STRIKETHROUGH, FORMAT_SUBSCRIPT, FORMAT_SUPERSCRIPT, FORMAT_UNDERLINE, INDENT_PX, collectFootnoteOrder, rootChildren, } from '../shared/serialized.js';
 export function escapeHtml(value) {
     return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
@@ -69,6 +70,13 @@ function listItemToHtml(item, listType, ctx) {
     const checked = listType === 'check' ? ` data-checked="${item.checked ? 'true' : 'false'}"` : '';
     return `<li${blockAttrs(item, checked)}>${inlineChildren(item, ctx)}</li>`;
 }
+/** Table and footnote styling matching editor.css, written inline so exported HTML keeps it. */
+const TABLE_BORDER = '#cfcac0';
+const TABLE_HEADER_BG = '#f1efe9';
+const TABLE_STYLE = 'border-collapse: collapse; margin: 1em 0; width: 100%';
+const CELL_STYLE = `border: 1px solid ${TABLE_BORDER}; padding: 6px 10px; min-width: 72px; vertical-align: top`;
+const HEADER_CELL_STYLE = `background: ${TABLE_HEADER_BG}; font-weight: 600; text-align: start`;
+const FOOTNOTE_LIST_STYLE = `list-style: none; margin: 2em 0 0 0; padding: 0.75em 0 0 1.5em; border-top: 1px solid ${TABLE_BORDER}; font-size: 0.9em`;
 function tableToHtml(node, ctx) {
     const rows = (node.children ?? [])
         .map((row) => {
@@ -79,13 +87,14 @@ function tableToHtml(node, ctx) {
             const span = (Number(cell.colSpan) > 1 ? ` colspan="${Number(cell.colSpan)}"` : '') +
                 (Number(cell.rowSpan) > 1 ? ` rowspan="${Number(cell.rowSpan)}"` : '');
             const content = (cell.children ?? []).map((child) => nodeToHtml(child, ctx)).join('');
-            return `<${tag}${span}>${content}</${tag}>`;
+            const style = header ? `${CELL_STYLE}; ${HEADER_CELL_STYLE}` : CELL_STYLE;
+            return `<${tag}${span} style="${escapeAttr(style)}">${content}</${tag}>`;
         })
             .join('');
         return `<tr>${cells}</tr>`;
     })
         .join('');
-    return `<table><tbody>${rows}</tbody></table>`;
+    return `<table style="${escapeAttr(TABLE_STYLE)}"><tbody>${rows}</tbody></table>`;
 }
 /** Set once per serializeHtml() call and read by the footnote cases below —
  * avoids threading a numbering map through every recursive nodeToHtml call
@@ -102,10 +111,11 @@ function footnoteListToHtml(node, ctx) {
         .map((item) => {
         const id = String(item.footnoteId ?? '');
         const body = (item.children ?? []).map((child) => nodeToHtml(child, ctx)).join('');
-        return `<li id="fn-${escapeAttr(id)}" data-likhari-footnote-item="${escapeAttr(id)}">${body} <a href="#fnref-${escapeAttr(id)}">↩</a></li>`;
+        const number = `<span data-likhari-footnote-number style="font-weight: 600">[${footnoteOrder.get(id) ?? '?'}] </span>`;
+        return `<li id="fn-${escapeAttr(id)}" data-likhari-footnote-item="${escapeAttr(id)}" style="margin: 0.3em 0">${number}${body} <a href="#fnref-${escapeAttr(id)}">↩</a></li>`;
     })
         .join('');
-    return `<ol data-likhari-footnote-list>${items}</ol>`;
+    return `<ol data-likhari-footnote-list style="${escapeAttr(FOOTNOTE_LIST_STYLE)}">${items}</ol>`;
 }
 function layoutToHtml(node, ctx) {
     const items = node.children ?? [];
@@ -115,17 +125,91 @@ function layoutToHtml(node, ctx) {
         .join('');
     return `<div data-likhari-layout-container style="display: grid; grid-template-columns: ${escapeAttr(templateColumns)}">${columns}</div>`;
 }
-function poetryToHtml(node, ctx) {
-    const layout = node.layout === 'two-column' || node.layout === 'alternating' ? node.layout : 'single';
-    const align = typeof node.align === 'string' ? node.align : 'justify';
-    const inner = (node.children ?? []).map((child) => nodeToHtml(child, ctx)).join('');
-    return `<div data-likhari-poetry-layout="${layout}" data-likhari-poetry-align="${align}" style="text-align: ${escapeAttr(align)}">${inner}</div>`;
+function firstDirection(nodes) {
+    for (const node of nodes) {
+        if (node.direction === 'rtl' || node.direction === 'ltr')
+            return node.direction;
+        const inner = firstDirection(node.children ?? []);
+        if (inner)
+            return inner;
+    }
+    return 'ltr';
 }
-function poetryCoupletToHtml(node, ctx) {
-    const centered = node.centered === true;
-    const inner = (node.children ?? []).map((child) => nodeToHtml(child, ctx)).join('');
-    const centeredAttr = centered ? ' data-likhari-poetry-couplet-centered="true"' : '';
-    return `<div data-likhari-poetry-couplet${centeredAttr}>${inner}</div>`;
+/** One misra line; styles are inline so the exported page keeps the editor's look. */
+function poetryLineToHtml(line, extraStyle, ctx) {
+    const dir = line.direction === 'rtl' || line.direction === 'ltr' ? ` dir="${line.direction}"` : '';
+    const style = ['margin: 0', extraStyle].filter(Boolean).join('; ');
+    return `<p${dir} style="${escapeAttr(style)}">${inlineChildren(line, ctx)}</p>`;
+}
+function poetryToHtml(node, ctx) {
+    const layout = layoutOrDefault(node.layout);
+    const spacing = scaleOrDefault(node.spacing);
+    const gutter = scaleOrDefault(node.gutter);
+    const stagger = scaleOrDefault(node.stagger);
+    const width = typeof node.width === 'number' && node.width > 0 ? node.width : undefined;
+    const children = node.children ?? [];
+    const dir = firstDirection(children);
+    const gap = POETRY_COUPLET_GAP[spacing];
+    const separator = `border-top: ${POETRY_RULE}; margin-top: ${gap}; padding-top: calc(${gap} * 0.6)`;
+    let body;
+    if (layout === 'two-column') {
+        body = children
+            .map((row, r) => {
+            const items = row.children ?? [];
+            const centered = items.length === 1;
+            const templateColumns = typeof row.templateColumns === 'string' ? row.templateColumns : `repeat(${Math.max(items.length, 1)}, 1fr)`;
+            const rowStyle = [
+                'display: grid',
+                'gap: 0',
+                `grid-template-columns: ${templateColumns}`,
+                'margin: 0',
+                ...(r > 0 ? [separator] : []),
+                ...(centered ? [`width: ${POETRY_CENTERED_WIDTH}`, 'margin-inline: auto'] : []),
+            ].join('; ');
+            const px = POETRY_GUTTER_PX[gutter];
+            const cells = items
+                .map((item, i) => {
+                const cellStyle = centered
+                    ? 'padding-inline: 0'
+                    : i === 0
+                        ? `padding-inline-end: ${px}px`
+                        : `border-inline-start: ${POETRY_RULE}; padding-inline-start: ${px}px`;
+                const lines = (item.children ?? []).map((line) => poetryLineToHtml(line, '', ctx)).join('');
+                return `<div data-likhari-layout-item style="${escapeAttr(cellStyle)}">${lines}</div>`;
+            })
+                .join('');
+            return `<div data-likhari-layout-container style="${escapeAttr(rowStyle)}">${cells}</div>`;
+        })
+            .join('');
+    }
+    else {
+        body = children
+            .map((line, i) => {
+            const couplet = Math.floor(i / 2);
+            const parts = [];
+            if (i % 2 === 0 && couplet > 0)
+                parts.push(separator);
+            if (layout === 'staggered') {
+                parts.push(`width: ${POETRY_STAGGER_WIDTH[stagger]}`);
+                parts.push(couplet % 2 === 0 ? 'margin-inline-end: auto' : 'margin-inline-start: auto');
+            }
+            return poetryLineToHtml(line, parts.join('; '), ctx);
+        })
+            .join('');
+    }
+    const rtl = dir === 'rtl';
+    const blockStyle = [
+        'box-sizing: border-box',
+        'margin: 0 auto 1.4em auto',
+        `max-width: ${width !== undefined ? `${width}px` : '70%'}`,
+        'padding: 10px 16px',
+        'text-align: justify',
+        'text-align-last: justify',
+        `font-size: ${rtl ? '20px' : '15px'}`,
+        `line-height: ${rtl ? '2.1' : '1.6'}`,
+    ].join('; ');
+    const widthAttr = width !== undefined ? ` data-likhari-poetry-width="${width}"` : '';
+    return `<div data-likhari-poetry-layout="${layout}" data-likhari-poetry-spacing="${spacing}" data-likhari-poetry-gutter="${gutter}" data-likhari-poetry-stagger="${stagger}"${widthAttr} dir="${dir}" style="${escapeAttr(blockStyle)}">${body}</div>`;
 }
 function imageToHtml(node, ctx) {
     const rawSrc = String(node.src ?? '');
@@ -179,17 +263,19 @@ export function nodeToHtml(node, ctx) {
             return footnoteReferenceToHtml(node);
         case 'footnote-list':
             return footnoteListToHtml(node, ctx);
-        case 'poetry-block':
-            return poetryToHtml(node, ctx);
         case 'poetry-couplet':
-            return poetryCoupletToHtml(node, ctx);
+            return poetryToHtml(node, ctx);
         default:
             // Unknown node (e.g. a future feature): keep its content, drop the wrapper.
             return inlineChildren(node, ctx);
     }
 }
+/** Lets another converter (Markdown's HTML-table fallback) number footnotes the same way. */
+export function setFootnoteOrder(blocks) {
+    footnoteOrder = collectFootnoteOrder(blocks);
+}
 export function serializeHtml(state, ctx) {
     const blocks = rootChildren(state);
-    footnoteOrder = collectFootnoteOrder(blocks);
+    setFootnoteOrder(blocks);
     return blocks.map((node) => nodeToHtml(node, ctx)).join('\n');
 }

package/dist/markdown/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/markdown/parse.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAkUjD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAO3F"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/markdown/parse.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiUjD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAO3F"}

package/dist/markdown/parse.js

@@ -2,8 +2,9 @@ import { unified } from 'unified';
 import remarkParse from 'remark-parse';
 import remarkGfm from 'remark-gfm';
 import remarkDirective from 'remark-directive';
-import { FORMAT_BOLD, FORMAT_CODE, FORMAT_HIGHLIGHT, FORMAT_ITALIC, FORMAT_STRIKETHROUGH, FORMAT_SUBSCRIPT, FORMAT_SUPERSCRIPT, FORMAT_UNDERLINE, elementBase, makeState, paragraph, textNode, } from '../shared/serialized.js';
-import { safeImageSrc, safeUrl } from '../html/parse.js';
+import { FORMAT_BOLD, FORMAT_CODE, FORMAT_HIGHLIGHT, FORMAT_ITALIC, FORMAT_STRIKETHROUGH, FORMAT_SUBSCRIPT, FORMAT_SUPERSCRIPT, FORMAT_UNDERLINE, elementBase, makeState, paragraph, rootChildren, textNode, } from '../shared/serialized.js';
+import { parseHtml, safeImageSrc, safeUrl } from '../html/parse.js';
+import { layoutOrDefault, scaleOrDefault } from '../shared/poetry.js';
 const processor = unified().use(remarkParse).use(remarkGfm).use(remarkDirective);
 const ALIGNMENTS = new Set(['left', 'right', 'center', 'justify', 'start', 'end']);
 const DIRECTIVE_FORMATS = {
@@ -225,6 +226,9 @@ function blocks(nodes, extra = {}) {
             case 'table':
                 out.push(tableBlock(node));
                 break;
+            case 'html':
+                out.push(...rootChildren(parseHtml(node.value ?? '')).filter((n) => n.type === 'table'));
+                break;
             case 'containerDirective':
                 if (node.name === 'columns') {
                     const columns = (node.children ?? [])
@@ -239,21 +243,15 @@ function blocks(nodes, extra = {}) {
                 }
                 else if (node.name === 'poetry') {
                     const attrs = node.attributes ?? {};
-                    const layout = attrs.layout === 'two-column' || attrs.layout === 'alternating' ? attrs.layout : 'single';
-                    const align = ALIGNMENTS.has(attrs.align ?? '') ? attrs.align : 'justify';
-                    let children = blocks(node.children ?? []);
-                    // Legacy markup (no explicit couplet/column wrappers): treat the
-                    // flat content as a single couplet, same as the import fallback.
-                    const hasWrappers = children.some((c) => c.type === 'poetry-couplet' || c.type === 'layout-container');
-                    if (!hasWrappers) {
-                        children = [elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { centered: false })];
-                    }
-                    out.push(elementBase('poetry-block', children, { layout, align }));
-                }
-                else if (node.name === 'couplet') {
-                    const centered = (node.attributes ?? {}).centered === 'true';
+                    const settings = {
+                        layout: layoutOrDefault(attrs.layout),
+                        spacing: scaleOrDefault(attrs.spacing),
+                        gutter: scaleOrDefault(attrs.gutter),
+                        stagger: scaleOrDefault(attrs.stagger),
+                        ...(Number(attrs.width) > 0 ? { width: Number(attrs.width) } : {}),
+                    };
                     const children = blocks(node.children ?? []);
-                    out.push(elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { centered }));
+                    out.push(elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], settings));
                 }
                 else {
                     // Unknown containers (including a stray "column" outside "columns")

package/dist/markdown/serialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/markdown/serialize.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAKjD,OAAO,EAAa,KAAK,KAAK,EAAe,MAAM,SAAS,CAAC;AAyC7D,2GAA2G;AAC3G,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAUjD;AAqHD,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,CAMhE;AA4ID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAI9F"}
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/markdown/serialize.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAKjD,OAAO,EAAa,KAAK,KAAK,EAAe,MAAM,SAAS,CAAC;AA2C7D,2GAA2G;AAC3G,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAUjD;AAqHD,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,CAMhE;AAuJD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAM9F"}

package/dist/markdown/serialize.js

@@ -4,6 +4,8 @@ import remarkGfm from 'remark-gfm';
 import remarkDirective from 'remark-directive';
 import { FORMAT_BOLD, FORMAT_CODE, FORMAT_HIGHLIGHT, FORMAT_ITALIC, FORMAT_STRIKETHROUGH, FORMAT_SUBSCRIPT, FORMAT_SUPERSCRIPT, FORMAT_UNDERLINE, rootChildren, } from '../shared/serialized.js';
 import { directive } from './mdast.js';
+import { layoutOrDefault, scaleOrDefault } from '../shared/poetry.js';
+import { nodeToHtml, setFootnoteOrder } from '../html/serialize.js';
 const processor = unified()
     .use(remarkGfm)
     .use(remarkDirective)
@@ -247,17 +249,28 @@ function layoutToMd(node, ctx) {
     return directive('containerDirective', 'columns', { count: String(items.length) }, columns);
 }
 function poetryToMd(node, ctx) {
-    const layout = node.layout === 'two-column' || node.layout === 'alternating' ? node.layout : 'single';
-    const align = typeof node.align === 'string' ? node.align : 'justify';
+    const attrs = { layout: layoutOrDefault(node.layout) };
+    for (const key of ['spacing', 'gutter', 'stagger']) {
+        const value = scaleOrDefault(node[key]);
+        if (value !== 'normal')
+            attrs[key] = value;
+    }
+    if (typeof node.width === 'number' && node.width > 0)
+        attrs.width = String(node.width);
     const inner = (node.children ?? []).flatMap((child) => blockToMd(child, ctx));
-    return directive('containerDirective', 'poetry', { layout, align }, inner);
+    return directive('containerDirective', 'poetry', attrs, inner);
 }
-function poetryCoupletToMd(node, ctx) {
-    const inner = (node.children ?? []).flatMap((child) => blockToMd(child, ctx));
-    const attrs = node.centered === true ? { centered: 'true' } : {};
-    return directive('containerDirective', 'couplet', attrs, inner);
+/** Markdown tables cannot express merged cells or multi-block cells, so those
+ * are written as an HTML table block, read back by the HTML importer. */
+function needsHtmlTable(node) {
+    return (node.children ?? []).some((row) => (row.children ?? []).some((cell) => Number(cell.colSpan ?? 1) > 1 ||
+        Number(cell.rowSpan ?? 1) > 1 ||
+        (cell.children ?? []).length !== 1 ||
+        cell.children[0].type !== 'paragraph'));
 }
 function tableToMd(node, ctx) {
+    if (needsHtmlTable(node))
+        return { type: 'html', value: nodeToHtml(node, ctx) };
     const rows = (node.children ?? []).map((row) => ({
         type: 'tableRow',
         children: (row.children ?? []).map((cell) => {
@@ -300,10 +313,8 @@ function blockToMd(node, ctx) {
             return [tableToMd(node, ctx)];
         case 'layout-container':
             return [layoutToMd(node, ctx)];
-        case 'poetry-block':
-            return [poetryToMd(node, ctx)];
         case 'poetry-couplet':
-            return [poetryCoupletToMd(node, ctx)];
+            return [poetryToMd(node, ctx)];
         case 'footnote-list':
             return (node.children ?? []).map((item) => ({
                 type: 'footnoteDefinition',
@@ -317,7 +328,9 @@ function blockToMd(node, ctx) {
     }
 }
 export function serializeMarkdown(state, ctx) {
-    const tree = { type: 'root', children: rootChildren(state).flatMap((n) => blockToMd(n, ctx)) };
+    const blocks = rootChildren(state);
+    setFootnoteOrder(blocks);
+    const tree = { type: 'root', children: blocks.flatMap((n) => blockToMd(n, ctx)) };
     // remark-stringify consumes mdast; our MdNode is a structural subset of it.
     return String(processor.stringify(tree)).replace(/\n+$/, '\n').replace(/^\n+$/, '');
 }

package/dist/plain-text/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plain-text/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgGhD,eAAO,MAAM,kBAAkB,EAAE,eAsDhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plain-text/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AA4FhD,eAAO,MAAM,kBAAkB,EAAE,eAsDhC,CAAC"}

package/dist/plain-text/index.js

@@ -28,19 +28,15 @@ function nodeToText(node, order, listItemIndex = 0) {
         return `[${order.get(id) ?? '?'}]`;
     }
     // Linearized per the fidelity matrix ("Poetry layout variants ⚠️ linearized"):
-    // one misra per line, regardless of single/two-column/alternating layout
-    // and however many couplets the block holds, mixed wrapper types included
-    // (a two-column couplet is its own layout-container row; a single or
-    // centered couplet is its own poetry-couplet wrapper) — so each couplet
-    // contributes its two misra lines in turn rather than only the block's
-    // first couplet being read.
-    if (node.type === 'poetry-block' || node.type === 'poetry-couplet') {
+    // one misra per line, regardless of single/two-column layout and however
+    // many couplets the block holds — in two-column layout each couplet is
+    // its own layout-container row, so each contributes its two item lines
+    // in turn rather than only the block's first couplet being read.
+    if (node.type === 'poetry-couplet') {
         const children = withChildren.children ?? [];
         const lines = children.flatMap((child) => child.type === 'layout-container'
             ? (child.children ?? []).map((item) => nodeToText(item, order))
-            : child.type === 'poetry-couplet'
-                ? (child.children ?? []).map((item) => nodeToText(item, order))
-                : [nodeToText(child, order)]);
+            : [nodeToText(child, order)]);
         return lines.join('\n');
     }
     if (node.type === 'list' && withChildren.children) {

package/dist/shared/poetry.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Poetry block settings shared by the HTML and Markdown converters. The CSS
+ * values mirror the editor's own (packages/react/src/theme/editor.css), so an
+ * exported page looks the same outside the editor.
+ */
+export declare const POETRY_LAYOUTS: readonly ["single", "two-column", "staggered"];
+export type PoetryLayout = (typeof POETRY_LAYOUTS)[number];
+export declare const POETRY_SCALE_NAMES: readonly ["compact", "normal", "relaxed", "loose"];
+export type PoetryScaleName = (typeof POETRY_SCALE_NAMES)[number];
+export declare const POETRY_COUPLET_GAP: Record<PoetryScaleName, string>;
+export declare const POETRY_GUTTER_PX: Record<PoetryScaleName, number>;
+export declare const POETRY_STAGGER_WIDTH: Record<PoetryScaleName, string>;
+export declare const POETRY_CENTERED_WIDTH = "60%";
+export declare const POETRY_RULE = "1px dashed #8a8880";
+export declare function scaleOrDefault(value: unknown): PoetryScaleName;
+export declare function layoutOrDefault(value: unknown): PoetryLayout;
+//# sourceMappingURL=poetry.d.ts.map

package/dist/shared/poetry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"poetry.d.ts","sourceRoot":"","sources":["../../src/shared/poetry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,cAAc,gDAAiD,CAAC;AAC7E,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAE3D,eAAO,MAAM,kBAAkB,oDAAqD,CAAC;AACrF,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAK9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAK5D,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAKhE,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAQ,CAAC;AAC3C,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAEhD,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,CAE9D;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY,CAE5D"}

package/dist/shared/poetry.js

@@ -0,0 +1,33 @@
+/**
+ * Poetry block settings shared by the HTML and Markdown converters. The CSS
+ * values mirror the editor's own (packages/react/src/theme/editor.css), so an
+ * exported page looks the same outside the editor.
+ */
+export const POETRY_LAYOUTS = ['single', 'two-column', 'staggered'];
+export const POETRY_SCALE_NAMES = ['compact', 'normal', 'relaxed', 'loose'];
+export const POETRY_COUPLET_GAP = {
+    compact: '0.4em',
+    normal: '1em',
+    relaxed: '1.8em',
+    loose: '2.8em',
+};
+export const POETRY_GUTTER_PX = {
+    compact: 8,
+    normal: 20,
+    relaxed: 32,
+    loose: 48,
+};
+export const POETRY_STAGGER_WIDTH = {
+    compact: '50%',
+    normal: '65%',
+    relaxed: '75%',
+    loose: '85%',
+};
+export const POETRY_CENTERED_WIDTH = '60%';
+export const POETRY_RULE = '1px dashed #8a8880';
+export function scaleOrDefault(value) {
+    return POETRY_SCALE_NAMES.find((name) => name === value) ?? 'normal';
+}
+export function layoutOrDefault(value) {
+    return POETRY_LAYOUTS.find((name) => name === value) ?? 'single';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inshapardaz/likhari-converters",
-  "version": "0.1.18-dev.156",
+  "version": "0.1.18-dev.162",
   "description": "Format transformers (Markdown/HTML/plain-text/Lexical JSON) against the canonical Lexical EditorState, isolated from UI.",
   "license": "MIT",
   "repository": {