js.documents 14.6.4 → 14.6.5

package/README.md

@@ -859,7 +859,7 @@ The package is layered from generic primitives outward to the two conversion dir
 - **`src/markdown/`** — third adapter family, via `markdown-codec`. `readMarkdownContent` passes `readMarkdownContent`'s (markdown-codec's flat reader, so named since that package's 4.0.0; the bare `readMarkdown` name is now its tree-form `DocumentTree` reader) result through the math-lowering pass (`math.ts` — markdown-codec's preserved `$$` display blocks and `\( \)` inline spans become two-layer formula blocks, with the document's symbol table seeded from its own prose). `buildMarkdownText` wraps `writeMarkdownContent`, reconstructing markdown math syntax from formula blocks carrying a presentation layer. `text.ts` is the byte↔text boundary. `MarkdownEditor` holds a mutable in-memory `ContentDocument`.
 - **`src/csv/`** — fourth adapter family, sharing the spreadsheet variant with xlsx/ods. `records.ts` is the RFC 4180 record parser/writer (one shared `quoteCsvField`, also used by the `.odb` CSV exporter); `text.ts` is the byte↔text boundary, working the character encoding out from the bytes through [byte-codec](../byte-codec/README.md#text-decoding) rather than assuming UTF-8, so Excel's own windows-1252 export reads, and refusing bytes that are not text at all; `read.ts` turns records into a spreadsheet `ContentDocument` (first record as verbatim string header, data cells through the same cell-typing heuristic `pdfToOds` uses); `write.ts` turns one sheet of a spreadsheet `ContentDocument` back into records via each cell's `displayText`. TSV is the same format with `{ delimiter: '\t' }` on either side.
 - **`src/svg/`** — fifth adapter family, sharing the drawing variant with odg. `text.ts` is the byte↔text boundary: unlike csv and markdown, it does not detect the encoding from the bytes, because SVG is XML and XML's own `<?xml ... encoding="..."?>` declaration is authoritative; `xml-encoding.ts` reads that declaration (or a byte order mark) from the leading bytes per XML 1.0's own external-encoding-detection algorithm, ahead of any real decode, with UTF-8 the strict default when neither is present; `read.ts` maps the six SVG shape primitives (rect/circle/ellipse/line/polyline/polygon/path) onto a one-page drawing `ContentDocument`, with transform lists composed as 2×3 affines and CSS lengths and the viewBox map resolved into page points; `write.ts` writes the six primitives back out, one shape element each; `path.ts` is the full SVG path-data grammar (M/L/H/V/C/S/Z plus Q/T/A and the relative forms — S/Q/T convert exactly, A is the one bounded approximation at ≤90° per cubic); `transform.ts` parses and composes the transform attribute and classifies the result by frame representability; `units.ts` resolves CSS length units and the viewBox; `paint.ts` resolves fill/stroke presentation attributes and dash styles; `diagnostics.ts` is the shared scope-limit vocabulary.
-- **`src/layout/`** — the pure conversion algorithms: `engine.ts` (wordprocessing → layout: flow, line-breaking, pagination), `slides.ts` (presentation → layout: direct placement), `sheets.ts` (spreadsheet → layout: grid, print settings, the first algorithm accepting `AbortSignal`), `drawing.ts` (drawing → layout: vector primitives + shape reuse), `reconstruct.ts` (layout → content: baseline clustering for wordprocessing/presentation, near-1:1 mapping for drawing, gridline-lattice-or-text-clustering for spreadsheet; plus the PDF construct surfacing — link reconciliation to `ContentRun.hyperlink` or link constructs, hidden-layer content dropped, anchor/comment and AcroForm contentControl constructs, and tagged-structure semantics where the file states them: heading levels from owning `H1`..`H6` elements over the font-size census, lattice-free table recovery from `/Table`/`/TR`/`/TH`/`/TD` ownership, and `division` constructs around `/Part`/`/Sect`/`/Div` extents).
+- **`src/layout/`** — the pure conversion algorithms: `engine.ts` (wordprocessing → layout: flow, line-breaking, pagination), `slides.ts` (presentation → layout: direct placement), `sheets.ts` (spreadsheet → layout: grid, print settings, the first algorithm accepting `AbortSignal`), `drawing.ts` (drawing → layout: vector primitives + shape reuse), `reconstruct.ts` (layout → content: baseline clustering for wordprocessing/presentation, with a superscript or subscript returned to the line of the run it touches and marked with `ContentRun.verticalAlign` by pdf-codec's `scriptPositionOf`, so `pdfToMarkdown` writes `m<sup>2</sup>` rather than `m` and a stray `2`; near-1:1 mapping for drawing, gridline-lattice-or-text-clustering for spreadsheet; plus the PDF construct surfacing — link reconciliation to `ContentRun.hyperlink` or link constructs, hidden-layer content dropped, anchor/comment and AcroForm contentControl constructs, and tagged-structure semantics where the file states them: heading levels from owning `H1`..`H6` elements over the font-size census, lattice-free table recovery from `/Table`/`/TR`/`/TH`/`/TD` ownership, and `division` constructs around `/Part`/`/Sect`/`/Div` extents).
 - **`src/hsqldb/`** — `.odb` decoders, four tiers: `script.ts` (TEXT-script DDL/DML parser), `rowformat.ts`/`cache.ts` (CACHED binary row-store), `binary-script.ts` (BINARY/COMPRESSED whole-script). All import only `document-schema.js` — no odf.js knowledge.
 - **`src/firebird/`** — Tier 3: gbak logical-backup reader. `reader.ts` (attribute framing + RLE decompression + XDR decoding), `schema.ts`/`data.ts` (table/row walking). No ratified spec — built against Firebird's own engine source.
 - **`src/odb/`** — decoder-selection and pivot-mapping: `read.ts` routes to the right tier, `spreadsheet.ts`/`csv.ts` map to output formats. `odb/sql/` is the bounded SQL engine, `odb/formula/` is the rpt formula engine, `odb/report/` is the renderer, `odb/values.ts` is shared comparison/aggregation semantics.

package/dist/layout/reconstruct-lines.cjs

@@ -28,13 +28,14 @@ function dropDuplicatePaints(items) {
 	return kept;
 }
 function dropOverlappingRepeatsWithinLine(items) {
-	const rightEdgeByText = /* @__PURE__ */ new Map();
+	const keptByText = /* @__PURE__ */ new Map();
 	const kept = [];
 	for (const item of items) {
 		const textKey = item.text.trim();
-		const priorRightEdge = rightEdgeByText.get(textKey);
-		if (priorRightEdge !== void 0 && item.xPt < priorRightEdge) continue;
-		rightEdgeByText.set(textKey, item.xPt + (item.widthPt ?? 0));
+		const earlier = keptByText.get(textKey);
+		if (earlier?.some((prior) => item.xPt < prior.xPt + (prior.widthPt ?? 0) && Math.abs(item.yPt - prior.yPt) <= DUPLICATE_PAINT_BUCKET_PT) === true) continue;
+		if (earlier === void 0) keptByText.set(textKey, [item]);
+		else earlier.push(item);
 		kept.push(item);
 	}
 	return kept;
@@ -127,12 +128,23 @@ function clusterIntoLines(items) {
 		});
 		else line.items.push(item);
 	}
-	for (const line of working) {
+	const lines = (0, pdf_codec_text_group.attachScriptRuns)(working, (line) => line.items).filter(({ runs }) => runs.length > 0).map(({ line, runs }) => ({
+		...line,
+		items: runs
+	}));
+	for (const line of lines) {
 		line.items.sort((a, b) => a.xPt - b.xPt);
 		line.items = dropOverlappingRepeatsWithinLine(line.items);
 	}
-	working.sort((a, b) => b.baselineY - a.baselineY);
-	return working;
+	lines.sort((a, b) => b.baselineY - a.baselineY);
+	return lines;
+}
+function scriptPositionOnLine(item, line) {
+	for (const base of line.items) {
+		if (base === item) continue;
+		const position = (0, pdf_codec_text_group.scriptPositionOf)(base, item);
+		if (position !== void 0) return position;
+	}
 }
 function textItemVerticalExtent(item) {
 	const { standardName } = (0, pdf_codec_fonts.resolveStandardFont)(item.font.family, item.font.weight === "bold", item.font.style === "italic");
@@ -192,13 +204,32 @@ function pushRunsForLine(runs, line, pageIndex) {
 		if (itemIndex > 0) {
 			const prevItem = line.items[itemIndex - 1];
 			if (gapExceeds(prevItem, item, 2 * item.sizePt)) runs.push({ text: "	" });
-			else if (gapExceeds(prevItem, item, .5)) runs[runs.length - 1].text += " ";
+			else if (gapExceeds(prevItem, item, .5)) appendWordSpace(runs);
 		}
 		const run = textItemToContentRun(item);
 		require_layout_shared.stampFrame(run, pageIndex, textBoxOfItem(item, pageIndex));
-		runs.push(run);
+		const verticalAlign = scriptPositionOnLine(item, line);
+		const core = item.text.trim();
+		if (verticalAlign === void 0 || core.length === 0) {
+			runs.push(run);
+			return;
+		}
+		const leading = item.text.slice(0, item.text.length - item.text.trimStart().length);
+		const trailing = item.text.slice(item.text.trimEnd().length);
+		if (leading.length > 0) runs.push({ text: leading });
+		runs.push({
+			...run,
+			text: core,
+			verticalAlign
+		});
+		if (trailing.length > 0) runs.push({ text: trailing });
 	});
 }
+function appendWordSpace(runs) {
+	const last = runs[runs.length - 1];
+	if (last.verticalAlign === void 0) last.text += " ";
+	else runs.push({ text: " " });
+}
 function bucketCounts(values, bucketSize) {
 	const counts = /* @__PURE__ */ new Map();
 	for (const v of values) {
@@ -281,8 +312,7 @@ function paragraphToContentParagraph(paragraph, pageIndex, headingLevel) {
 	paragraph.lines.forEach((line, lineIndex) => {
 		require_layout_shared.stampFrame(result, pageIndex, lineBox(line, pageIndex));
 		if (lineIndex > 0) {
-			const lastRun = result.runs[result.runs.length - 1];
-			if (lastRun !== void 0) lastRun.text += " ";
+			if (result.runs.length > 0) appendWordSpace(result.runs);
 		}
 		pushRunsForLine(result.runs, line, pageIndex);
 	});

package/dist/layout/reconstruct-lines.js

@@ -1,7 +1,7 @@
 import { stampFrame } from "./shared.js";
 import { resolveStandardFont } from "pdf-codec/fonts";
 import { STANDARD_METRICS } from "pdf-codec/afm-widths";
-import { runGapPt, runsShareBaseline } from "pdf-codec/text-group";
+import { attachScriptRuns, runGapPt, runsShareBaseline, scriptPositionOf } from "pdf-codec/text-group";
 //#region src/layout/reconstruct-lines.ts
 const LINE_BASELINE_TOLERANCE_FACTOR = .5;
 const AFM_UNITS_PER_EM = 1e3;
@@ -27,13 +27,14 @@ function dropDuplicatePaints(items) {
 	return kept;
 }
 function dropOverlappingRepeatsWithinLine(items) {
-	const rightEdgeByText = /* @__PURE__ */ new Map();
+	const keptByText = /* @__PURE__ */ new Map();
 	const kept = [];
 	for (const item of items) {
 		const textKey = item.text.trim();
-		const priorRightEdge = rightEdgeByText.get(textKey);
-		if (priorRightEdge !== void 0 && item.xPt < priorRightEdge) continue;
-		rightEdgeByText.set(textKey, item.xPt + (item.widthPt ?? 0));
+		const earlier = keptByText.get(textKey);
+		if (earlier?.some((prior) => item.xPt < prior.xPt + (prior.widthPt ?? 0) && Math.abs(item.yPt - prior.yPt) <= DUPLICATE_PAINT_BUCKET_PT) === true) continue;
+		if (earlier === void 0) keptByText.set(textKey, [item]);
+		else earlier.push(item);
 		kept.push(item);
 	}
 	return kept;
@@ -126,12 +127,23 @@ function clusterIntoLines(items) {
 		});
 		else line.items.push(item);
 	}
-	for (const line of working) {
+	const lines = attachScriptRuns(working, (line) => line.items).filter(({ runs }) => runs.length > 0).map(({ line, runs }) => ({
+		...line,
+		items: runs
+	}));
+	for (const line of lines) {
 		line.items.sort((a, b) => a.xPt - b.xPt);
 		line.items = dropOverlappingRepeatsWithinLine(line.items);
 	}
-	working.sort((a, b) => b.baselineY - a.baselineY);
-	return working;
+	lines.sort((a, b) => b.baselineY - a.baselineY);
+	return lines;
+}
+function scriptPositionOnLine(item, line) {
+	for (const base of line.items) {
+		if (base === item) continue;
+		const position = scriptPositionOf(base, item);
+		if (position !== void 0) return position;
+	}
 }
 function textItemVerticalExtent(item) {
 	const { standardName } = resolveStandardFont(item.font.family, item.font.weight === "bold", item.font.style === "italic");
@@ -191,13 +203,32 @@ function pushRunsForLine(runs, line, pageIndex) {
 		if (itemIndex > 0) {
 			const prevItem = line.items[itemIndex - 1];
 			if (gapExceeds(prevItem, item, 2 * item.sizePt)) runs.push({ text: "	" });
-			else if (gapExceeds(prevItem, item, .5)) runs[runs.length - 1].text += " ";
+			else if (gapExceeds(prevItem, item, .5)) appendWordSpace(runs);
 		}
 		const run = textItemToContentRun(item);
 		stampFrame(run, pageIndex, textBoxOfItem(item, pageIndex));
-		runs.push(run);
+		const verticalAlign = scriptPositionOnLine(item, line);
+		const core = item.text.trim();
+		if (verticalAlign === void 0 || core.length === 0) {
+			runs.push(run);
+			return;
+		}
+		const leading = item.text.slice(0, item.text.length - item.text.trimStart().length);
+		const trailing = item.text.slice(item.text.trimEnd().length);
+		if (leading.length > 0) runs.push({ text: leading });
+		runs.push({
+			...run,
+			text: core,
+			verticalAlign
+		});
+		if (trailing.length > 0) runs.push({ text: trailing });
 	});
 }
+function appendWordSpace(runs) {
+	const last = runs[runs.length - 1];
+	if (last.verticalAlign === void 0) last.text += " ";
+	else runs.push({ text: " " });
+}
 function bucketCounts(values, bucketSize) {
 	const counts = /* @__PURE__ */ new Map();
 	for (const v of values) {
@@ -280,8 +311,7 @@ function paragraphToContentParagraph(paragraph, pageIndex, headingLevel) {
 	paragraph.lines.forEach((line, lineIndex) => {
 		stampFrame(result, pageIndex, lineBox(line, pageIndex));
 		if (lineIndex > 0) {
-			const lastRun = result.runs[result.runs.length - 1];
-			if (lastRun !== void 0) lastRun.text += " ";
+			if (result.runs.length > 0) appendWordSpace(result.runs);
 		}
 		pushRunsForLine(result.runs, line, pageIndex);
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "14.6.4",
+  "version": "14.6.5",
   "description": "Converts between docx, pptx, odt, odp, ods, odg, xlsx, csv, svg, markdown, rtf, doc, xls, ppt and PDF through one shared, Zod-typed content schema (wpd read-only), plus read+write editors for OOXML and OpenDocument. Worker-isomorphic.",
   "type": "module",
   "repository": {
@@ -83,10 +83,10 @@
     "document-schema.js": "7.16.2",
     "epub-codec": "5.1.17",
     "fflate": "0.8.3",
-    "markdown-codec": "11.1.17",
+    "markdown-codec": "11.2.0",
     "odf.js": "11.2.3",
     "ooxml.js": "12.2.33",
-    "pdf-codec": "5.6.1",
+    "pdf-codec": "5.7.0",
     "ppt-codec": "2.2.24",
     "rtf-codec": "8.1.25",
     "temml": "0.13.4",