@sushichan044/kg-core 0.11.3 → 0.12.1

package/dist/{composed-manuscript-C0f3mxKs.d.mts → composed-manuscript-QgIdae8p.d.mts}

@@ -914,7 +914,7 @@ declare const ParsedManuscriptSchema: v.SchemaWithPipe<readonly [v.StrictObjectS
     }>;
     mark: string;
   }>]>], undefined>, undefined>, v.ReadonlyAction<(Readonly<{
-    kind: "italic";
+    kind: "ruby";
     readonly range: Readonly<{
       source: Readonly<{
         start: number;
@@ -929,8 +929,18 @@ declare const ParsedManuscriptSchema: v.SchemaWithPipe<readonly [v.StrictObjectS
         end: number;
       }> & v.Brand<"GraphemeRange">;
     }>;
+    reading: Readonly<{
+      kind: "group";
+      text: string;
+    }> | Readonly<{
+      kind: "mono";
+      readonly segments: readonly string[];
+    }> | Readonly<{
+      kind: "jukugo";
+      readonly segments: readonly string[];
+    }>;
   }> | Readonly<{
-    kind: "ruby";
+    kind: "bold";
     readonly range: Readonly<{
       source: Readonly<{
         start: number;
@@ -945,18 +955,8 @@ declare const ParsedManuscriptSchema: v.SchemaWithPipe<readonly [v.StrictObjectS
         end: number;
       }> & v.Brand<"GraphemeRange">;
     }>;
-    reading: Readonly<{
-      kind: "group";
-      text: string;
-    }> | Readonly<{
-      kind: "mono";
-      readonly segments: readonly string[];
-    }> | Readonly<{
-      kind: "jukugo";
-      readonly segments: readonly string[];
-    }>;
   }> | Readonly<{
-    kind: "bold";
+    kind: "italic";
     readonly range: Readonly<{
       source: Readonly<{
         start: number;
@@ -1010,7 +1010,7 @@ declare const ParsedManuscriptSchema: v.SchemaWithPipe<readonly [v.StrictObjectS
     }>;
   }>[];
   readonly annotations: readonly (Readonly<{
-    kind: "italic";
+    kind: "ruby";
     readonly range: Readonly<{
       source: Readonly<{
         start: number;
@@ -1025,8 +1025,18 @@ declare const ParsedManuscriptSchema: v.SchemaWithPipe<readonly [v.StrictObjectS
         end: number;
       }> & v.Brand<"GraphemeRange">;
     }>;
+    reading: Readonly<{
+      kind: "group";
+      text: string;
+    }> | Readonly<{
+      kind: "mono";
+      readonly segments: readonly string[];
+    }> | Readonly<{
+      kind: "jukugo";
+      readonly segments: readonly string[];
+    }>;
   }> | Readonly<{
-    kind: "ruby";
+    kind: "bold";
     readonly range: Readonly<{
       source: Readonly<{
         start: number;
@@ -1041,18 +1051,8 @@ declare const ParsedManuscriptSchema: v.SchemaWithPipe<readonly [v.StrictObjectS
         end: number;
       }> & v.Brand<"GraphemeRange">;
     }>;
-    reading: Readonly<{
-      kind: "group";
-      text: string;
-    }> | Readonly<{
-      kind: "mono";
-      readonly segments: readonly string[];
-    }> | Readonly<{
-      kind: "jukugo";
-      readonly segments: readonly string[];
-    }>;
   }> | Readonly<{
-    kind: "bold";
+    kind: "italic";
     readonly range: Readonly<{
       source: Readonly<{
         start: number;
@@ -1503,7 +1503,7 @@ declare const ParsedManuscript: {
       }>;
       mark: string;
     }>]>], undefined>, undefined>, v.ReadonlyAction<(Readonly<{
-      kind: "italic";
+      kind: "ruby";
       readonly range: Readonly<{
         source: Readonly<{
           start: number;
@@ -1518,8 +1518,18 @@ declare const ParsedManuscript: {
           end: number;
         }> & v.Brand<"GraphemeRange">;
       }>;
+      reading: Readonly<{
+        kind: "group";
+        text: string;
+      }> | Readonly<{
+        kind: "mono";
+        readonly segments: readonly string[];
+      }> | Readonly<{
+        kind: "jukugo";
+        readonly segments: readonly string[];
+      }>;
     }> | Readonly<{
-      kind: "ruby";
+      kind: "bold";
       readonly range: Readonly<{
         source: Readonly<{
           start: number;
@@ -1534,18 +1544,8 @@ declare const ParsedManuscript: {
           end: number;
         }> & v.Brand<"GraphemeRange">;
       }>;
-      reading: Readonly<{
-        kind: "group";
-        text: string;
-      }> | Readonly<{
-        kind: "mono";
-        readonly segments: readonly string[];
-      }> | Readonly<{
-        kind: "jukugo";
-        readonly segments: readonly string[];
-      }>;
     }> | Readonly<{
-      kind: "bold";
+      kind: "italic";
       readonly range: Readonly<{
         source: Readonly<{
           start: number;
@@ -1599,7 +1599,7 @@ declare const ParsedManuscript: {
       }>;
     }>[];
     readonly annotations: readonly (Readonly<{
-      kind: "italic";
+      kind: "ruby";
       readonly range: Readonly<{
         source: Readonly<{
           start: number;
@@ -1614,8 +1614,18 @@ declare const ParsedManuscript: {
           end: number;
         }> & v.Brand<"GraphemeRange">;
       }>;
+      reading: Readonly<{
+        kind: "group";
+        text: string;
+      }> | Readonly<{
+        kind: "mono";
+        readonly segments: readonly string[];
+      }> | Readonly<{
+        kind: "jukugo";
+        readonly segments: readonly string[];
+      }>;
     }> | Readonly<{
-      kind: "ruby";
+      kind: "bold";
       readonly range: Readonly<{
         source: Readonly<{
           start: number;
@@ -1630,18 +1640,8 @@ declare const ParsedManuscript: {
           end: number;
         }> & v.Brand<"GraphemeRange">;
       }>;
-      reading: Readonly<{
-        kind: "group";
-        text: string;
-      }> | Readonly<{
-        kind: "mono";
-        readonly segments: readonly string[];
-      }> | Readonly<{
-        kind: "jukugo";
-        readonly segments: readonly string[];
-      }>;
     }> | Readonly<{
-      kind: "bold";
+      kind: "italic";
       readonly range: Readonly<{
         source: Readonly<{
           start: number;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { a as ManuscriptResult, c as DiagnosticSeverity, d as ManuscriptRangeInput, i as ParsedManuscript, l as DiagnosticOrigin, n as ValidationIssue, o as ManuscriptDiagnostic, r as NamespacedId, s as ManuscriptDiagnosticInput, t as ComposedManuscript, u as ManuscriptRange } from "./composed-manuscript-C0f3mxKs.mjs";
-import { d as PaperSizeId, f as ManuscriptComposer, i as novelComposer, l as NovelLayout, n as NovelComposedManuscript, p as ManuscriptParser, t as PresentationKind, u as NovelCompositionSettings } from "./presentation-kind-BmW1Edu7.mjs";
+import { a as ManuscriptResult, c as DiagnosticSeverity, d as ManuscriptRangeInput, i as ParsedManuscript, l as DiagnosticOrigin, n as ValidationIssue, o as ManuscriptDiagnostic, r as NamespacedId, s as ManuscriptDiagnosticInput, t as ComposedManuscript, u as ManuscriptRange } from "./composed-manuscript-QgIdae8p.mjs";
+import { d as PaperSizeId, f as ManuscriptComposer, i as novelComposer, l as NovelLayout, n as NovelComposedManuscript, p as ManuscriptParser, t as PresentationKind, u as NovelCompositionSettings } from "./presentation-kind-PauRP22i.mjs";
 import * as v from "valibot";
 //#region src/parser/parse-error.d.ts
 /**

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { _ as ManuscriptRange, d as graphemeSegmenter, f as ValidationIssue, g as NamespacedId, m as ManuscriptDiagnostic, p as ManuscriptResult, u as assertNever, x as readonlyObject } from "./question-or-exclamation-spacing-D7TSDUG8.mjs";
-import { _ as ParsedManuscript, c as NovelFlowSettings, d as ManuscriptPageSettings, f as PaperSize, g as FontPresetId, h as FontSizeQ, l as ManuscriptOffsets, m as PaperSizeId, n as novelComposer, p as ManuscriptAppearanceSettings, s as NovelCompositionSettings, u as ManuscriptGeometry } from "./novel-composer-DNsKrJIP.mjs";
+import { _ as ParsedManuscript, c as NovelFlowSettings, d as ManuscriptPageSettings, f as PaperSize, g as FontPresetId, h as FontSizeQ, l as ManuscriptOffsets, m as PaperSizeId, n as novelComposer, p as ManuscriptAppearanceSettings, s as NovelCompositionSettings, u as ManuscriptGeometry } from "./novel-composer-Dz7b30nf.mjs";
 import { t as describeCause } from "./describe-cause-SABI_1ex.mjs";
 import * as v from "valibot";
 const Rejection = { schema: readonlyObject({ reason: v.string() }) };

package/dist/lint.d.mts

@@ -1,4 +1,4 @@
-import { a as ManuscriptResult, i as ParsedManuscript, n as ValidationIssue, o as ManuscriptDiagnostic, r as NamespacedId, t as ComposedManuscript } from "./composed-manuscript-C0f3mxKs.mjs";
+import { a as ManuscriptResult, i as ParsedManuscript, n as ValidationIssue, o as ManuscriptDiagnostic, r as NamespacedId, t as ComposedManuscript } from "./composed-manuscript-QgIdae8p.mjs";
 import * as v from "valibot";
 //#region src/proofreading/invalid-rule-options.d.ts
 /**

package/dist/{novel-composer-DNsKrJIP.mjs → novel-composer-Dz7b30nf.mjs}

@@ -854,7 +854,8 @@ const CandidateLine = { resolve: (context, lineLengthEm) => {
 		break: { kind: "paragraph-end" },
 		hangingIndex: null,
 		deformationRatio: 0,
-		deformationCost: 0
+		deformationCost: 0,
+		finalExpansionBadness: 0
 	};
 	if (Math.abs(overflow) <= EPSILON$5) return {
 		start,
@@ -866,7 +867,8 @@ const CandidateLine = { resolve: (context, lineLengthEm) => {
 		break: { kind: "natural" },
 		hangingIndex: null,
 		deformationRatio: 0,
-		deformationCost: 0
+		deformationCost: 0,
+		finalExpansionBadness: 0
 	};
 	const shrunk = overflow > 0 && overflow <= capacity + EPSILON$5 ? resolveSpacings(pairValues, units, "shrink", overflow, finalExpansion) : null;
 	if (shrunk !== null && shrunk.unabsorbedEm <= EPSILON$5) {
@@ -882,7 +884,8 @@ const CandidateLine = { resolve: (context, lineLengthEm) => {
 			break: { kind: "shrunk" },
 			hangingIndex: null,
 			deformationRatio: chargeableCapacity <= EPSILON$5 ? 0 : chargeableShrink / chargeableCapacity,
-			deformationCost: shrunk.deformationCost
+			deformationCost: shrunk.deformationCost,
+			finalExpansionBadness: 0
 		};
 	}
 	if (!terminal && overflow > 0 && lastVisible !== void 0 && canHang && naturalSizeEm - lastAdvance - trailingSpacing <= lineLengthEm + EPSILON$5) return {
@@ -895,7 +898,8 @@ const CandidateLine = { resolve: (context, lineLengthEm) => {
 		break: { kind: "hanging" },
 		hangingIndex: lastVisible,
 		deformationRatio: overflow / Math.max(lastAdvance, EPSILON$5),
-		deformationCost: 0
+		deformationCost: 0,
+		finalExpansionBadness: 0
 	};
 	const stretched = !terminal && underflow > EPSILON$5 && (underflow <= capacity + EPSILON$5 || hasFinalStretch) ? resolveSpacings(pairValues, units, "stretch", underflow, finalExpansion) : null;
 	if (stretched !== null && stretched.unabsorbedEm <= EPSILON$5) return {
@@ -908,7 +912,8 @@ const CandidateLine = { resolve: (context, lineLengthEm) => {
 		break: { kind: "stretched" },
 		hangingIndex: null,
 		deformationRatio: stretched.finalStretchPerSlotEm > 0 ? 1 + stretched.finalStretchPerSlotEm : capacity === 0 ? 0 : underflow / capacity,
-		deformationCost: stretched.deformationCost
+		deformationCost: stretched.deformationCost,
+		finalExpansionBadness: finalExpansion.slots.length * stretched.finalStretchPerSlotEm ** 3
 	};
 	return {
 		start,
@@ -920,7 +925,8 @@ const CandidateLine = { resolve: (context, lineLengthEm) => {
 		break: { kind: "forced" },
 		hangingIndex: null,
 		deformationRatio: Math.abs(naturalSizeEm - lineLengthEm) / Math.max(lineLengthEm, EPSILON$5),
-		deformationCost: 0
+		deformationCost: 0,
+		finalExpansionBadness: 0
 	};
 } };
 //#endregion
@@ -2180,6 +2186,7 @@ function scoreFor(line, previousFitness) {
 	return {
 		score: [
 			modeCounts.forced,
+			line.finalExpansionBadness,
 			modeCounts.stretched,
 			modeCounts.hanging,
 			modeCounts.shrunk,
@@ -2198,7 +2205,8 @@ function addScore(left, right) {
 		left[3] + right[3],
 		left[4] + right[4],
 		left[5] + right[5],
-		left[6] + right[6]
+		left[6] + right[6],
+		left[7] + right[7]
 	];
 }
 const defaultParagraphEvaluation = { scoreFor };
@@ -2249,7 +2257,9 @@ function compareBreaks(left, right) {
 function isBetter(candidateState, current, states) {
 	if (current === void 0) return true;
 	for (let index = 0; index < candidateState.score.length; index += 1) {
-		const difference = (candidateState.score[index] ?? 0) - (current.score[index] ?? 0);
+		const candidate = candidateState.score[index] ?? 0;
+		const existing = current.score[index] ?? 0;
+		const difference = index === 1 ? Math.cbrt(candidate) - Math.cbrt(existing) : candidate - existing;
 		if (Math.abs(difference) > EPSILON$2) return difference < 0;
 	}
 	return compareBreaks(breaksOf(candidateState, states), breaksOf(current, states)) < 0;
@@ -2265,6 +2275,7 @@ function layoutParagraph(atoms, lineLengthEm, resolveCandidate, boundaryAllowed,
 			0,
 			0,
 			0,
+			0,
 			0
 		],
 		fitness: 0,

package/dist/plugin.d.mts

@@ -1,5 +1,5 @@
-import { a as ManuscriptResult, i as ParsedManuscript, n as ValidationIssue, r as NamespacedId } from "./composed-manuscript-C0f3mxKs.mjs";
-import { a as RunMeasurer, c as MeasurementRequest, f as ManuscriptComposer, m as Rejection, o as logicalRunMeasurer, p as ManuscriptParser, r as createNovelComposer, s as RunMeasurement, t as PresentationKind } from "./presentation-kind-BmW1Edu7.mjs";
+import { a as ManuscriptResult, i as ParsedManuscript, n as ValidationIssue, r as NamespacedId } from "./composed-manuscript-QgIdae8p.mjs";
+import { a as RunMeasurer, c as MeasurementRequest, f as ManuscriptComposer, m as Rejection, o as logicalRunMeasurer, p as ManuscriptParser, r as createNovelComposer, s as RunMeasurement, t as PresentationKind } from "./presentation-kind-PauRP22i.mjs";
 import * as v from "valibot";
 //#region src/composer/measurement-text-range.d.ts
 declare const MeasurementTextRangeSchema: v.SchemaWithPipe<readonly [v.SchemaWithPipe<readonly [v.SchemaWithPipe<readonly [v.StrictObjectSchema<{

package/dist/plugin.mjs

@@ -1,5 +1,5 @@
 import { f as ValidationIssue, g as NamespacedId, p as ManuscriptResult, x as readonlyObject } from "./question-or-exclamation-spacing-D7TSDUG8.mjs";
-import { _ as ParsedManuscript, a as MeasuredCluster, g as FontPresetId, h as FontSizeQ, i as RunMeasurement, o as MeasurementTextRange, r as logicalRunMeasurer, t as createNovelComposer } from "./novel-composer-DNsKrJIP.mjs";
+import { _ as ParsedManuscript, a as MeasuredCluster, g as FontPresetId, h as FontSizeQ, i as RunMeasurement, o as MeasurementTextRange, r as logicalRunMeasurer, t as createNovelComposer } from "./novel-composer-Dz7b30nf.mjs";
 import * as v from "valibot";
 const PresentationKind = { schema: v.picklist([
 	"mixed",

package/dist/{presentation-kind-BmW1Edu7.d.mts → presentation-kind-PauRP22i.d.mts}

@@ -1,4 +1,4 @@
-import { a as ManuscriptResult, i as ParsedManuscript, t as ComposedManuscript } from "./composed-manuscript-C0f3mxKs.mjs";
+import { a as ManuscriptResult, i as ParsedManuscript, t as ComposedManuscript } from "./composed-manuscript-QgIdae8p.mjs";
 import * as v from "valibot";
 //#region src/result/rejection.d.ts
 declare const RejectionSchema: v.SchemaWithPipe<readonly [v.StrictObjectSchema<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sushichan044/kg-core",
-  "version": "0.11.3",
+  "version": "0.12.1",
   "description": "Framework-independent parsing, composition, and proofreading for Japanese manuscripts",
   "keywords": [
     "japanese",