@signalflare-ai/ui 1.2.0 → 1.3.0

package/dist/{layout-DJHMMap2.js → layout-CWBE0qwx.js}

@@ -1,5 +1,5 @@
 "use client";
-//#region ../../node_modules/.bun/@chenglou+pretext@0.0.6/node_modules/@chenglou/pretext/dist/generated/bidi-data.js
+//#region ../../node_modules/.bun/@chenglou+pretext@0.0.7/node_modules/@chenglou/pretext/dist/generated/bidi-data.js
 var latin1BidiTypes = [
 	"BN",
 	"BN",
@@ -3831,7 +3831,7 @@ var nonLatin1BidiRanges = [
 	]
 ];
 //#endregion
-//#region ../../node_modules/.bun/@chenglou+pretext@0.0.6/node_modules/@chenglou/pretext/dist/bidi.js
+//#region ../../node_modules/.bun/@chenglou+pretext@0.0.7/node_modules/@chenglou/pretext/dist/bidi.js
 function classifyCodePoint(codePoint) {
 	if (codePoint <= 255) return latin1BidiTypes[codePoint];
 	let lo = 0;
@@ -3947,7 +3947,7 @@ function computeSegmentLevels(normalized, segStarts) {
 	return segLevels;
 }
 //#endregion
-//#region ../../node_modules/.bun/@chenglou+pretext@0.0.6/node_modules/@chenglou/pretext/dist/analysis.js
+//#region ../../node_modules/.bun/@chenglou+pretext@0.0.7/node_modules/@chenglou/pretext/dist/analysis.js
 var collapsibleWhitespaceRunRe = /[ \t\n\r\f]+/g;
 var needsWhitespaceNormalizationRe = /[\t\n\r\f]| {2,}|^ | $/;
 function getWhiteSpaceProfile(whiteSpace) {
@@ -4014,15 +4014,26 @@ var keepAllGlueChars = new Set([
 	"⁠",
 	""
 ]);
-function containsCJKText(text) {
-	return isCJK(text);
-}
+var keepAllDashBreakChars = new Set([
+	"-",
+	"‐",
+	"–",
+	"—"
+]);
 function endsWithKeepAllGlueText(text) {
 	const last = getLastCodePoint(text);
 	return last !== null && keepAllGlueChars.has(last);
 }
-function canContinueKeepAllTextRun(previousText) {
-	return !endsWithLineStartProhibitedText(previousText) && !endsWithKeepAllGlueText(previousText);
+function endsWithKeepAllDashBreakText(text) {
+	const last = getLastCodePoint(text);
+	return last !== null && keepAllDashBreakChars.has(last);
+}
+function canContinueKeepAllTextRun(previousText, breakAfterPunctuation) {
+	if (endsWithKeepAllGlueText(previousText)) return false;
+	if (!breakAfterPunctuation) return true;
+	if (endsWithLineStartProhibitedText(previousText)) return false;
+	if (endsWithKeepAllDashBreakText(previousText)) return false;
+	return true;
 }
 var kinsokuStart = new Set([
 	"，",
@@ -4057,10 +4068,15 @@ var kinsokuEnd = new Set([
 	"(",
 	"[",
 	"{",
+	"¡",
+	"¿",
 	"“",
 	"‘",
+	"‚",
+	"„",
 	"«",
 	"‹",
+	"⸘",
 	"（",
 	"〔",
 	"〈",
@@ -4125,7 +4141,7 @@ function isLeftStickyPunctuationSegment(segment) {
 	if (isEscapedQuoteClusterSegment(segment)) return true;
 	let sawPunctuation = false;
 	for (const ch of segment) {
-		if (leftStickyPunctuation.has(ch)) {
+		if (leftStickyPunctuation.has(ch) || isLineBreakNumericAffix(ch)) {
 			sawPunctuation = true;
 			continue;
 		}
@@ -4140,7 +4156,7 @@ function isCJKLineStartProhibitedSegment(segment) {
 }
 function isForwardStickyClusterSegment(segment) {
 	if (isEscapedQuoteClusterSegment(segment)) return true;
-	for (const ch of segment) if (!kinsokuEnd.has(ch) && !forwardStickyGlue.has(ch) && !combiningMarkRe.test(ch)) return false;
+	for (const ch of segment) if (!kinsokuEnd.has(ch) && !forwardStickyGlue.has(ch) && !combiningMarkRe.test(ch) && !isLineBreakNumericAffix(ch)) return false;
 	return segment.length > 0;
 }
 function isEscapedQuoteClusterSegment(segment) {
@@ -4170,6 +4186,103 @@ function getLastCodePoint(text) {
 	const start = previousCodePointStart(text, text.length);
 	return text.slice(start);
 }
+function getFirstSignificantCodePoint(text) {
+	for (const ch of text) if (!combiningMarkRe.test(ch)) return ch;
+	return null;
+}
+function getLastSignificantCodePoint(text) {
+	for (let end = text.length; end > 0;) {
+		const start = previousCodePointStart(text, end);
+		const ch = text.slice(start, end);
+		if (!combiningMarkRe.test(ch)) return ch;
+		end = start;
+	}
+	return null;
+}
+var lineBreakNumericAffixRanges = [
+	36,
+	37,
+	43,
+	43,
+	92,
+	92,
+	162,
+	165,
+	176,
+	177,
+	1423,
+	1423,
+	1545,
+	1547,
+	1642,
+	1642,
+	2046,
+	2047,
+	2546,
+	2547,
+	2553,
+	2555,
+	2801,
+	2801,
+	3065,
+	3065,
+	3449,
+	3449,
+	3647,
+	3647,
+	6107,
+	6107,
+	8240,
+	8247,
+	8279,
+	8279,
+	8352,
+	8399,
+	8451,
+	8451,
+	8457,
+	8457,
+	8470,
+	8470,
+	8722,
+	8723,
+	43064,
+	43064,
+	65020,
+	65020,
+	65129,
+	65130,
+	65284,
+	65285,
+	65504,
+	65505,
+	65509,
+	65510,
+	73693,
+	73696,
+	123647,
+	123647,
+	126124,
+	126124,
+	126128,
+	126128
+];
+function isCodePointInRanges(codePoint, ranges) {
+	for (let i = 0; i < ranges.length; i += 2) if (codePoint >= ranges[i] && codePoint <= ranges[i + 1]) return true;
+	return false;
+}
+function isLineBreakNumericAffix(ch) {
+	const codePoint = ch.codePointAt(0);
+	return codePoint !== void 0 && isCodePointInRanges(codePoint, lineBreakNumericAffixRanges);
+}
+function endsWithLineBreakNumericAffix(text) {
+	const last = getLastSignificantCodePoint(text);
+	return last !== null && isLineBreakNumericAffix(last);
+}
+function startsWithDecimalDigit(text) {
+	const first = getFirstSignificantCodePoint(text);
+	return first !== null && decimalDigitRe.test(first);
+}
 function splitTrailingForwardStickyCluster(text) {
 	const chars = Array.from(text);
 	let splitIndex = chars.length;
@@ -4398,8 +4511,27 @@ var numericJoinerChars = new Set([
 	"–",
 	"—"
 ]);
-var asciiPunctuationChainSegmentRe = /^[A-Za-z0-9_]+[,:;]*$/;
-var asciiPunctuationChainTrailingJoinersRe = /[,:;]+$/;
+var noSpacePunctuationChainJoiners = new Set([
+	".",
+	",",
+	":",
+	";"
+]);
+function endsWithNoSpacePunctuationChainJoiner(text) {
+	for (let end = text.length; end > 0;) {
+		const start = previousCodePointStart(text, end);
+		const ch = text.slice(start, end);
+		if (combiningMarkRe.test(ch)) {
+			end = start;
+			continue;
+		}
+		return noSpacePunctuationChainJoiners.has(ch) || isLineBreakNumericAffix(ch);
+	}
+	return false;
+}
+function isNoSpacePunctuationChainSegment(text, wordLike) {
+	return wordLike && !isCJK(text);
+}
 function segmentContainsDecimalDigit(text) {
 	for (const ch of text) if (decimalDigitRe.test(ch)) return true;
 	return false;
@@ -4447,7 +4579,7 @@ function mergeNumericRuns(segmentation) {
 		starts
 	};
 }
-function mergeAsciiPunctuationChains(segmentation) {
+function mergeNoSpacePunctuationChains(segmentation) {
 	const texts = [];
 	const isWordLike = [];
 	const kinds = [];
@@ -4456,14 +4588,14 @@ function mergeAsciiPunctuationChains(segmentation) {
 		const text = segmentation.texts[i];
 		const kind = segmentation.kinds[i];
 		const wordLike = segmentation.isWordLike[i];
-		if (kind === "text" && wordLike && asciiPunctuationChainSegmentRe.test(text)) {
+		if (kind === "text" && endsWithNoSpacePunctuationChainJoiner(text) && (wordLike || endsWithLineBreakNumericAffix(text)) && !isCJK(text)) {
 			const mergedParts = [text];
-			let endsWithJoiners = asciiPunctuationChainTrailingJoinersRe.test(text);
+			let endsWithJoiners = true;
 			let j = i + 1;
-			while (endsWithJoiners && j < segmentation.len && segmentation.kinds[j] === "text" && segmentation.isWordLike[j] && asciiPunctuationChainSegmentRe.test(segmentation.texts[j])) {
+			while (endsWithJoiners && j < segmentation.len && segmentation.kinds[j] === "text" && isNoSpacePunctuationChainSegment(segmentation.texts[j], segmentation.isWordLike[j])) {
 				const nextText = segmentation.texts[j];
 				mergedParts.push(nextText);
-				endsWithJoiners = asciiPunctuationChainTrailingJoinersRe.test(nextText);
+				endsWithJoiners = endsWithNoSpacePunctuationChainJoiner(nextText);
 				j++;
 			}
 			texts.push(joinTextParts(mergedParts));
@@ -4691,7 +4823,7 @@ function buildMergedSegmentation(normalized, profile, whiteSpaceProfile) {
 	for (let i = mergedLen - 1; i >= 0; i--) {
 		const text = mergedTexts[i];
 		if (text.length === 0) continue;
-		if (mergedKinds[i] === "text" && !mergedWordLike[i] && isForwardStickyClusterSegment(text) && nextLiveIndex >= 0 && mergedKinds[nextLiveIndex] === "text") {
+		if (mergedKinds[i] === "text" && !mergedWordLike[i] && nextLiveIndex >= 0 && mergedKinds[nextLiveIndex] === "text" && (isForwardStickyClusterSegment(text) || text === "-" && startsWithDecimalDigit(mergedTexts[nextLiveIndex]))) {
 			const prefixParts = forwardStickyPrefixParts[nextLiveIndex] ?? [];
 			prefixParts.push(text);
 			forwardStickyPrefixParts[nextLiveIndex] = prefixParts;
@@ -4722,7 +4854,7 @@ function buildMergedSegmentation(normalized, profile, whiteSpaceProfile) {
 	mergedWordLike.length = compactLen;
 	mergedKinds.length = compactLen;
 	mergedStarts.length = compactLen;
-	const withMergedUrls = carryTrailingForwardStickyAcrossCJKBoundary(mergeAsciiPunctuationChains(splitHyphenatedNumericRuns(mergeNumericRuns(mergeUrlQueryRuns(mergeUrlLikeRuns(mergeGlueConnectedTextRuns({
+	const withMergedUrls = carryTrailingForwardStickyAcrossCJKBoundary(mergeNoSpacePunctuationChains(splitHyphenatedNumericRuns(mergeNumericRuns(mergeUrlQueryRuns(mergeUrlLikeRuns(mergeGlueConnectedTextRuns({
 		len: compactLen,
 		texts: mergedTexts,
 		isWordLike: mergedWordLike,
@@ -4766,55 +4898,54 @@ function compileAnalysisChunks(segmentation, whiteSpaceProfile) {
 	});
 	return chunks;
 }
-function mergeKeepAllTextSegments(segmentation) {
+function mergeKeepAllTextSegments(normalized, segmentation, breakAfterPunctuation) {
 	if (segmentation.len <= 1) return segmentation;
 	const texts = [];
 	const isWordLike = [];
 	const kinds = [];
 	const starts = [];
-	let pendingTextParts = null;
-	let pendingWordLike = false;
-	let pendingStart = 0;
-	let pendingContainsCJK = false;
-	let pendingCanContinue = false;
-	function flushPendingText() {
-		if (pendingTextParts === null) return;
-		texts.push(joinTextParts(pendingTextParts));
-		isWordLike.push(pendingWordLike);
+	let groupStart = -1;
+	let groupContainsCJK = false;
+	function pushOriginalText(index) {
+		texts.push(segmentation.texts[index]);
+		isWordLike.push(segmentation.isWordLike[index]);
 		kinds.push("text");
-		starts.push(pendingStart);
-		pendingTextParts = null;
+		starts.push(segmentation.starts[index]);
+	}
+	function pushMergedText(start, end) {
+		let wordLike = false;
+		for (let i = start; i < end; i++) wordLike = wordLike || segmentation.isWordLike[i];
+		const sourceStart = segmentation.starts[start];
+		const sourceEnd = end < segmentation.len ? segmentation.starts[end] : normalized.length;
+		texts.push(normalized.slice(sourceStart, sourceEnd));
+		isWordLike.push(wordLike);
+		kinds.push("text");
+		starts.push(sourceStart);
+	}
+	function flushGroup(end) {
+		if (groupStart < 0) return;
+		if (groupContainsCJK) if (groupStart + 1 === end) pushOriginalText(groupStart);
+		else pushMergedText(groupStart, end);
+		else for (let i = groupStart; i < end; i++) pushOriginalText(i);
+		groupStart = -1;
+		groupContainsCJK = false;
 	}
 	for (let i = 0; i < segmentation.len; i++) {
 		const text = segmentation.texts[i];
 		const kind = segmentation.kinds[i];
-		const wordLike = segmentation.isWordLike[i];
-		const start = segmentation.starts[i];
 		if (kind === "text") {
-			const textContainsCJK = containsCJKText(text);
-			const textCanContinue = canContinueKeepAllTextRun(text);
-			if (pendingTextParts !== null && pendingContainsCJK && pendingCanContinue) {
-				pendingTextParts.push(text);
-				pendingWordLike = pendingWordLike || wordLike;
-				pendingContainsCJK = pendingContainsCJK || textContainsCJK;
-				pendingCanContinue = textCanContinue;
-				continue;
-			}
-			flushPendingText();
-			pendingTextParts = [text];
-			pendingWordLike = wordLike;
-			pendingStart = start;
-			pendingContainsCJK = textContainsCJK;
-			pendingCanContinue = textCanContinue;
+			if (groupStart >= 0 && !canContinueKeepAllTextRun(segmentation.texts[i - 1], breakAfterPunctuation)) flushGroup(i);
+			if (groupStart < 0) groupStart = i;
+			groupContainsCJK = groupContainsCJK || isCJK(text);
 			continue;
 		}
-		flushPendingText();
+		flushGroup(i);
 		texts.push(text);
-		isWordLike.push(wordLike);
+		isWordLike.push(segmentation.isWordLike[i]);
 		kinds.push(kind);
-		starts.push(start);
+		starts.push(segmentation.starts[i]);
 	}
-	flushPendingText();
+	flushGroup(segmentation.len);
 	return {
 		len: texts.length,
 		texts,
@@ -4835,7 +4966,8 @@ function analyzeText(text, profile, whiteSpace = "normal", wordBreak = "normal")
 		kinds: [],
 		starts: []
 	};
-	const segmentation = wordBreak === "keep-all" ? mergeKeepAllTextSegments(buildMergedSegmentation(normalized, profile, whiteSpaceProfile)) : buildMergedSegmentation(normalized, profile, whiteSpaceProfile);
+	const mergedSegmentation = buildMergedSegmentation(normalized, profile, whiteSpaceProfile);
+	const segmentation = wordBreak === "keep-all" ? mergeKeepAllTextSegments(normalized, mergedSegmentation, profile.breakKeepAllAfterPunctuation) : mergedSegmentation;
 	return {
 		normalized,
 		chunks: compileAnalysisChunks(segmentation, whiteSpaceProfile),
@@ -4843,7 +4975,7 @@ function analyzeText(text, profile, whiteSpace = "normal", wordBreak = "normal")
 	};
 }
 //#endregion
-//#region ../../node_modules/.bun/@chenglou+pretext@0.0.6/node_modules/@chenglou/pretext/dist/measurement.js
+//#region ../../node_modules/.bun/@chenglou+pretext@0.0.7/node_modules/@chenglou/pretext/dist/measurement.js
 var measureContext = null;
 var segmentMetricCaches = /* @__PURE__ */ new Map();
 var cachedEngineProfile = null;
@@ -4889,6 +5021,7 @@ function getEngineProfile() {
 		cachedEngineProfile = {
 			lineFitEpsilon: .005,
 			carryCJKAfterClosingQuote: false,
+			breakKeepAllAfterPunctuation: true,
 			preferPrefixWidthsForBreakableRuns: false,
 			preferEarlySoftHyphenBreak: false
 		};
@@ -4900,6 +5033,7 @@ function getEngineProfile() {
 	cachedEngineProfile = {
 		lineFitEpsilon: isSafari ? 1 / 64 : .005,
 		carryCJKAfterClosingQuote: isChromium,
+		breakKeepAllAfterPunctuation: !isSafari,
 		preferPrefixWidthsForBreakableRuns: isSafari,
 		preferEarlySoftHyphenBreak: isSafari
 	};
@@ -5017,7 +5151,7 @@ function getFontMeasurementState(font, needsEmojiCorrection) {
 	};
 }
 //#endregion
-//#region ../../node_modules/.bun/@chenglou+pretext@0.0.6/node_modules/@chenglou/pretext/dist/line-break.js
+//#region ../../node_modules/.bun/@chenglou+pretext@0.0.7/node_modules/@chenglou/pretext/dist/line-break.js
 function consumesAtLineStart(kind) {
 	return kind === "space" || kind === "zero-width-break" || kind === "soft-hyphen";
 }
@@ -5062,19 +5196,23 @@ function getBreakableGraphemeAdvance(prepared, hasContent, baseAdvance) {
 function getBreakableCandidateFitWidth(prepared, candidatePaintWidth) {
 	return prepared.letterSpacing === 0 ? candidatePaintWidth : candidatePaintWidth + prepared.letterSpacing;
 }
-function fitSoftHyphenBreak(graphemeFitAdvances, initialWidth, maxWidth, lineFitEpsilon, discretionaryHyphenWidth, letterSpacing) {
-	let fitCount = 0;
-	let fittedWidth = initialWidth;
-	while (fitCount < graphemeFitAdvances.length) {
-		const nextWidth = fittedWidth + graphemeFitAdvances[fitCount] + letterSpacing;
-		if ((fitCount + 1 < graphemeFitAdvances.length ? nextWidth + discretionaryHyphenWidth : nextWidth) > maxWidth + lineFitEpsilon) break;
-		fittedWidth = nextWidth;
-		fitCount++;
+function getTerminalLetterSpacing(prepared, startSegmentIndex, startGraphemeIndex, endSegmentIndex, endGraphemeIndex) {
+	if (prepared.letterSpacing === 0) return 0;
+	if (endGraphemeIndex > 0) return prepared.spacingGraphemeCounts[endSegmentIndex] > 0 ? prepared.letterSpacing : 0;
+	for (let i = endSegmentIndex - 1; i >= startSegmentIndex; i--) {
+		const kind = prepared.kinds[i];
+		if (kind === "space" || kind === "zero-width-break" || kind === "hard-break") continue;
+		if (kind === "soft-hyphen") {
+			if (i === endSegmentIndex - 1) return 0;
+			continue;
+		}
+		if (i === startSegmentIndex && startGraphemeIndex > 0) return prepared.letterSpacing;
+		return prepared.spacingGraphemeCounts[i] > 0 ? prepared.letterSpacing : 0;
 	}
-	return {
-		fitCount,
-		fittedWidth
-	};
+	return 0;
+}
+function finalizeLinePaintWidth(prepared, width, startSegmentIndex, startGraphemeIndex, endSegmentIndex, endGraphemeIndex) {
+	return width + getTerminalLetterSpacing(prepared, startSegmentIndex, startGraphemeIndex, endSegmentIndex, endGraphemeIndex);
 }
 function findChunkIndexForStart(prepared, segmentIndex) {
 	let lo = 0;
@@ -5107,7 +5245,7 @@ function normalizeLineStartInChunk(prepared, chunkIndex, cursor) {
 	cursor.graphemeIndex = 0;
 	return chunkIndex + 1;
 }
-function normalizeLineStartChunkIndex(prepared, cursor) {
+function normalizePreparedLineStart(prepared, cursor) {
 	if (cursor.segmentIndex >= prepared.widths.length) return -1;
 	const chunkIndex = findChunkIndexForStart(prepared, cursor.segmentIndex);
 	if (chunkIndex < 0) return -1;
@@ -5249,8 +5387,7 @@ function walkPreparedLinesRaw(prepared, maxWidth, onLine) {
 	const { widths, kinds, breakableFitAdvances, discretionaryHyphenWidth, chunks } = prepared;
 	if (widths.length === 0 || chunks.length === 0) return 0;
 	const engineProfile = getEngineProfile();
-	const lineFitEpsilon = engineProfile.lineFitEpsilon;
-	const fitLimit = maxWidth + lineFitEpsilon;
+	const fitLimit = maxWidth + engineProfile.lineFitEpsilon;
 	let lineCount = 0;
 	let lineW = 0;
 	let hasContent = false;
@@ -5268,9 +5405,12 @@ function walkPreparedLinesRaw(prepared, maxWidth, onLine) {
 		pendingBreakPaintWidth = 0;
 		pendingBreakKind = null;
 	}
-	function emitCurrentLine(endSegmentIndex = lineEndSegmentIndex, endGraphemeIndex = lineEndGraphemeIndex, width = lineW) {
+	function getCurrentLinePaintWidth() {
+		return pendingBreakKind === "soft-hyphen" && pendingBreakSegmentIndex === lineEndSegmentIndex && lineEndGraphemeIndex === 0 ? pendingBreakPaintWidth : lineW;
+	}
+	function emitCurrentLine(endSegmentIndex = lineEndSegmentIndex, endGraphemeIndex = lineEndGraphemeIndex, width) {
 		lineCount++;
-		onLine?.(width, lineStartSegmentIndex, lineStartGraphemeIndex, endSegmentIndex, endGraphemeIndex);
+		if (onLine !== void 0) onLine(finalizeLinePaintWidth(prepared, width ?? getCurrentLinePaintWidth(), lineStartSegmentIndex, lineStartGraphemeIndex, endSegmentIndex, endGraphemeIndex), lineStartSegmentIndex, lineStartGraphemeIndex, endSegmentIndex, endGraphemeIndex);
 		lineW = 0;
 		hasContent = false;
 		clearPendingBreak();
@@ -5332,25 +5472,6 @@ function walkPreparedLinesRaw(prepared, maxWidth, onLine) {
 			lineEndGraphemeIndex = 0;
 		}
 	}
-	function continueSoftHyphenBreakableSegment(segmentIndex) {
-		if (pendingBreakKind !== "soft-hyphen") return false;
-		const fitWidths = breakableFitAdvances[segmentIndex];
-		if (fitWidths == null) return false;
-		const { fitCount, fittedWidth } = fitSoftHyphenBreak(fitWidths, lineW, maxWidth, lineFitEpsilon, discretionaryHyphenWidth, prepared.letterSpacing);
-		if (fitCount === 0) return false;
-		lineW = fittedWidth;
-		lineEndSegmentIndex = segmentIndex;
-		lineEndGraphemeIndex = fitCount;
-		clearPendingBreak();
-		if (fitCount === fitWidths.length) {
-			lineEndSegmentIndex = segmentIndex + 1;
-			lineEndGraphemeIndex = 0;
-			return true;
-		}
-		emitCurrentLine(segmentIndex, fitCount, fittedWidth + discretionaryHyphenWidth);
-		appendBreakableSegmentFrom(segmentIndex, fitCount);
-		return true;
-	}
 	function emitEmptyChunk(chunk) {
 		lineCount++;
 		onLine?.(0, chunk.startSegmentIndex, 0, chunk.consumedEndSegmentIndex, 0);
@@ -5407,10 +5528,6 @@ function walkPreparedLinesRaw(prepared, maxWidth, onLine) {
 					emitCurrentLine(pendingBreakSegmentIndex, 0, pendingBreakPaintWidth);
 					continue;
 				}
-				if (pendingBreakKind === "soft-hyphen" && continueSoftHyphenBreakableSegment(i)) {
-					i++;
-					continue;
-				}
 				if (breakAfter && currentBreakFitWidth <= fitLimit) {
 					appendWholeSegment(i, advance);
 					emitCurrentLine(i + 1, 0, currentBreakPaintWidth);
@@ -5456,8 +5573,9 @@ function stepPreparedChunkLineGeometry(prepared, cursor, chunkIndex, maxWidth) {
 	}
 	const { widths, kinds, breakableFitAdvances, discretionaryHyphenWidth } = prepared;
 	const engineProfile = getEngineProfile();
-	const lineFitEpsilon = engineProfile.lineFitEpsilon;
-	const fitLimit = maxWidth + lineFitEpsilon;
+	const fitLimit = maxWidth + engineProfile.lineFitEpsilon;
+	const lineStartSegmentIndex = cursor.segmentIndex;
+	const lineStartGraphemeIndex = cursor.graphemeIndex;
 	let lineW = 0;
 	let hasContent = false;
 	let lineEndSegmentIndex = cursor.segmentIndex;
@@ -5466,17 +5584,14 @@ function stepPreparedChunkLineGeometry(prepared, cursor, chunkIndex, maxWidth) {
 	let pendingBreakFitWidth = 0;
 	let pendingBreakPaintWidth = 0;
 	let pendingBreakKind = null;
-	function clearPendingBreak() {
-		pendingBreakSegmentIndex = -1;
-		pendingBreakFitWidth = 0;
-		pendingBreakPaintWidth = 0;
-		pendingBreakKind = null;
+	function getCurrentLinePaintWidth() {
+		return pendingBreakKind === "soft-hyphen" && pendingBreakSegmentIndex === lineEndSegmentIndex && lineEndGraphemeIndex === 0 ? pendingBreakPaintWidth : lineW;
 	}
-	function finishLine(endSegmentIndex = lineEndSegmentIndex, endGraphemeIndex = lineEndGraphemeIndex, width = lineW) {
+	function finishLine(endSegmentIndex = lineEndSegmentIndex, endGraphemeIndex = lineEndGraphemeIndex, width = getCurrentLinePaintWidth()) {
 		if (!hasContent) return null;
 		cursor.segmentIndex = endSegmentIndex;
 		cursor.graphemeIndex = endGraphemeIndex;
-		return width;
+		return finalizeLinePaintWidth(prepared, width, lineStartSegmentIndex, lineStartGraphemeIndex, endSegmentIndex, endGraphemeIndex);
 	}
 	function startLineAtSegment(segmentIndex, width) {
 		hasContent = true;
@@ -5528,20 +5643,8 @@ function stepPreparedChunkLineGeometry(prepared, cursor, chunkIndex, maxWidth) {
 		}
 		return null;
 	}
-	function maybeFinishAtSoftHyphen(segmentIndex) {
+	function maybeFinishAtSoftHyphen() {
 		if (pendingBreakKind !== "soft-hyphen" || pendingBreakSegmentIndex < 0) return null;
-		const fitWidths = breakableFitAdvances[segmentIndex] ?? null;
-		if (fitWidths !== null) {
-			const { fitCount, fittedWidth } = fitSoftHyphenBreak(fitWidths, lineW, maxWidth, lineFitEpsilon, discretionaryHyphenWidth, prepared.letterSpacing);
-			if (fitCount === fitWidths.length) {
-				lineW = fittedWidth;
-				lineEndSegmentIndex = segmentIndex + 1;
-				lineEndGraphemeIndex = 0;
-				clearPendingBreak();
-				return null;
-			}
-			if (fitCount > 0) return finishLine(segmentIndex, fitCount, fittedWidth + discretionaryHyphenWidth);
-		}
 		if (pendingBreakFitWidth <= fitLimit) return finishLine(pendingBreakSegmentIndex, 0, pendingBreakPaintWidth);
 		return null;
 	}
@@ -5579,7 +5682,7 @@ function stepPreparedChunkLineGeometry(prepared, cursor, chunkIndex, maxWidth) {
 			const currentBreakFitWidth = lineW + getBreakOpportunityFitContribution(prepared, kind, i, leadingSpacing);
 			const currentBreakPaintWidth = lineW + getLineEndPaintContribution(prepared, kind, i, leadingSpacing, w);
 			if (pendingBreakKind === "soft-hyphen" && engineProfile.preferEarlySoftHyphenBreak && pendingBreakFitWidth <= fitLimit) return finishLine(pendingBreakSegmentIndex, 0, pendingBreakPaintWidth);
-			const softBreakLine = maybeFinishAtSoftHyphen(i);
+			const softBreakLine = maybeFinishAtSoftHyphen();
 			if (softBreakLine !== null) return softBreakLine;
 			if (breakAfter && currentBreakFitWidth <= fitLimit) {
 				appendWholeSegment(i, advance);
@@ -5686,12 +5789,15 @@ function stepPreparedSimpleLineGeometry(prepared, cursor, maxWidth) {
 	cursor.graphemeIndex = lineEndGraphemeIndex;
 	return lineW;
 }
-function stepPreparedLineGeometry(prepared, cursor, maxWidth) {
-	const chunkIndex = normalizeLineStartChunkIndex(prepared, cursor);
-	if (chunkIndex < 0) return null;
+function stepPreparedLineGeometryFromChunk(prepared, cursor, chunkIndex, maxWidth) {
 	if (prepared.simpleLineWalkFastPath) return stepPreparedSimpleLineGeometry(prepared, cursor, maxWidth);
 	return stepPreparedChunkLineGeometry(prepared, cursor, chunkIndex, maxWidth);
 }
+function stepPreparedLineGeometry(prepared, cursor, maxWidth) {
+	const chunkIndex = normalizePreparedLineStart(prepared, cursor);
+	if (chunkIndex < 0) return null;
+	return stepPreparedLineGeometryFromChunk(prepared, cursor, chunkIndex, maxWidth);
+}
 function measurePreparedLineGeometry(prepared, maxWidth) {
 	if (prepared.widths.length === 0) return {
 		lineCount: 0,
@@ -5704,7 +5810,7 @@ function measurePreparedLineGeometry(prepared, maxWidth) {
 	let lineCount = 0;
 	let maxLineWidth = 0;
 	if (!prepared.simpleLineWalkFastPath) {
-		let chunkIndex = normalizeLineStartChunkIndex(prepared, cursor);
+		let chunkIndex = normalizePreparedLineStart(prepared, cursor);
 		while (chunkIndex >= 0) {
 			const lineWidth = stepPreparedChunkLineGeometry(prepared, cursor, chunkIndex, maxWidth);
 			if (lineWidth === null) return {
@@ -5731,7 +5837,7 @@ function measurePreparedLineGeometry(prepared, maxWidth) {
 	}
 }
 //#endregion
-//#region ../../node_modules/.bun/@chenglou+pretext@0.0.6/node_modules/@chenglou/pretext/dist/line-text.js
+//#region ../../node_modules/.bun/@chenglou+pretext@0.0.7/node_modules/@chenglou/pretext/dist/line-text.js
 var sharedGraphemeSegmenter$1 = null;
 var sharedLineTextCaches = /* @__PURE__ */ new WeakMap();
 function getSharedGraphemeSegmenter$1() {
@@ -5747,8 +5853,8 @@ function getSegmentGraphemes(segmentIndex, segments, cache) {
 	cache.set(segmentIndex, graphemes);
 	return graphemes;
 }
-function lineHasDiscretionaryHyphen(kinds, startSegmentIndex, startGraphemeIndex, endSegmentIndex) {
-	return endSegmentIndex > 0 && kinds[endSegmentIndex - 1] === "soft-hyphen" && !(startSegmentIndex === endSegmentIndex && startGraphemeIndex > 0);
+function lineHasDiscretionaryHyphen(kinds, startSegmentIndex, endSegmentIndex) {
+	return endSegmentIndex > startSegmentIndex && kinds[endSegmentIndex - 1] === "soft-hyphen";
 }
 function appendSegmentGraphemeRange(text, graphemes, startGraphemeIndex, endGraphemeIndex) {
 	for (let i = startGraphemeIndex; i < endGraphemeIndex; i++) text += graphemes[i];
@@ -5763,7 +5869,7 @@ function getLineTextCache(prepared) {
 }
 function buildLineTextFromRange(prepared, cache, startSegmentIndex, startGraphemeIndex, endSegmentIndex, endGraphemeIndex) {
 	let text = "";
-	const endsWithDiscretionaryHyphen = lineHasDiscretionaryHyphen(prepared.kinds, startSegmentIndex, startGraphemeIndex, endSegmentIndex);
+	const endsWithDiscretionaryHyphen = lineHasDiscretionaryHyphen(prepared.kinds, startSegmentIndex, endSegmentIndex);
 	for (let i = startSegmentIndex; i < endSegmentIndex; i++) {
 		if (prepared.kinds[i] === "soft-hyphen" || prepared.kinds[i] === "hard-break") continue;
 		if (i === startSegmentIndex && startGraphemeIndex > 0) {
@@ -5779,7 +5885,7 @@ function buildLineTextFromRange(prepared, cache, startSegmentIndex, startGraphem
 	return text;
 }
 //#endregion
-//#region ../../node_modules/.bun/@chenglou+pretext@0.0.6/node_modules/@chenglou/pretext/dist/layout.js
+//#region ../../node_modules/.bun/@chenglou+pretext@0.0.7/node_modules/@chenglou/pretext/dist/layout.js
 var sharedGraphemeSegmenter = null;
 function getSharedGraphemeSegmenter() {
 	if (sharedGraphemeSegmenter === null) sharedGraphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
@@ -5870,36 +5976,34 @@ function buildBaseCjkUnits(segText, engineProfile) {
 	pushUnit();
 	return units;
 }
-function mergeKeepAllTextUnits(units) {
+function mergeKeepAllTextUnits(segText, units, breakAfterPunctuation) {
 	if (units.length <= 1) return units;
 	const merged = [];
-	let currentTextParts = [units[0].text];
-	let currentStart = units[0].start;
-	let currentContainsCJK = isCJK(units[0].text);
-	let currentCanContinue = canContinueKeepAllTextRun(units[0].text);
-	function flushCurrent() {
+	let groupStart = -1;
+	let groupContainsCJK = false;
+	function pushMergedUnit(start, end) {
+		const sourceStart = units[start].start;
+		const sourceEnd = end < units.length ? units[end].start : segText.length;
 		merged.push({
-			text: currentTextParts.length === 1 ? currentTextParts[0] : currentTextParts.join(""),
-			start: currentStart
+			text: segText.slice(sourceStart, sourceEnd),
+			start: sourceStart
 		});
 	}
-	for (let i = 1; i < units.length; i++) {
-		const next = units[i];
-		const nextContainsCJK = isCJK(next.text);
-		const nextCanContinue = canContinueKeepAllTextRun(next.text);
-		if (currentContainsCJK && currentCanContinue) {
-			currentTextParts.push(next.text);
-			currentContainsCJK = currentContainsCJK || nextContainsCJK;
-			currentCanContinue = nextCanContinue;
-			continue;
-		}
-		flushCurrent();
-		currentTextParts = [next.text];
-		currentStart = next.start;
-		currentContainsCJK = nextContainsCJK;
-		currentCanContinue = nextCanContinue;
+	function flushGroup(end) {
+		if (groupStart < 0) return;
+		if (groupContainsCJK) if (groupStart + 1 === end) merged.push(units[groupStart]);
+		else pushMergedUnit(groupStart, end);
+		else for (let i = groupStart; i < end; i++) merged.push(units[i]);
+		groupStart = -1;
+		groupContainsCJK = false;
+	}
+	for (let i = 0; i < units.length; i++) {
+		const unit = units[i];
+		if (groupStart >= 0 && !canContinueKeepAllTextRun(units[i - 1].text, breakAfterPunctuation)) flushGroup(i);
+		if (groupStart < 0) groupStart = i;
+		groupContainsCJK = groupContainsCJK || isCJK(unit.text);
 	}
-	flushCurrent();
+	flushGroup(units.length);
 	return merged;
 }
 function countRenderedSpacingGraphemes(text, kind) {
@@ -5916,7 +6020,7 @@ function addInternalLetterSpacing(width, graphemeCount, letterSpacing) {
 function measureAnalysis(analysis, font, includeSegments, wordBreak, letterSpacing) {
 	const engineProfile = getEngineProfile();
 	const { cache, emojiCorrection } = getFontMeasurementState(font, textMayContainEmoji(analysis.normalized));
-	const discretionaryHyphenWidth = getCorrectedSegmentWidth("-", getSegmentMetrics("-", cache), emojiCorrection) + (letterSpacing === 0 ? 0 : letterSpacing);
+	const discretionaryHyphenWidth = getCorrectedSegmentWidth("-", getSegmentMetrics("-", cache), emojiCorrection) + (letterSpacing === 0 ? 0 : letterSpacing * 2);
 	const tabStopAdvance = getCorrectedSegmentWidth(" ", getSegmentMetrics(" ", cache), emojiCorrection) * 8;
 	const hasLetterSpacing = letterSpacing !== 0;
 	if (analysis.len === 0) return createEmptyPrepared(includeSegments);
@@ -5979,7 +6083,7 @@ function measureAnalysis(analysis, font, includeSegments, wordBreak, letterSpaci
 		const segMetrics = getSegmentMetrics(segText, cache);
 		if (segKind === "text" && segMetrics.containsCJK) {
 			const baseUnits = buildBaseCjkUnits(segText, engineProfile);
-			const measuredUnits = wordBreak === "keep-all" ? mergeKeepAllTextUnits(baseUnits) : baseUnits;
+			const measuredUnits = wordBreak === "keep-all" ? mergeKeepAllTextUnits(segText, baseUnits, engineProfile.breakKeepAllAfterPunctuation) : baseUnits;
 			for (let i = 0; i < measuredUnits.length; i++) {
 				const unit = measuredUnits[i];
 				pushMeasuredTextSegment(unit.text, "text", segStart + unit.start, segWordLike, wordBreak === "keep-all" || !isCJK(unit.text));
@@ -6100,4 +6204,4 @@ function layoutWithLines(prepared, maxWidth, lineHeight) {
 //#endregion
 export { prepare as a, measureNaturalWidth as i, layoutWithLines as n, prepareWithSegments as o, measureLineStats as r, layout as t };
 
-//# sourceMappingURL=layout-DJHMMap2.js.map
+//# sourceMappingURL=layout-CWBE0qwx.js.map