js.documents 7.17.3 → 7.17.4

package/dist/latex/lower.cjs

@@ -133,19 +133,22 @@ function lowerNodeList(nodes, context) {
 		diagnose(context, "latex/operator-unmapped", detail);
 		return unparsed(detail);
 	}
-	const [firstSegment = [], ...restSegments] = segments;
-	if (operators.length === 0) return lowerTerm(firstSegment, context);
+	const normalised = normaliseUnaryMinus(operators, segments.map((nodes) => ({
+		nodes,
+		negated: false
+	})));
+	const [firstSegment, ...restSegments] = normalised.segments;
+	if (firstSegment === void 0) {
+		diagnose(context, "latex/operator-placement-unparsed", spanOfNodes(context, present));
+		return unparsed(spanOfNodes(context, present));
+	}
+	if (normalised.operators.length === 0) return lowerFoldSegment(firstSegment, context);
 	const detail = spanOfNodes(context, present);
-	if (firstSegment.length === 0) {
-		const leading = operators[0];
-		const secondSegment = restSegments[0] ?? [];
-		if (leading !== SUBTRACT_OPERATOR || secondSegment.length === 0) {
-			diagnose(context, "latex/operator-placement-unparsed", detail);
-			return unparsed(detail);
-		}
-		return fold(app(UNARY_MINUS_OPERATOR, [lowerTerm(secondSegment, context)]), operators.slice(1), restSegments.slice(1), context, detail);
+	if (firstSegment.nodes.length === 0) {
+		diagnose(context, "latex/operator-placement-unparsed", detail);
+		return unparsed(detail);
 	}
-	return fold(lowerTerm(firstSegment, context), operators, restSegments, context, detail);
+	return fold(lowerFoldSegment(firstSegment, context), normalised.operators, restSegments, context, detail);
 }
 function isOperatorAtom(node) {
 	return node.type === "atom" && (node.family === "bin" || node.family === "rel");
@@ -159,6 +162,33 @@ function operatorOfNode(node) {
 	if (node.type === "textord" && nodeText(node) === "/") return "math:divide";
 }
 const RELATION_OPERATORS = new Set(Object.values(RELATION_ATOM_OPERATORS));
+function normaliseUnaryMinus(operators, segments) {
+	const outOperators = [];
+	const outSegments = [];
+	let pendingNegate = false;
+	let skipOperator = false;
+	for (const [index, segment] of segments.entries()) {
+		if (index > 0 && !skipOperator) {
+			const operator = operators[index - 1];
+			if (operator !== void 0) outOperators.push(operator);
+		}
+		skipOperator = false;
+		if (segment.nodes.length === 0 && operators[index] === SUBTRACT_OPERATOR) {
+			pendingNegate = !pendingNegate;
+			skipOperator = true;
+			continue;
+		}
+		outSegments.push({
+			nodes: segment.nodes,
+			negated: pendingNegate
+		});
+		pendingNegate = false;
+	}
+	return {
+		operators: outOperators,
+		segments: outSegments
+	};
+}
 function fold(first, operators, segments, context, detail) {
 	let runFirst = first;
 	let runOperators = [];
@@ -167,22 +197,22 @@ function fold(first, operators, segments, context, detail) {
 	const relations = [];
 	for (let index = 0; index < operators.length; index += 1) {
 		const operator = operators[index];
-		const segmentNodes = segments[index];
-		if (operator === void 0 || segmentNodes === void 0) throw new Error("operator and segment lists diverged while folding a lowered sequence");
-		if (segmentNodes.length === 0) {
+		const segment = segments[index];
+		if (operator === void 0 || segment === void 0) throw new Error("operator and segment lists diverged while folding a lowered sequence");
+		if (segment.nodes.length === 0) {
 			diagnose(context, "latex/operator-placement-unparsed", detail);
 			return unparsed(detail);
 		}
 		if (RELATION_OPERATORS.has(operator)) {
 			operands.push(foldArithmetic(runFirst, runOperators, runSegments, context));
 			relations.push(operator);
-			runFirst = lowerTerm(segmentNodes, context);
+			runFirst = lowerFoldSegment(segment, context);
 			runOperators = [];
 			runSegments = [];
 			continue;
 		}
 		runOperators.push(operator);
-		runSegments.push(segmentNodes);
+		runSegments.push(segment);
 	}
 	operands.push(foldArithmetic(runFirst, runOperators, runSegments, context));
 	let folded = operands[0];
@@ -199,12 +229,16 @@ function foldArithmetic(first, operators, segments, context) {
 	let folded = first;
 	for (let index = 0; index < operators.length; index += 1) {
 		const operator = operators[index];
-		const segmentNodes = segments[index];
-		if (operator === void 0 || segmentNodes === void 0) throw new Error("operator and segment lists diverged while folding an arithmetic run");
-		folded = app(operator, [folded, lowerTerm(segmentNodes, context)]);
+		const segment = segments[index];
+		if (operator === void 0 || segment === void 0) throw new Error("operator and segment lists diverged while folding an arithmetic run");
+		folded = app(operator, [folded, lowerFoldSegment(segment, context)]);
 	}
 	return folded;
 }
+function lowerFoldSegment(segment, context) {
+	const folded = lowerTerm(segment.nodes, context);
+	return segment.negated ? app(UNARY_MINUS_OPERATOR, [folded]) : folded;
+}
 function lowerTerm(nodes, context) {
 	return lowerTermItems(termItems(nodes), context);
 }

package/dist/latex/lower.js

@@ -132,19 +132,22 @@ function lowerNodeList(nodes, context) {
 		diagnose(context, "latex/operator-unmapped", detail);
 		return unparsed(detail);
 	}
-	const [firstSegment = [], ...restSegments] = segments;
-	if (operators.length === 0) return lowerTerm(firstSegment, context);
+	const normalised = normaliseUnaryMinus(operators, segments.map((nodes) => ({
+		nodes,
+		negated: false
+	})));
+	const [firstSegment, ...restSegments] = normalised.segments;
+	if (firstSegment === void 0) {
+		diagnose(context, "latex/operator-placement-unparsed", spanOfNodes(context, present));
+		return unparsed(spanOfNodes(context, present));
+	}
+	if (normalised.operators.length === 0) return lowerFoldSegment(firstSegment, context);
 	const detail = spanOfNodes(context, present);
-	if (firstSegment.length === 0) {
-		const leading = operators[0];
-		const secondSegment = restSegments[0] ?? [];
-		if (leading !== SUBTRACT_OPERATOR || secondSegment.length === 0) {
-			diagnose(context, "latex/operator-placement-unparsed", detail);
-			return unparsed(detail);
-		}
-		return fold(app(UNARY_MINUS_OPERATOR, [lowerTerm(secondSegment, context)]), operators.slice(1), restSegments.slice(1), context, detail);
+	if (firstSegment.nodes.length === 0) {
+		diagnose(context, "latex/operator-placement-unparsed", detail);
+		return unparsed(detail);
 	}
-	return fold(lowerTerm(firstSegment, context), operators, restSegments, context, detail);
+	return fold(lowerFoldSegment(firstSegment, context), normalised.operators, restSegments, context, detail);
 }
 function isOperatorAtom(node) {
 	return node.type === "atom" && (node.family === "bin" || node.family === "rel");
@@ -158,6 +161,33 @@ function operatorOfNode(node) {
 	if (node.type === "textord" && nodeText(node) === "/") return "math:divide";
 }
 const RELATION_OPERATORS = new Set(Object.values(RELATION_ATOM_OPERATORS));
+function normaliseUnaryMinus(operators, segments) {
+	const outOperators = [];
+	const outSegments = [];
+	let pendingNegate = false;
+	let skipOperator = false;
+	for (const [index, segment] of segments.entries()) {
+		if (index > 0 && !skipOperator) {
+			const operator = operators[index - 1];
+			if (operator !== void 0) outOperators.push(operator);
+		}
+		skipOperator = false;
+		if (segment.nodes.length === 0 && operators[index] === SUBTRACT_OPERATOR) {
+			pendingNegate = !pendingNegate;
+			skipOperator = true;
+			continue;
+		}
+		outSegments.push({
+			nodes: segment.nodes,
+			negated: pendingNegate
+		});
+		pendingNegate = false;
+	}
+	return {
+		operators: outOperators,
+		segments: outSegments
+	};
+}
 function fold(first, operators, segments, context, detail) {
 	let runFirst = first;
 	let runOperators = [];
@@ -166,22 +196,22 @@ function fold(first, operators, segments, context, detail) {
 	const relations = [];
 	for (let index = 0; index < operators.length; index += 1) {
 		const operator = operators[index];
-		const segmentNodes = segments[index];
-		if (operator === void 0 || segmentNodes === void 0) throw new Error("operator and segment lists diverged while folding a lowered sequence");
-		if (segmentNodes.length === 0) {
+		const segment = segments[index];
+		if (operator === void 0 || segment === void 0) throw new Error("operator and segment lists diverged while folding a lowered sequence");
+		if (segment.nodes.length === 0) {
 			diagnose(context, "latex/operator-placement-unparsed", detail);
 			return unparsed(detail);
 		}
 		if (RELATION_OPERATORS.has(operator)) {
 			operands.push(foldArithmetic(runFirst, runOperators, runSegments, context));
 			relations.push(operator);
-			runFirst = lowerTerm(segmentNodes, context);
+			runFirst = lowerFoldSegment(segment, context);
 			runOperators = [];
 			runSegments = [];
 			continue;
 		}
 		runOperators.push(operator);
-		runSegments.push(segmentNodes);
+		runSegments.push(segment);
 	}
 	operands.push(foldArithmetic(runFirst, runOperators, runSegments, context));
 	let folded = operands[0];
@@ -198,12 +228,16 @@ function foldArithmetic(first, operators, segments, context) {
 	let folded = first;
 	for (let index = 0; index < operators.length; index += 1) {
 		const operator = operators[index];
-		const segmentNodes = segments[index];
-		if (operator === void 0 || segmentNodes === void 0) throw new Error("operator and segment lists diverged while folding an arithmetic run");
-		folded = app(operator, [folded, lowerTerm(segmentNodes, context)]);
+		const segment = segments[index];
+		if (operator === void 0 || segment === void 0) throw new Error("operator and segment lists diverged while folding an arithmetic run");
+		folded = app(operator, [folded, lowerFoldSegment(segment, context)]);
 	}
 	return folded;
 }
+function lowerFoldSegment(segment, context) {
+	const folded = lowerTerm(segment.nodes, context);
+	return segment.negated ? app(UNARY_MINUS_OPERATOR, [folded]) : folded;
+}
 function lowerTerm(nodes, context) {
 	return lowerTermItems(termItems(nodes), context);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "7.17.3",
+  "version": "7.17.4",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -79,16 +79,16 @@
   "dependencies": {
     "archive-codec": "1.10.2",
     "byte-codec": "1.4.1",
-    "doc-codec": "2.7.2",
+    "doc-codec": "2.8.0",
     "document-schema.js": "7.6.0",
     "epub-codec": "1.3.4",
     "fflate": "0.8.3",
     "markdown-codec": "6.6.1",
     "odf.js": "7.23.1",
-    "ooxml.js": "8.9.1",
+    "ooxml.js": "8.10.0",
     "pdf-codec": "4.5.1",
     "ppt-codec": "1.4.5",
-    "rtf-codec": "4.1.5",
+    "rtf-codec": "4.2.0",
     "temml": "0.13.4",
     "wpd-codec": "3.4.0",
     "xls-codec": "4.12.1",