odf.js 5.3.0 → 5.5.0

package/README.md

@@ -59,7 +59,7 @@ Under active development. Built and shipped:
 - **Style interning** (`src/styles/`) — `StyleRegistry` adopts existing automatic styles, finds-or-mints on `intern()`, fingerprints on canonical serialized properties (never `JSON.stringify`), collision-checked across all four style containers.
 - **Shared typed primitives** (`src/typed/shared/`) — unit parsing, A1 cell-reference computation with repeat-count cursor advancement, colour/geometry/master-page parsing into `document-schema.js` types, whitespace-run decoding, the read-side style cascade, shared `readOdfParagraph`/`readOdfTable`, the `draw:transform`/`draw:g` group-flattening geometry resolver, an `svg:d`/`draw:points` path parser, and `meta.xml` reading.
 - **Typed readers, at two levels** — `readOdt`/`readOdp`/`readOdg`/`readOds`/`readOdfFormula` resolve a `Package` into a `document-schema.js` **`DocumentPackage`**: the single hierarchical artefact, with a minted styles table. Beneath each sits its `*Content` sibling (`readOdtContent`, `readOdpContent`, `readOdgContent`, `readOdsContent`, `readOdfFormulaContent`) producing the flat `ContentDocument`-level shape instead. See [Reading a document](#reading-a-document).
-- **What each reader actually covers** — wordprocessing (`readOdt`), presentation (`readOdp`), drawing (`readOdg`: vector primitives in `draw:z-index`-aware paint order), spreadsheet (`readOds`: every `office:value-type`, cell/page-anchored images, and embedded sub-documents including charts), each expressed in `document-schema.js`'s own `ContentSection`/`ContentSlide`/`ContentDrawPage`/`ContentSheet` vocabulary — plus the fidelity construct vocabulary in `readOdt` (fields, bookmarks, tracked changes, notes, annotations, divisions, index wrappers, forms, and anchored frames; see [Fidelity constructs](#fidelity-constructs)).
+- **What each reader actually covers** — wordprocessing (`readOdt`), presentation (`readOdp`), drawing (`readOdg`: vector primitives in `draw:z-index`-aware paint order), spreadsheet (`readOds`: every `office:value-type`, cell/page-anchored images, and embedded sub-documents including charts), each expressed in `document-schema.js`'s own `ContentSection`/`ContentSlide`/`ContentDrawPage`/`ContentSheet` vocabulary — plus the fidelity construct vocabulary in `readOdt` (fields including the cross-reference displays, bookmarks and reference-marks, tracked changes, notes, annotations, divisions, index wrappers, forms, and anchored frames; see [Fidelity constructs](#fidelity-constructs)).
 - **`readOdfFormulaMathMl`** — resolves a standalone/embedded `.odf` formula's bare-MathML `content.xml` into raw MathML nodes plus a StarMath annotation, with no pivot shaping at all. **`readOdfFormulaContent`** wraps that into a real `'formula'`-kind `ContentDocument`, and **`readOdfFormula`** into a `DocumentPackage`.
 - **`readOdm`** — resolves a `.odm` master document into an ordered list of chapter references (`{ name, href, filterName? }`); chapters are genuinely external `.odt` files by ODF design, never cached.
 - **`readOdbInventory`** — resolves a `.odb` into connection info, table names, query definitions (`{ name, command, escapeProcessing? }` with real SQL text), and form/report `{ name, href }` pairs. A sub-document directory is named after an opaque *persistent* name (`forms/Obj11`), not the user-visible name.
@@ -239,8 +239,8 @@ Layered from a lossless core outward, mirroring `ooxml.js`:
 
 `readOdt` reads ODF's fidelity constructs into `document-schema.js`'s harmonised construct vocabulary — the semantic channel of the family's two-channel fidelity model (the quarantined residue channel is the other half). Two residue rows carry genuine producer fixtures (`conditional-format.ods`, `transitions.odp` — real LibreOffice output, generated through the same UNO calls the Calc/Impress UIs use); every other fixture below the unit suites is programmatic, built to the OASIS element grammar, with real-producer verification outstanding.
 
-- **Fields** — every inline field element (the simple set, the variable/user-field/sequence instance families, the database displays) reads as ordinary runs carrying its cached text plus a run-level field extent on the paragraph, instruction being the serialised element and `cachedResult` its own text content. Field master declarations (`text:*-decls`) read into the package-root definitions table, keyed per family.
-- **Bookmarks and tracked changes** — paired marker halves at run scope pair inside one paragraph; halves at paragraph edges pair across blocks into `constructStart`/`constructEnd` markers. Change markers resolve their `text:change-id` against the `text:changed-region` definitions (either id spelling, `xml:id` today and ODF 1.0's `text:id`), carrying author and date as provenance.
+- **Fields** — every inline field element (the simple set, the variable/user-field/sequence instance families, the database displays, and the `*-ref` cross-reference displays — `text:bookmark-ref`, `text:reference-ref`, `text:note-ref`, `text:sequence-ref`) reads as ordinary runs carrying its cached text plus a run-level field extent on the paragraph, instruction being the serialised element and `cachedResult` its own text content. Field master declarations (`text:*-decls`) read into the package-root definitions table, keyed per family.
+- **Bookmarks, reference-marks, and tracked changes** — paired marker halves at run scope pair inside one paragraph; halves at paragraph edges pair across blocks into `constructStart`/`constructEnd` markers. A `text:reference-mark` is a point bookmark anchor; a `text:reference-mark-start`/`-end` pair is a range anchor in its own pairing family (ODF keeps reference-mark names and bookmark names in separate namespaces, so a same-named bookmark and reference-mark pair independently). Change markers resolve their `text:change-id` against the `text:changed-region` definitions (either id spelling, `xml:id` today and ODF 1.0's `text:id`), carrying author and date as provenance.
 - **Notes and annotations** — a `text:note`'s citation becomes a run, its body a definitions entry, an anchor extent naming both; an `office:annotation` does the same and pairs with `office:annotation-end` by `office:name` over a range, falling back to a point anchor when no end arrives.
 - **Divisions and index wrappers** — `text:section` brackets its blocks as a division construct (name, protected, column count, and a `text:section-source`'s external-chapter link); the seven index wrappers bracket their cached `text:index-body` blocks as `index` content controls, with the wrapper's `*-source` build rules quarantined in residue.
 - **Forms** — `office:forms` in an ordinary text document reads as point content controls in pre-order through the same form-tree walker the `.odb` reader uses; `form:properties` bags quarantine into residue.

package/dist/{codec-LgpdP32n.d.cts → codec-C3i7QbVt.d.cts}

@@ -18,13 +18,13 @@ import "./text-BAi1tapc.cjs";
 import "./cascade-DWQfTwaM.cjs";
 import "./metadata-1j1zm9Cx.cjs";
 import "./list-KZeXA0mR.cjs";
-import "./paragraph-CuEMXbDg.cjs";
+import "./paragraph-DaMqmhe3.cjs";
 import "./table-BH_Q2n_N.cjs";
 import "./transform-DKEjydnm.cjs";
 import "./masterpage-Bt6gxuoL.cjs";
 import "./path-DE7wkIcz.cjs";
 import "./shapes-8o3NjBLU.cjs";
-import "./embedded-rKOsAsjg.cjs";
+import "./embedded-BzPTTzdf.cjs";
 import "./read-CDSmR3qt.cjs";
 import "./read-rwDsgR0d.cjs";
 import "./read-IOYq80AA.cjs";
@@ -33,8 +33,8 @@ import "./read-DUCm1nUv.cjs";
 import "./read-ydLJ8bid.cjs";
 import "./read-BV2an1ok.cjs";
 import "./subdocument-yY8ASE4N.cjs";
-import "./forms-BydLKkI0.cjs";
-import "./form-D8wh-xhJ.cjs";
+import "./forms-Eh1N15Qy.cjs";
+import "./form-CWWCkG-r.cjs";
 import "./report-D6WNYaVn.cjs";
 import { z } from "zod";
 import { Alignment as Alignment$1, AlignmentSchema, DocumentPackage as DocumentPackage$1 } from "document-schema.js";

package/dist/{codec-sFSMk-if.d.ts → codec-CbPSWzQ2.d.ts}

@@ -18,13 +18,13 @@ import "./text-gJ5R0q3u.js";
 import "./cascade-BZ7zqXhL.js";
 import "./metadata-BXpjrAS-.js";
 import "./list-Qeuawtew.js";
-import "./paragraph-BE71DZ0t.js";
+import "./paragraph-hzoy-Wos.js";
 import "./table-ByOoGcq_.js";
 import "./transform-C7GrZZdR.js";
 import "./masterpage-By_F05W4.js";
 import "./path-DE7wkIcz.js";
 import "./shapes-CCB8ydqD.js";
-import "./embedded-ClsebpWi.js";
+import "./embedded-Zv8KtFUo.js";
 import "./read-DfEHXwgn.js";
 import "./read-24g5eZw6.js";
 import "./read-BLoaDxr_.js";
@@ -33,8 +33,8 @@ import "./read-BnN7u9Y2.js";
 import "./read-DYYxbvfo.js";
 import "./read-CvjbdgH3.js";
 import "./subdocument-BwW3FZC_.js";
-import "./forms-iwRSwhOn.js";
-import "./form-CsOrcORr.js";
+import "./forms-CyLw7lpE.js";
+import "./form-RJTtSmwn.js";
 import "./report-DbslT2OR.js";
 import { z } from "zod";
 import { Alignment as Alignment$1, AlignmentSchema as AlignmentSchema$1, DocumentPackage as DocumentPackage$1 } from "document-schema.js";

package/dist/codec.d.cts

@@ -1,2 +1,2 @@
-import { i as xmlCodec, n as encodePackage, r as packageCodec, t as decodePackage } from "./codec-LgpdP32n.cjs";
+import { i as xmlCodec, n as encodePackage, r as packageCodec, t as decodePackage } from "./codec-C3i7QbVt.cjs";
 export { decodePackage, encodePackage, packageCodec, xmlCodec };

package/dist/codec.d.ts

@@ -1,2 +1,2 @@
-import { i as xmlCodec, n as encodePackage, r as packageCodec, t as decodePackage } from "./codec-sFSMk-if.js";
+import { i as xmlCodec, n as encodePackage, r as packageCodec, t as decodePackage } from "./codec-CbPSWzQ2.js";
 export { decodePackage, encodePackage, packageCodec, xmlCodec };

package/dist/{constructs-B1yajQJB.d.ts → constructs-C1S8qlVv.d.ts}

@@ -17,7 +17,7 @@ declare function odfDivisionDescriptor(sectionElement: XmlElement, pkg: Package)
 declare const ODF_INDEX_WRAPPER_TAGS: ReadonlySet<string>;
 declare function isOdfIndexWrapper(element: XmlElement): boolean;
 declare function odfIndexControlDescriptor(wrapper: XmlElement): ContentControlDescriptor;
-type OdfMarkerKind = 'bookmark' | 'change' | 'annotation';
+type OdfMarkerKind = 'bookmark' | 'referenceMark' | 'change' | 'annotation';
 interface OdfMarkerHalf {
   readonly kind: OdfMarkerKind;
   readonly side: 'start' | 'end';

package/dist/{constructs-BSC_5kfU.d.cts → constructs-FLBse5UV.d.cts}

@@ -17,7 +17,7 @@ declare function odfDivisionDescriptor(sectionElement: XmlElement, pkg: Package)
 declare const ODF_INDEX_WRAPPER_TAGS: ReadonlySet<string>;
 declare function isOdfIndexWrapper(element: XmlElement): boolean;
 declare function odfIndexControlDescriptor(wrapper: XmlElement): ContentControlDescriptor;
-type OdfMarkerKind = 'bookmark' | 'change' | 'annotation';
+type OdfMarkerKind = 'bookmark' | 'referenceMark' | 'change' | 'annotation';
 interface OdfMarkerHalf {
   readonly kind: OdfMarkerKind;
   readonly side: 'start' | 'end';

package/dist/{embedded-rKOsAsjg.d.cts → embedded-BzPTTzdf.d.cts}

@@ -1,6 +1,6 @@
 import { l as XmlElement } from "./node-CkBWRjNR.cjs";
 import { r as Package } from "./package-L24lkba-.cjs";
-import { l as OdfResidueFormat } from "./constructs-BSC_5kfU.cjs";
+import { l as OdfResidueFormat } from "./constructs-FLBse5UV.cjs";
 import { Box, ContentDocument, ContentEmbeddedObjectKind, SourceResidue } from "document-schema.js";
 //#region src/typed/draw/embedded.d.ts
 type EmbeddedDocumentKind = ContentEmbeddedObjectKind;

package/dist/{embedded-DbLrCGPi.cjs → embedded-CBTvjVKb.cjs}

@@ -434,20 +434,6 @@ const ODT_HEADER_FOOTER_TAGS = /* @__PURE__ */ new Map([
 ]);
 const CONTENT_PART$1 = "content.xml";
 const AUTOMATIC_STYLE_PARTS = [CONTENT_PART$1, "styles.xml"];
-function readOutlineLevel(headingElement) {
-	const raw = require_xml_query.attrValue(headingElement, "text:outline-level");
-	if (raw === void 0) return 1;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
-}
-function readParagraphOrHeading(element, paragraph) {
-	if (element.tag === "text:h") {
-		const outlineLevel = readOutlineLevel(element);
-		paragraph.styleId = `Heading${outlineLevel}`;
-		paragraph.headingLevel = outlineLevel;
-	}
-	return paragraph;
-}
 function resolveParagraphMasterPageName(element, pkg, state) {
 	const styleName = require_xml_query.attrValue(element, "text:style-name");
 	if (state.masterPageByStyleName.has(styleName)) return state.masterPageByStyleName.get(styleName);
@@ -541,15 +527,16 @@ function readBlocks(nodes, pkg, state, baseIndex = 0) {
 	};
 	const readOneParagraph = (element) => {
 		const halves = [];
+		const paragraph = require_typed_shared_paragraph.readOdfParagraph(element, pkg, {
+			provenanceRegions: state.provenanceRegions,
+			markersOut: halves,
+			definitions: state.definitions,
+			listIdState: state.listIdState,
+			format: "odt"
+		});
 		return {
 			element,
-			paragraph: readParagraphOrHeading(element, require_typed_shared_paragraph.readOdfParagraph(element, pkg, {
-				provenanceRegions: state.provenanceRegions,
-				markersOut: halves,
-				definitions: state.definitions,
-				listIdState: state.listIdState,
-				format: "odt"
-			})),
+			paragraph: require_typed_shared_paragraph.readParagraphOrHeading(element, paragraph),
 			halves,
 			liftedSources: readAnchoredFrameSources(element, pkg, state),
 			masterPageName: resolveParagraphMasterPageName(element, pkg, state)

package/dist/{embedded-BSSdoKcK.js → embedded-D2MXjcFm.js}

@@ -6,7 +6,7 @@ import { findStyleElement, resolveStyleElementChain } from "./typed/shared/casca
 import { readOdfMetadata } from "./typed/shared/metadata.js";
 import { mintOdfListNumId, readOdfListParagraphs } from "./typed/shared/list.js";
 import { addOdfPackageResidue, collectOdfDataStyleDefinitions, collectOdfFieldMasterDefinitions, collectOdfFontFaceDefinitions, collectOdfNamedExpressions, collectOdfNonContentPartResidue, collectOdfProvenanceRegions, insertOdfConstructMarkers, isOdfExtensionElement, isOdfIndexWrapper, odfDivisionDescriptor, odfIndexControlDescriptor, odfMarkerHalfEventIndex, odfResidue, resolveOdfMarkerEvents } from "./typed/shared/constructs.js";
-import { readOdfConstructBodyBlocks, readOdfParagraph } from "./typed/shared/paragraph.js";
+import { readOdfConstructBodyBlocks, readOdfParagraph, readParagraphOrHeading } from "./typed/shared/paragraph.js";
 import { readCellStyleDecoration, readOdfTable } from "./typed/shared/table.js";
 import { parseOdfTransform } from "./typed/shared/transform.js";
 import { readOdfMasterPageElements, resolvePageLayoutProperties } from "./typed/shared/masterpage.js";
@@ -434,20 +434,6 @@ const ODT_HEADER_FOOTER_TAGS = /* @__PURE__ */ new Map([
 ]);
 const CONTENT_PART$1 = "content.xml";
 const AUTOMATIC_STYLE_PARTS = [CONTENT_PART$1, "styles.xml"];
-function readOutlineLevel(headingElement) {
-	const raw = attrValue(headingElement, "text:outline-level");
-	if (raw === void 0) return 1;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
-}
-function readParagraphOrHeading(element, paragraph) {
-	if (element.tag === "text:h") {
-		const outlineLevel = readOutlineLevel(element);
-		paragraph.styleId = `Heading${outlineLevel}`;
-		paragraph.headingLevel = outlineLevel;
-	}
-	return paragraph;
-}
 function resolveParagraphMasterPageName(element, pkg, state) {
 	const styleName = attrValue(element, "text:style-name");
 	if (state.masterPageByStyleName.has(styleName)) return state.masterPageByStyleName.get(styleName);
@@ -541,15 +527,16 @@ function readBlocks(nodes, pkg, state, baseIndex = 0) {
 	};
 	const readOneParagraph = (element) => {
 		const halves = [];
+		const paragraph = readOdfParagraph(element, pkg, {
+			provenanceRegions: state.provenanceRegions,
+			markersOut: halves,
+			definitions: state.definitions,
+			listIdState: state.listIdState,
+			format: "odt"
+		});
 		return {
 			element,
-			paragraph: readParagraphOrHeading(element, readOdfParagraph(element, pkg, {
-				provenanceRegions: state.provenanceRegions,
-				markersOut: halves,
-				definitions: state.definitions,
-				listIdState: state.listIdState,
-				format: "odt"
-			})),
+			paragraph: readParagraphOrHeading(element, paragraph),
 			halves,
 			liftedSources: readAnchoredFrameSources(element, pkg, state),
 			masterPageName: resolveParagraphMasterPageName(element, pkg, state)

package/dist/{embedded-ClsebpWi.d.ts → embedded-Zv8KtFUo.d.ts}

@@ -1,6 +1,6 @@
 import { l as XmlElement } from "./node-CkBWRjNR.js";
 import { r as Package } from "./package-BUojjTXf.js";
-import { l as OdfResidueFormat } from "./constructs-B1yajQJB.js";
+import { l as OdfResidueFormat } from "./constructs-C1S8qlVv.js";
 import { Box, ContentDocument, ContentEmbeddedObjectKind, SourceResidue } from "document-schema.js";
 //#region src/typed/draw/embedded.d.ts
 type EmbeddedDocumentKind = ContentEmbeddedObjectKind;

package/dist/{form-D8wh-xhJ.d.cts → form-CWWCkG-r.d.cts}

@@ -1,6 +1,6 @@
 import { r as Package } from "./package-L24lkba-.cjs";
 import { t as OdtDocument } from "./read-rwDsgR0d.cjs";
-import { n as OdbFormDefinition } from "./forms-BydLKkI0.cjs";
+import { n as OdbFormDefinition } from "./forms-Eh1N15Qy.cjs";
 //#region src/typed/odb/form.d.ts
 interface OdbForm {
   name: string;

package/dist/{form-CsOrcORr.d.ts → form-RJTtSmwn.d.ts}

@@ -1,6 +1,6 @@
 import { r as Package } from "./package-BUojjTXf.js";
 import { t as OdtDocument } from "./read-24g5eZw6.js";
-import { n as OdbFormDefinition } from "./forms-iwRSwhOn.js";
+import { n as OdbFormDefinition } from "./forms-CyLw7lpE.js";
 //#region src/typed/odb/form.d.ts
 interface OdbForm {
   name: string;

package/dist/{forms-iwRSwhOn.d.ts → forms-CyLw7lpE.d.ts}

@@ -1,5 +1,5 @@
 import { l as XmlElement } from "./node-CkBWRjNR.js";
-import { l as OdfResidueFormat } from "./constructs-B1yajQJB.js";
+import { l as OdfResidueFormat } from "./constructs-C1S8qlVv.js";
 import { ContentBlock } from "document-schema.js";
 //#region src/typed/shared/forms.d.ts
 interface OdbFormControl {

package/dist/{forms-BydLKkI0.d.cts → forms-Eh1N15Qy.d.cts}

@@ -1,5 +1,5 @@
 import { l as XmlElement } from "./node-CkBWRjNR.cjs";
-import { l as OdfResidueFormat } from "./constructs-BSC_5kfU.cjs";
+import { l as OdfResidueFormat } from "./constructs-FLBse5UV.cjs";
 import { ContentBlock } from "document-schema.js";
 //#region src/typed/shared/forms.d.ts
 interface OdbFormControl {

package/dist/index.cjs

@@ -38,7 +38,7 @@ const require_typed_formula_read = require("./typed/formula/read.cjs");
 const require_typed_odb_subdocument = require("./typed/odb/subdocument.cjs");
 const require_typed_odg_read = require("./typed/odg/read.cjs");
 const require_typed_odp_read = require("./typed/odp/read.cjs");
-const require_embedded = require("./embedded-DbLrCGPi.cjs");
+const require_embedded = require("./embedded-CBTvjVKb.cjs");
 const require_typed_shared_forms = require("./typed/shared/forms.cjs");
 const require_typed_odm_read = require("./typed/odm/read.cjs");
 const require_typed_odb_read = require("./typed/odb/read.cjs");

package/dist/index.d.cts

@@ -26,13 +26,13 @@ import { a as measureOdfNodeLength, n as decodeOdfText, o as sumOdfNodeLength, r
 import { a as resolveStyle, i as findStyleElement, n as StyleCascadeResult, o as resolveStyleElementChain, r as StyleElementChainResult, t as CascadeDiagnostic } from "./cascade-DWQfTwaM.cjs";
 import { n as readOdfMetadata, t as META_PART } from "./metadata-1j1zm9Cx.cjs";
 import { a as resolveOdfListKind, i as readOdfListParagraphs, n as OdfListParagraphReader, r as mintOdfListNumId, t as OdfListIdState } from "./list-KZeXA0mR.cjs";
-import { r as readOdfParagraph } from "./paragraph-CuEMXbDg.cjs";
+import { r as readOdfParagraph } from "./paragraph-DaMqmhe3.cjs";
 import { r as readOdfTable } from "./table-BH_Q2n_N.cjs";
 import { a as composeOdfGroupTransform, c as resolveOdfShapeGeometry, i as applyOdfTransform, n as OdfShapeGeometry, o as netRotationDeg, r as OdfTransformFunction, s as parseOdfTransform, t as OdfPoint } from "./transform-DKEjydnm.cjs";
 import { n as resolveDrawPageSize, r as resolvePageLayoutProperties } from "./masterpage-Bt6gxuoL.cjs";
 import { a as buildOdfSubpaths, c as parseOdfViewBox, i as OdfViewBox, l as rawSubpathFromPoints, n as OdfRawSegment, o as parseOdfPathData, r as OdfRawSubpath, s as parseOdfPointsList, t as OdfRawPoint, u as scaleOdfRawPoint } from "./path-DE7wkIcz.cjs";
 import { a as walkDrawShapes, i as readDrawPageContent, n as readDrawFrame, r as readDrawImageBlock, t as DrawPageContent } from "./shapes-8o3NjBLU.cjs";
-import { i as readDrawObjectReference, r as EmbeddedDrawObject, t as EmbeddedDocumentKind } from "./embedded-rKOsAsjg.cjs";
+import { i as readDrawObjectReference, r as EmbeddedDrawObject, t as EmbeddedDocumentKind } from "./embedded-BzPTTzdf.cjs";
 import { n as readOdp, r as readOdpContent, t as OdpDocument } from "./read-CDSmR3qt.cjs";
 import { a as readOdt, i as OdtReadOptions, n as OdtHeaderFooterPart, o as readOdtContent, r as OdtHeaderFooterVariant, t as OdtDocument } from "./read-rwDsgR0d.cjs";
 import { n as readOdg, r as readOdgContent, t as OdgDocument } from "./read-IOYq80AA.cjs";
@@ -41,8 +41,8 @@ import { a as readOdfFormulaMathMl, i as readOdfFormulaContent, r as readOdfForm
 import { n as OdmSection, r as readOdm, t as OdmDocument } from "./read-ydLJ8bid.cjs";
 import { a as readOdbInventory, i as OdbQueryInfo, n as OdbConnectionInfo, o as resolveOdbComponent, r as OdbInventory, t as OdbComponentInfo } from "./read-BV2an1ok.cjs";
 import { n as subDocumentPackage, t as SubDocumentPackageOptions } from "./subdocument-yY8ASE4N.cjs";
-import { i as readOdfFormDefinitions, n as OdbFormDefinition, r as readOdfFormControlConstructs, t as OdbFormControl } from "./forms-BydLKkI0.cjs";
-import { n as readOdbForm, t as OdbForm } from "./form-D8wh-xhJ.cjs";
+import { i as readOdfFormDefinitions, n as OdbFormDefinition, r as readOdfFormControlConstructs, t as OdbFormControl } from "./forms-Eh1N15Qy.cjs";
+import { n as readOdbForm, t as OdbForm } from "./form-CWWCkG-r.cjs";
 import { a as OdbReportGroup, i as OdbReportFunction, n as OdbReportBand, o as readOdbReport, r as OdbReportElement, t as OdbReport } from "./report-D6WNYaVn.cjs";
-import { a as Alignment, i as xmlCodec, n as encodePackage, o as AlignmentSchema, r as packageCodec, s as DocumentPackage, t as decodePackage } from "./codec-LgpdP32n.cjs";
+import { a as Alignment, i as xmlCodec, n as encodePackage, o as AlignmentSchema, r as packageCodec, s as DocumentPackage, t as decodePackage } from "./codec-C3i7QbVt.cjs";
 export { type Alignment, AlignmentSchema, type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type BuildManifestOptions, type CascadeDiagnostic, type DocumentPackage, type DrawPageContent, type EmbeddedDocumentKind, type EmbeddedDrawObject, type ImageFormat, type InternRequest, type LengthUnit, MANIFEST_PART, META_PART, MIMETYPE_PART, type Manifest, type ManifestEntry, ManifestEntrySchema, type ManifestProblem, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, type OdbComponentInfo, type OdbConnectionInfo, type OdbForm, type OdbFormControl, type OdbFormDefinition, type OdbInventory, type OdbQueryInfo, type OdbReport, type OdbReportBand, type OdbReportElement, type OdbReportFunction, type OdbReportGroup, type OdfExtension, type OdfFormulaDocument, type OdfListIdState, type OdfListParagraphReader, type OdfNamespacePrefix, type OdfPoint, type OdfRawPoint, type OdfRawSegment, type OdfRawSubpath, type OdfShapeGeometry, type OdfTransformFunction, type OdfViewBox, type OdgDocument, type OdmDocument, type OdmSection, type OdpDocument, type OdsDocument, type OdtDocument, type OdtHeaderFooterPart, type OdtHeaderFooterVariant, type OdtReadOptions, type OtherPartRef, type Package, PackageSchema, type ParsedProperties, type Part, PartSchema, STYLE_FAMILIES, type StyleCascadeResult, type StyleElementChainResult, type StyleFamily, type StyleProperties, StylePropertiesSchema, StyleRegistry, type StyleRegistryOptions, type SubDocumentPackageOptions, TableCursor, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, type ZipEntry, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildOdfSubpaths, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, mintOdfListNumId, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseOdfLength as parseLength, parseOdfLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawImageBlock, readDrawObjectReference, readDrawPageContent, readManifest, readMimetype, readOdbForm, readOdbInventory, readOdbReport, readOdfFormControlConstructs, readOdfFormDefinitions, readOdfFormula, readOdfFormulaContent, readOdfFormulaMathMl, readOdfListParagraphs, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdgContent, readOdm, readOdp, readOdpContent, readOds, readOdsContent, readOdt, readOdtContent, resolveDrawPageSize, resolveOdbComponent, resolveOdfListKind, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, subDocumentPackage, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };

package/dist/index.d.ts

@@ -26,13 +26,13 @@ import { a as measureOdfNodeLength, n as decodeOdfText, o as sumOdfNodeLength, r
 import { a as resolveStyle, i as findStyleElement, n as StyleCascadeResult, o as resolveStyleElementChain, r as StyleElementChainResult, t as CascadeDiagnostic } from "./cascade-BZ7zqXhL.js";
 import { n as readOdfMetadata, t as META_PART } from "./metadata-BXpjrAS-.js";
 import { a as resolveOdfListKind, i as readOdfListParagraphs, n as OdfListParagraphReader, r as mintOdfListNumId, t as OdfListIdState } from "./list-Qeuawtew.js";
-import { r as readOdfParagraph } from "./paragraph-BE71DZ0t.js";
+import { r as readOdfParagraph } from "./paragraph-hzoy-Wos.js";
 import { r as readOdfTable } from "./table-ByOoGcq_.js";
 import { a as composeOdfGroupTransform, c as resolveOdfShapeGeometry, i as applyOdfTransform, n as OdfShapeGeometry, o as netRotationDeg, r as OdfTransformFunction, s as parseOdfTransform, t as OdfPoint } from "./transform-C7GrZZdR.js";
 import { n as resolveDrawPageSize, r as resolvePageLayoutProperties } from "./masterpage-By_F05W4.js";
 import { a as buildOdfSubpaths, c as parseOdfViewBox, i as OdfViewBox, l as rawSubpathFromPoints, n as OdfRawSegment, o as parseOdfPathData, r as OdfRawSubpath, s as parseOdfPointsList, t as OdfRawPoint, u as scaleOdfRawPoint } from "./path-DE7wkIcz.js";
 import { a as walkDrawShapes, i as readDrawPageContent, n as readDrawFrame, r as readDrawImageBlock, t as DrawPageContent } from "./shapes-CCB8ydqD.js";
-import { i as readDrawObjectReference, r as EmbeddedDrawObject, t as EmbeddedDocumentKind } from "./embedded-ClsebpWi.js";
+import { i as readDrawObjectReference, r as EmbeddedDrawObject, t as EmbeddedDocumentKind } from "./embedded-Zv8KtFUo.js";
 import { n as readOdp, r as readOdpContent, t as OdpDocument } from "./read-DfEHXwgn.js";
 import { a as readOdt, i as OdtReadOptions, n as OdtHeaderFooterPart, o as readOdtContent, r as OdtHeaderFooterVariant, t as OdtDocument } from "./read-24g5eZw6.js";
 import { n as readOdg, r as readOdgContent, t as OdgDocument } from "./read-BLoaDxr_.js";
@@ -41,8 +41,8 @@ import { a as readOdfFormulaMathMl, i as readOdfFormulaContent, r as readOdfForm
 import { n as OdmSection, r as readOdm, t as OdmDocument } from "./read-DYYxbvfo.js";
 import { a as readOdbInventory, i as OdbQueryInfo, n as OdbConnectionInfo, o as resolveOdbComponent, r as OdbInventory, t as OdbComponentInfo } from "./read-CvjbdgH3.js";
 import { n as subDocumentPackage, t as SubDocumentPackageOptions } from "./subdocument-BwW3FZC_.js";
-import { i as readOdfFormDefinitions, n as OdbFormDefinition, r as readOdfFormControlConstructs, t as OdbFormControl } from "./forms-iwRSwhOn.js";
-import { n as readOdbForm, t as OdbForm } from "./form-CsOrcORr.js";
+import { i as readOdfFormDefinitions, n as OdbFormDefinition, r as readOdfFormControlConstructs, t as OdbFormControl } from "./forms-CyLw7lpE.js";
+import { n as readOdbForm, t as OdbForm } from "./form-RJTtSmwn.js";
 import { a as OdbReportGroup, i as OdbReportFunction, n as OdbReportBand, o as readOdbReport, r as OdbReportElement, t as OdbReport } from "./report-DbslT2OR.js";
-import { a as Alignment, i as xmlCodec, n as encodePackage, o as AlignmentSchema, r as packageCodec, s as DocumentPackage, t as decodePackage } from "./codec-sFSMk-if.js";
+import { a as Alignment, i as xmlCodec, n as encodePackage, o as AlignmentSchema, r as packageCodec, s as DocumentPackage, t as decodePackage } from "./codec-CbPSWzQ2.js";
 export { type Alignment, AlignmentSchema, type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type BuildManifestOptions, type CascadeDiagnostic, type DocumentPackage, type DrawPageContent, type EmbeddedDocumentKind, type EmbeddedDrawObject, type ImageFormat, type InternRequest, type LengthUnit, MANIFEST_PART, META_PART, MIMETYPE_PART, type Manifest, type ManifestEntry, ManifestEntrySchema, type ManifestProblem, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, type OdbComponentInfo, type OdbConnectionInfo, type OdbForm, type OdbFormControl, type OdbFormDefinition, type OdbInventory, type OdbQueryInfo, type OdbReport, type OdbReportBand, type OdbReportElement, type OdbReportFunction, type OdbReportGroup, type OdfExtension, type OdfFormulaDocument, type OdfListIdState, type OdfListParagraphReader, type OdfNamespacePrefix, type OdfPoint, type OdfRawPoint, type OdfRawSegment, type OdfRawSubpath, type OdfShapeGeometry, type OdfTransformFunction, type OdfViewBox, type OdgDocument, type OdmDocument, type OdmSection, type OdpDocument, type OdsDocument, type OdtDocument, type OdtHeaderFooterPart, type OdtHeaderFooterVariant, type OdtReadOptions, type OtherPartRef, type Package, PackageSchema, type ParsedProperties, type Part, PartSchema, STYLE_FAMILIES, type StyleCascadeResult, type StyleElementChainResult, type StyleFamily, type StyleProperties, StylePropertiesSchema, StyleRegistry, type StyleRegistryOptions, type SubDocumentPackageOptions, TableCursor, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, type ZipEntry, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildOdfSubpaths, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, mintOdfListNumId, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseOdfLength as parseLength, parseOdfLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawImageBlock, readDrawObjectReference, readDrawPageContent, readManifest, readMimetype, readOdbForm, readOdbInventory, readOdbReport, readOdfFormControlConstructs, readOdfFormDefinitions, readOdfFormula, readOdfFormulaContent, readOdfFormulaMathMl, readOdfListParagraphs, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdgContent, readOdm, readOdp, readOdpContent, readOds, readOdsContent, readOdt, readOdtContent, resolveDrawPageSize, resolveOdbComponent, resolveOdfListKind, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, subDocumentPackage, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };

package/dist/index.js

@@ -37,7 +37,7 @@ import { readOdfFormula, readOdfFormulaContent, readOdfFormulaMathMl } from "./t
 import { subDocumentPackage } from "./typed/odb/subdocument.js";
 import { readOdg, readOdgContent } from "./typed/odg/read.js";
 import { readOdp, readOdpContent } from "./typed/odp/read.js";
-import { a as readOdtContent, i as readOdt, o as readOds, s as readOdsContent, t as readDrawObjectReference } from "./embedded-BSSdoKcK.js";
+import { a as readOdtContent, i as readOdt, o as readOds, s as readOdsContent, t as readDrawObjectReference } from "./embedded-D2MXjcFm.js";
 import { readOdfFormControlConstructs, readOdfFormDefinitions } from "./typed/shared/forms.js";
 import { readOdm } from "./typed/odm/read.js";
 import { readOdbInventory, resolveOdbComponent } from "./typed/odb/read.js";

package/dist/{paragraph-CuEMXbDg.d.cts → paragraph-DaMqmhe3.d.cts}

@@ -1,7 +1,7 @@
 import { l as XmlElement } from "./node-CkBWRjNR.cjs";
 import { r as Package } from "./package-L24lkba-.cjs";
 import { t as OdfListIdState } from "./list-KZeXA0mR.cjs";
-import { a as OdfDefinitionsSink, l as OdfResidueFormat, s as OdfMarkerHalf } from "./constructs-BSC_5kfU.cjs";
+import { a as OdfDefinitionsSink, l as OdfResidueFormat, s as OdfMarkerHalf } from "./constructs-FLBse5UV.cjs";
 import { ContentBlock, ContentParagraph, ProvenanceDescriptor } from "document-schema.js";
 //#region src/typed/shared/paragraph.d.ts
 interface OdfParagraphContext {
@@ -13,5 +13,6 @@ interface OdfParagraphContext {
 }
 declare function readOdfConstructBodyBlocks(body: XmlElement, pkg: Package, context: OdfParagraphContext, listIdState: OdfListIdState): ContentBlock[];
 declare function readOdfParagraph(pElement: XmlElement, pkg: Package, context?: OdfParagraphContext): ContentParagraph;
+declare function readParagraphOrHeading(element: XmlElement, paragraph: ContentParagraph): ContentParagraph;
 //#endregion
-export { readOdfConstructBodyBlocks as n, readOdfParagraph as r, OdfParagraphContext as t };
+export { readParagraphOrHeading as i, readOdfConstructBodyBlocks as n, readOdfParagraph as r, OdfParagraphContext as t };

package/dist/{paragraph-BE71DZ0t.d.ts → paragraph-hzoy-Wos.d.ts}

@@ -1,7 +1,7 @@
 import { l as XmlElement } from "./node-CkBWRjNR.js";
 import { r as Package } from "./package-BUojjTXf.js";
 import { t as OdfListIdState } from "./list-Qeuawtew.js";
-import { a as OdfDefinitionsSink, l as OdfResidueFormat, s as OdfMarkerHalf } from "./constructs-B1yajQJB.js";
+import { a as OdfDefinitionsSink, l as OdfResidueFormat, s as OdfMarkerHalf } from "./constructs-C1S8qlVv.js";
 import { ContentBlock, ContentParagraph, ProvenanceDescriptor } from "document-schema.js";
 //#region src/typed/shared/paragraph.d.ts
 interface OdfParagraphContext {
@@ -13,5 +13,6 @@ interface OdfParagraphContext {
 }
 declare function readOdfConstructBodyBlocks(body: XmlElement, pkg: Package, context: OdfParagraphContext, listIdState: OdfListIdState): ContentBlock[];
 declare function readOdfParagraph(pElement: XmlElement, pkg: Package, context?: OdfParagraphContext): ContentParagraph;
+declare function readParagraphOrHeading(element: XmlElement, paragraph: ContentParagraph): ContentParagraph;
 //#endregion
-export { readOdfConstructBodyBlocks as n, readOdfParagraph as r, OdfParagraphContext as t };
+export { readParagraphOrHeading as i, readOdfConstructBodyBlocks as n, readOdfParagraph as r, OdfParagraphContext as t };

package/dist/typed/draw/embedded.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_embedded = require("../../embedded-DbLrCGPi.cjs");
+const require_embedded = require("../../embedded-CBTvjVKb.cjs");
 exports.readDrawObjectReference = require_embedded.readDrawObjectReference;
 exports.readEmbeddedObjectDocument = require_embedded.readEmbeddedObjectDocument;
 exports.readOdfChartContent = require_embedded.readOdfChartContent;

package/dist/typed/draw/embedded.d.cts

@@ -1,2 +1,2 @@
-import { a as readEmbeddedObjectDocument, i as readDrawObjectReference, n as EmbeddedDocumentRead, o as readOdfChartContent, r as EmbeddedDrawObject, t as EmbeddedDocumentKind } from "../../embedded-rKOsAsjg.cjs";
+import { a as readEmbeddedObjectDocument, i as readDrawObjectReference, n as EmbeddedDocumentRead, o as readOdfChartContent, r as EmbeddedDrawObject, t as EmbeddedDocumentKind } from "../../embedded-BzPTTzdf.cjs";
 export { EmbeddedDocumentKind, EmbeddedDocumentRead, EmbeddedDrawObject, readDrawObjectReference, readEmbeddedObjectDocument, readOdfChartContent };

package/dist/typed/draw/embedded.d.ts

@@ -1,2 +1,2 @@
-import { a as readEmbeddedObjectDocument, i as readDrawObjectReference, n as EmbeddedDocumentRead, o as readOdfChartContent, r as EmbeddedDrawObject, t as EmbeddedDocumentKind } from "../../embedded-ClsebpWi.js";
+import { a as readEmbeddedObjectDocument, i as readDrawObjectReference, n as EmbeddedDocumentRead, o as readOdfChartContent, r as EmbeddedDrawObject, t as EmbeddedDocumentKind } from "../../embedded-Zv8KtFUo.js";
 export { EmbeddedDocumentKind, EmbeddedDocumentRead, EmbeddedDrawObject, readDrawObjectReference, readEmbeddedObjectDocument, readOdfChartContent };

package/dist/typed/draw/embedded.js

@@ -1,2 +1,2 @@
-import { n as readEmbeddedObjectDocument, r as readOdfChartContent, t as readDrawObjectReference } from "../../embedded-BSSdoKcK.js";
+import { n as readEmbeddedObjectDocument, r as readOdfChartContent, t as readDrawObjectReference } from "../../embedded-D2MXjcFm.js";
 export { readDrawObjectReference, readEmbeddedObjectDocument, readOdfChartContent };

package/dist/typed/odb/form.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_query = require("../../xml/query.cjs");
 const require_typed_odb_subdocument = require("./subdocument.cjs");
-const require_embedded = require("../../embedded-DbLrCGPi.cjs");
+const require_embedded = require("../../embedded-CBTvjVKb.cjs");
 const require_typed_shared_forms = require("../shared/forms.cjs");
 const require_typed_odb_read = require("./read.cjs");
 //#region src/typed/odb/form.ts

package/dist/typed/odb/form.d.cts

@@ -1,2 +1,2 @@
-import { n as readOdbForm, t as OdbForm } from "../../form-D8wh-xhJ.cjs";
+import { n as readOdbForm, t as OdbForm } from "../../form-CWWCkG-r.cjs";
 export { OdbForm, readOdbForm };

package/dist/typed/odb/form.d.ts

@@ -1,2 +1,2 @@
-import { n as readOdbForm, t as OdbForm } from "../../form-CsOrcORr.js";
+import { n as readOdbForm, t as OdbForm } from "../../form-RJTtSmwn.js";
 export { OdbForm, readOdbForm };

package/dist/typed/odb/form.js

@@ -1,6 +1,6 @@
 import { findChildElement, rootElement } from "../../xml/query.js";
 import { subDocumentPackage } from "./subdocument.js";
-import { a as readOdtContent } from "../../embedded-BSSdoKcK.js";
+import { a as readOdtContent } from "../../embedded-D2MXjcFm.js";
 import { readOdfFormDefinitions } from "../shared/forms.js";
 import { resolveOdbComponent } from "./read.js";
 //#region src/typed/odb/form.ts

package/dist/typed/ods/read.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_embedded = require("../../embedded-DbLrCGPi.cjs");
+const require_embedded = require("../../embedded-CBTvjVKb.cjs");
 exports.readOds = require_embedded.readOds;
 exports.readOdsContent = require_embedded.readOdsContent;

package/dist/typed/ods/read.js

@@ -1,2 +1,2 @@
-import { o as readOds, s as readOdsContent } from "../../embedded-BSSdoKcK.js";
+import { o as readOds, s as readOdsContent } from "../../embedded-D2MXjcFm.js";
 export { readOds, readOdsContent };

package/dist/typed/odt/read.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_embedded = require("../../embedded-DbLrCGPi.cjs");
+const require_embedded = require("../../embedded-CBTvjVKb.cjs");
 exports.readOdt = require_embedded.readOdt;
 exports.readOdtContent = require_embedded.readOdtContent;

package/dist/typed/odt/read.js

@@ -1,2 +1,2 @@
-import { a as readOdtContent, i as readOdt } from "../../embedded-BSSdoKcK.js";
+import { a as readOdtContent, i as readOdt } from "../../embedded-D2MXjcFm.js";
 export { readOdt, readOdtContent };

package/dist/typed/shared/constructs.cjs

@@ -198,8 +198,8 @@ function isOdfBlockScopedHalf(half, paragraphElement) {
 function pairOdfMarkerHalves(halves, paragraphElement) {
 	const byKey = /* @__PURE__ */ new Map();
 	for (const half of halves) {
-		const existing = byKey.get(half.key);
-		if (existing === void 0) byKey.set(half.key, [half]);
+		const existing = byKey.get(`${half.kind} ${half.key}`);
+		if (existing === void 0) byKey.set(`${half.kind} ${half.key}`, [half]);
 		else existing.push(half);
 	}
 	const extents = [];

package/dist/typed/shared/constructs.d.cts

@@ -1,2 +1,2 @@
-import { A as pairOdfMarkerHalves, C as odfBookmarkAnchorDescriptor, D as odfIndexControlDescriptor, E as odfFieldDescriptor, O as odfMarkerHalfEventIndex, S as odfAttributeElement, T as odfDivisionDescriptor, _ as collectOdfUnmappedShapeResidue, a as OdfDefinitionsSink, b as isOdfExtensionElement, c as OdfMarkerKind, d as collectOdfDataStyleDefinitions, f as collectOdfFieldMasterDefinitions, g as collectOdfProvenanceRegions, h as collectOdfNonContentPartResidue, i as OdfConstructExtent, j as resolveOdfMarkerEvents, k as odfResidue, l as OdfResidueFormat, m as collectOdfNamedExpressions, n as ODF_INDEX_WRAPPER_TAGS, o as OdfMarkerEvent, p as collectOdfFontFaceDefinitions, r as ODF_UNMAPPED_SHAPE_TAGS, s as OdfMarkerHalf, t as ODF_CONSUMED_PART_PATHS, u as addOdfPackageResidue, v as insertOdfConstructMarkers, w as odfChangedRegionId, x as isOdfIndexWrapper, y as isOdfBlockScopedHalf } from "../../constructs-BSC_5kfU.cjs";
+import { A as pairOdfMarkerHalves, C as odfBookmarkAnchorDescriptor, D as odfIndexControlDescriptor, E as odfFieldDescriptor, O as odfMarkerHalfEventIndex, S as odfAttributeElement, T as odfDivisionDescriptor, _ as collectOdfUnmappedShapeResidue, a as OdfDefinitionsSink, b as isOdfExtensionElement, c as OdfMarkerKind, d as collectOdfDataStyleDefinitions, f as collectOdfFieldMasterDefinitions, g as collectOdfProvenanceRegions, h as collectOdfNonContentPartResidue, i as OdfConstructExtent, j as resolveOdfMarkerEvents, k as odfResidue, l as OdfResidueFormat, m as collectOdfNamedExpressions, n as ODF_INDEX_WRAPPER_TAGS, o as OdfMarkerEvent, p as collectOdfFontFaceDefinitions, r as ODF_UNMAPPED_SHAPE_TAGS, s as OdfMarkerHalf, t as ODF_CONSUMED_PART_PATHS, u as addOdfPackageResidue, v as insertOdfConstructMarkers, w as odfChangedRegionId, x as isOdfIndexWrapper, y as isOdfBlockScopedHalf } from "../../constructs-FLBse5UV.cjs";
 export { ODF_CONSUMED_PART_PATHS, ODF_INDEX_WRAPPER_TAGS, ODF_UNMAPPED_SHAPE_TAGS, OdfConstructExtent, OdfDefinitionsSink, OdfMarkerEvent, OdfMarkerHalf, OdfMarkerKind, OdfResidueFormat, addOdfPackageResidue, collectOdfDataStyleDefinitions, collectOdfFieldMasterDefinitions, collectOdfFontFaceDefinitions, collectOdfNamedExpressions, collectOdfNonContentPartResidue, collectOdfProvenanceRegions, collectOdfUnmappedShapeResidue, insertOdfConstructMarkers, isOdfBlockScopedHalf, isOdfExtensionElement, isOdfIndexWrapper, odfAttributeElement, odfBookmarkAnchorDescriptor, odfChangedRegionId, odfDivisionDescriptor, odfFieldDescriptor, odfIndexControlDescriptor, odfMarkerHalfEventIndex, odfResidue, pairOdfMarkerHalves, resolveOdfMarkerEvents };

package/dist/typed/shared/constructs.d.ts

@@ -1,2 +1,2 @@
-import { A as pairOdfMarkerHalves, C as odfBookmarkAnchorDescriptor, D as odfIndexControlDescriptor, E as odfFieldDescriptor, O as odfMarkerHalfEventIndex, S as odfAttributeElement, T as odfDivisionDescriptor, _ as collectOdfUnmappedShapeResidue, a as OdfDefinitionsSink, b as isOdfExtensionElement, c as OdfMarkerKind, d as collectOdfDataStyleDefinitions, f as collectOdfFieldMasterDefinitions, g as collectOdfProvenanceRegions, h as collectOdfNonContentPartResidue, i as OdfConstructExtent, j as resolveOdfMarkerEvents, k as odfResidue, l as OdfResidueFormat, m as collectOdfNamedExpressions, n as ODF_INDEX_WRAPPER_TAGS, o as OdfMarkerEvent, p as collectOdfFontFaceDefinitions, r as ODF_UNMAPPED_SHAPE_TAGS, s as OdfMarkerHalf, t as ODF_CONSUMED_PART_PATHS, u as addOdfPackageResidue, v as insertOdfConstructMarkers, w as odfChangedRegionId, x as isOdfIndexWrapper, y as isOdfBlockScopedHalf } from "../../constructs-B1yajQJB.js";
+import { A as pairOdfMarkerHalves, C as odfBookmarkAnchorDescriptor, D as odfIndexControlDescriptor, E as odfFieldDescriptor, O as odfMarkerHalfEventIndex, S as odfAttributeElement, T as odfDivisionDescriptor, _ as collectOdfUnmappedShapeResidue, a as OdfDefinitionsSink, b as isOdfExtensionElement, c as OdfMarkerKind, d as collectOdfDataStyleDefinitions, f as collectOdfFieldMasterDefinitions, g as collectOdfProvenanceRegions, h as collectOdfNonContentPartResidue, i as OdfConstructExtent, j as resolveOdfMarkerEvents, k as odfResidue, l as OdfResidueFormat, m as collectOdfNamedExpressions, n as ODF_INDEX_WRAPPER_TAGS, o as OdfMarkerEvent, p as collectOdfFontFaceDefinitions, r as ODF_UNMAPPED_SHAPE_TAGS, s as OdfMarkerHalf, t as ODF_CONSUMED_PART_PATHS, u as addOdfPackageResidue, v as insertOdfConstructMarkers, w as odfChangedRegionId, x as isOdfIndexWrapper, y as isOdfBlockScopedHalf } from "../../constructs-C1S8qlVv.js";
 export { ODF_CONSUMED_PART_PATHS, ODF_INDEX_WRAPPER_TAGS, ODF_UNMAPPED_SHAPE_TAGS, OdfConstructExtent, OdfDefinitionsSink, OdfMarkerEvent, OdfMarkerHalf, OdfMarkerKind, OdfResidueFormat, addOdfPackageResidue, collectOdfDataStyleDefinitions, collectOdfFieldMasterDefinitions, collectOdfFontFaceDefinitions, collectOdfNamedExpressions, collectOdfNonContentPartResidue, collectOdfProvenanceRegions, collectOdfUnmappedShapeResidue, insertOdfConstructMarkers, isOdfBlockScopedHalf, isOdfExtensionElement, isOdfIndexWrapper, odfAttributeElement, odfBookmarkAnchorDescriptor, odfChangedRegionId, odfDivisionDescriptor, odfFieldDescriptor, odfIndexControlDescriptor, odfMarkerHalfEventIndex, odfResidue, pairOdfMarkerHalves, resolveOdfMarkerEvents };

package/dist/typed/shared/constructs.js

@@ -197,8 +197,8 @@ function isOdfBlockScopedHalf(half, paragraphElement) {
 function pairOdfMarkerHalves(halves, paragraphElement) {
 	const byKey = /* @__PURE__ */ new Map();
 	for (const half of halves) {
-		const existing = byKey.get(half.key);
-		if (existing === void 0) byKey.set(half.key, [half]);
+		const existing = byKey.get(`${half.kind} ${half.key}`);
+		if (existing === void 0) byKey.set(`${half.kind} ${half.key}`, [half]);
 		else existing.push(half);
 	}
 	const extents = [];

package/dist/typed/shared/forms.d.cts

@@ -1,2 +1,2 @@
-import { i as readOdfFormDefinitions, n as OdbFormDefinition, r as readOdfFormControlConstructs, t as OdbFormControl } from "../../forms-BydLKkI0.cjs";
+import { i as readOdfFormDefinitions, n as OdbFormDefinition, r as readOdfFormControlConstructs, t as OdbFormControl } from "../../forms-Eh1N15Qy.cjs";
 export { OdbFormControl, OdbFormDefinition, readOdfFormControlConstructs, readOdfFormDefinitions };

package/dist/typed/shared/forms.d.ts

@@ -1,2 +1,2 @@
-import { i as readOdfFormDefinitions, n as OdbFormDefinition, r as readOdfFormControlConstructs, t as OdbFormControl } from "../../forms-iwRSwhOn.js";
+import { i as readOdfFormDefinitions, n as OdbFormDefinition, r as readOdfFormControlConstructs, t as OdbFormControl } from "../../forms-CyLw7lpE.js";
 export { OdbFormControl, OdbFormDefinition, readOdfFormControlConstructs, readOdfFormDefinitions };

package/dist/typed/shared/paragraph.cjs

@@ -51,7 +51,7 @@ function collectRuns(container, baseProperties, pkg, out, walk, hyperlinkTarget
 				startRun,
 				endRun: out.length
 			});
-		} else if (node.tag === "text:bookmark") {
+		} else if (node.tag === "text:bookmark" || node.tag === "text:reference-mark") {
 			const name = require_xml_query.attrValue(node, "text:name");
 			if (name !== void 0) {
 				const runPosition = out.length;
@@ -61,6 +61,18 @@ function collectRuns(container, baseProperties, pkg, out, walk, hyperlinkTarget
 					endRun: runPosition
 				});
 			}
+		} else if (node.tag === "text:reference-mark-start" || node.tag === "text:reference-mark-end") {
+			const name = require_xml_query.attrValue(node, "text:name");
+			if (name !== void 0) walk.halves.push({
+				kind: "referenceMark",
+				side: node.tag === "text:reference-mark-start" ? "start" : "end",
+				key: require_xml_entities.decodeXmlText(name),
+				element: node,
+				parent: container,
+				runPosition: out.length,
+				order: walk.order++,
+				descriptor: () => require_typed_shared_constructs.odfBookmarkAnchorDescriptor(require_xml_entities.decodeXmlText(name))
+			});
 		} else if (node.tag === "text:bookmark-start" || node.tag === "text:bookmark-end") {
 			const name = require_xml_query.attrValue(node, "text:name");
 			if (name !== void 0) walk.halves.push({
@@ -251,6 +263,21 @@ function readOdfParagraph(pElement, pkg, context = {}) {
 		pageBreakAfter: paragraphProperties.pageBreakAfter
 	};
 }
+function readOutlineLevel(headingElement) {
+	const raw = require_xml_query.attrValue(headingElement, "text:outline-level");
+	if (raw === void 0) return 1;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
+}
+function readParagraphOrHeading(element, paragraph) {
+	if (element.tag === "text:h") {
+		const outlineLevel = readOutlineLevel(element);
+		paragraph.styleId = `Heading${outlineLevel}`;
+		paragraph.headingLevel = outlineLevel;
+	}
+	return paragraph;
+}
 //#endregion
 exports.readOdfConstructBodyBlocks = readOdfConstructBodyBlocks;
 exports.readOdfParagraph = readOdfParagraph;
+exports.readParagraphOrHeading = readParagraphOrHeading;

package/dist/typed/shared/paragraph.d.cts

@@ -1,2 +1,2 @@
-import { n as readOdfConstructBodyBlocks, r as readOdfParagraph, t as OdfParagraphContext } from "../../paragraph-CuEMXbDg.cjs";
-export { OdfParagraphContext, readOdfConstructBodyBlocks, readOdfParagraph };
+import { i as readParagraphOrHeading, n as readOdfConstructBodyBlocks, r as readOdfParagraph, t as OdfParagraphContext } from "../../paragraph-DaMqmhe3.cjs";
+export { OdfParagraphContext, readOdfConstructBodyBlocks, readOdfParagraph, readParagraphOrHeading };

package/dist/typed/shared/paragraph.d.ts

@@ -1,2 +1,2 @@
-import { n as readOdfConstructBodyBlocks, r as readOdfParagraph, t as OdfParagraphContext } from "../../paragraph-BE71DZ0t.js";
-export { OdfParagraphContext, readOdfConstructBodyBlocks, readOdfParagraph };
+import { i as readParagraphOrHeading, n as readOdfConstructBodyBlocks, r as readOdfParagraph, t as OdfParagraphContext } from "../../paragraph-hzoy-Wos.js";
+export { OdfParagraphContext, readOdfConstructBodyBlocks, readOdfParagraph, readParagraphOrHeading };

package/dist/typed/shared/paragraph.js

@@ -50,7 +50,7 @@ function collectRuns(container, baseProperties, pkg, out, walk, hyperlinkTarget
 				startRun,
 				endRun: out.length
 			});
-		} else if (node.tag === "text:bookmark") {
+		} else if (node.tag === "text:bookmark" || node.tag === "text:reference-mark") {
 			const name = attrValue(node, "text:name");
 			if (name !== void 0) {
 				const runPosition = out.length;
@@ -60,6 +60,18 @@ function collectRuns(container, baseProperties, pkg, out, walk, hyperlinkTarget
 					endRun: runPosition
 				});
 			}
+		} else if (node.tag === "text:reference-mark-start" || node.tag === "text:reference-mark-end") {
+			const name = attrValue(node, "text:name");
+			if (name !== void 0) walk.halves.push({
+				kind: "referenceMark",
+				side: node.tag === "text:reference-mark-start" ? "start" : "end",
+				key: decodeXmlText(name),
+				element: node,
+				parent: container,
+				runPosition: out.length,
+				order: walk.order++,
+				descriptor: () => odfBookmarkAnchorDescriptor(decodeXmlText(name))
+			});
 		} else if (node.tag === "text:bookmark-start" || node.tag === "text:bookmark-end") {
 			const name = attrValue(node, "text:name");
 			if (name !== void 0) walk.halves.push({
@@ -250,5 +262,19 @@ function readOdfParagraph(pElement, pkg, context = {}) {
 		pageBreakAfter: paragraphProperties.pageBreakAfter
 	};
 }
+function readOutlineLevel(headingElement) {
+	const raw = attrValue(headingElement, "text:outline-level");
+	if (raw === void 0) return 1;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
+}
+function readParagraphOrHeading(element, paragraph) {
+	if (element.tag === "text:h") {
+		const outlineLevel = readOutlineLevel(element);
+		paragraph.styleId = `Heading${outlineLevel}`;
+		paragraph.headingLevel = outlineLevel;
+	}
+	return paragraph;
+}
 //#endregion
-export { readOdfConstructBodyBlocks, readOdfParagraph };
+export { readOdfConstructBodyBlocks, readOdfParagraph, readParagraphOrHeading };

package/dist/typed/shared/table.cjs

@@ -115,7 +115,12 @@ function readCellStyleDecoration(elements) {
 	};
 }
 function readTableCell(cellElement, pkg) {
-	const blocks = require_xml_query.childrenWithTag(cellElement, "text:p").map((p) => require_typed_shared_paragraph.readOdfParagraph(p, pkg));
+	const blocks = [];
+	for (const child of cellElement.children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "text:p") blocks.push(require_typed_shared_paragraph.readOdfParagraph(child, pkg));
+		else if (child.tag === "text:h") blocks.push(require_typed_shared_paragraph.readParagraphOrHeading(child, require_typed_shared_paragraph.readOdfParagraph(child, pkg)));
+	}
 	const colSpanRaw = require_xml_query.attrValue(cellElement, "table:number-columns-spanned");
 	const rowSpanRaw = require_xml_query.attrValue(cellElement, "table:number-rows-spanned");
 	const styleName = require_xml_query.attrValue(cellElement, "table:style-name");

package/dist/typed/shared/table.js

@@ -2,7 +2,7 @@ import { parseOdfLength } from "./units.js";
 import { parseOdfColor } from "./color.js";
 import { attrValue, childrenWithTag } from "../../xml/query.js";
 import { findStyleElement } from "./cascade.js";
-import { readOdfParagraph } from "./paragraph.js";
+import { readOdfParagraph, readParagraphOrHeading } from "./paragraph.js";
 //#region src/typed/shared/table.ts
 function readRepeatCount(element, attrName) {
 	const raw = attrValue(element, attrName);
@@ -114,7 +114,12 @@ function readCellStyleDecoration(elements) {
 	};
 }
 function readTableCell(cellElement, pkg) {
-	const blocks = childrenWithTag(cellElement, "text:p").map((p) => readOdfParagraph(p, pkg));
+	const blocks = [];
+	for (const child of cellElement.children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "text:p") blocks.push(readOdfParagraph(child, pkg));
+		else if (child.tag === "text:h") blocks.push(readParagraphOrHeading(child, readOdfParagraph(child, pkg)));
+	}
 	const colSpanRaw = attrValue(cellElement, "table:number-columns-spanned");
 	const rowSpanRaw = attrValue(cellElement, "table:number-rows-spanned");
 	const styleName = attrValue(cellElement, "table:style-name");

package/dist/typed/shared/text.cjs

@@ -46,6 +46,9 @@ const ODF_FIELD_TAGS = /* @__PURE__ */ new Set([
 	"text:user-field-input",
 	"text:sequence",
 	"text:sequence-ref",
+	"text:bookmark-ref",
+	"text:note-ref",
+	"text:reference-ref",
 	"text:database-display",
 	"text:database-name",
 	"text:database-next",

package/dist/typed/shared/text.js

@@ -45,6 +45,9 @@ const ODF_FIELD_TAGS = /* @__PURE__ */ new Set([
 	"text:user-field-input",
 	"text:sequence",
 	"text:sequence-ref",
+	"text:bookmark-ref",
+	"text:note-ref",
+	"text:reference-ref",
 	"text:database-display",
 	"text:database-name",
 	"text:database-next",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "odf.js",
-  "version": "5.3.0",
+  "version": "5.5.0",
   "description": "Type-safe, lossless round-trip conversion between OpenDocument Format packages (odt, ods, odp) and JSON, hand-written and dependency-minimal, built on Zod 4 codecs.",
   "type": "module",
   "repository": {