@sushichan044/kg-core 0.7.0 → 0.8.0

package/README.md

@@ -85,8 +85,12 @@ a quarter em between Japanese and a numeral, unit symbol, or Western character,
 solid where two of those punctuation marks meet.
 
 An overflowing line is answered by reducing that space or by hanging a comma or full
-stop; a short line is answered by stretching eligible space; a line that admits none
-of these is forced. The choice is made for the paragraph rather than line by line,
+stop; a short line is answered by opening up space where JLReq 3.8.4 and appendix 表6
+allow it — the Japanese-to-Western quarter em first, up to a half, then a solid pair
+between kana, kanji, and the marks that go with them, up to a quarter. Space around
+brackets, commas, full stops, middle dots, hyphens, and an ideographic space is never
+opened up. A line that admits none of these is forced. The choice is made for the
+paragraph rather than line by line,
 minimizing in order the number of forced lines, then stretched, then hanging, then
 shrunk lines that spent visible space. Which space may be reduced, and in which
 order, follows JLReq 3.8.3 and appendix 表3: the space at the line end goes first and

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { c as ManuscriptResult, d as NamespacedId, f as ManuscriptRange, h as readonlyObject, l as ManuscriptDiagnostic, o as graphemeSegmenter, s as ValidationIssue } from "./question-or-exclamation-spacing-B5o23ZLf.mjs";
-import { c as ManuscriptOffsets, d as FontSizePt, f as FontPresetId, i as PaperSize, l as ManuscriptAppearanceSettings, n as novelComposer, o as NovelCompositionSettings, p as ParsedManuscript, r as ManuscriptGeometry, s as NovelFlowSettings, u as PaperSizeId } from "./novel-composer-Cl6LJXOA.mjs";
+import { c as ManuscriptOffsets, d as FontSizePt, f as FontPresetId, i as PaperSize, l as ManuscriptAppearanceSettings, n as novelComposer, o as NovelCompositionSettings, p as ParsedManuscript, r as ManuscriptGeometry, s as NovelFlowSettings, u as PaperSizeId } from "./novel-composer-CROZLBqt.mjs";
 import { n as assertNever, t as describeCause } from "./describe-cause-BV8mZ3Um.mjs";
 import * as v from "valibot";
 const Rejection = { schema: readonlyObject({ reason: v.string() }) };

package/dist/{novel-composer-Cl6LJXOA.mjs → novel-composer-CROZLBqt.mjs}

@@ -366,13 +366,40 @@ const REDUCTION_STAGE = {
 	mixedText: 3
 };
 /**
-* 無印 in 表1: the pair is set solid.
+* The stages JLReq 3.8.4 adds inter-character space in, as glue priorities on the same reading as
+* {@link REDUCTION_STAGE}: the lower the number, the earlier the paragraph optimizer takes it. A
+* line is either reduced or expanded, never both, so the two scales never meet.
+*
+* Stage 1 is the western word space (cl-26), absent for the same reason it is absent from the
+* reduction stages. Stage 4 spreads whatever a、b and c could not absorb across every character gap
+* that is not unbreakable, and is deliberately not implemented: it would justify every line that
+* currently falls short, which reads as prose combed out to the margin rather than a novel.
+*/
+const EXPANSION_STAGE = {
+	/**
+	* Stage 2: the quarter em between Japanese and a numeral, unit symbol or western character.
+	*/
+	mixedText: 1,
+	/**
+	* Stage 3: everywhere else 表6 admits, from solid up to a quarter em.
+	*/
+	solid: 2
+};
+/**
+* 無印 in 表1 with no colour in 表6: the pair is set solid and line adjustment leaves it alone.
 */
 const SOLID = {
+	kind: "glue",
+	naturalWidthEm: 0
+};
+/**
+* `1/4` in 表6: set solid, but line adjustment may open it up to a quarter em.
+*/
+const SOLID_EXPANDABLE = {
 	kind: "glue",
 	naturalWidthEm: 0,
 	stretch: {
-		priority: 3,
+		priority: EXPANSION_STAGE.solid,
 		amountEm: .25
 	}
 };
@@ -413,9 +440,26 @@ const FIXED_QUARTER = {
 	naturalWidthEm: .25
 };
 /**
-* `1/4-1/8` in 表3: the Japanese-to-western quarter em, reducible to an eighth.
+* `1/4-1/8` in 表3 with `1/4-1/2` in 表6: the Japanese-to-western quarter em, reducible to an eighth
+* and expandable to a half.
 */
 const MIXED_TEXT_QUARTER = {
+	kind: "glue",
+	naturalWidthEm: .25,
+	shrink: {
+		priority: REDUCTION_STAGE.mixedText,
+		amountEm: .125
+	},
+	stretch: {
+		priority: EXPANSION_STAGE.mixedText,
+		amountEm: .25
+	}
+};
+/**
+* The same quarter em where 表6 leaves it out of the expansion: between a unit symbol and the
+* quantity on either side of it.
+*/
+const UNIT_SYMBOL_QUARTER = {
 	kind: "glue",
 	naturalWidthEm: .25,
 	shrink: {
@@ -502,6 +546,39 @@ const PUNCTUATION_TAKING_SPACE_AFTER = [
 	"cl-07"
 ];
 /**
+* 表6 の色付きの小間: the classes a solid pair may be opened up between at stage 3. Neither list holds a
+* bracket, a middle dot, a full stop, a comma, a hyphen, an ideographic space or a word space —
+* JLReq opens none of those — and only the left-hand list holds a numeral, unit symbol or western
+* character, since the space on their Japanese side belongs to stage 2 instead.
+*/
+const EXPANDABLE_BEFORE = [
+	"cl-08",
+	"cl-09",
+	"cl-10",
+	"cl-11",
+	"cl-12",
+	"cl-13",
+	"cl-15",
+	"cl-16",
+	"cl-19",
+	"cl-24",
+	"cl-25",
+	"cl-27",
+	"cl-30"
+];
+const EXPANDABLE_AFTER = [
+	"cl-08",
+	"cl-09",
+	"cl-10",
+	"cl-11",
+	"cl-12",
+	"cl-13",
+	"cl-15",
+	"cl-16",
+	"cl-19",
+	"cl-30"
+];
+/**
 * The classes JLReq 3.1.2 sets on a half em rather than a full one.
 */
 const HALF_EM_CLASSES = /* @__PURE__ */ new Set([
@@ -517,6 +594,44 @@ const PAIR_SPACING_TABLE = new Map([
 		right: "any",
 		spacing: SOLID
 	},
+	{
+		left: EXPANDABLE_BEFORE,
+		right: EXPANDABLE_AFTER,
+		spacing: SOLID_EXPANDABLE
+	},
+	{
+		left: [
+			"cl-08",
+			"cl-12",
+			"cl-13"
+		],
+		right: NUMERAL_UNIT_OR_WESTERN,
+		spacing: SOLID_EXPANDABLE
+	},
+	{
+		left: ["cl-08"],
+		right: ["cl-24", "cl-25"],
+		spacing: SOLID
+	},
+	{
+		left: ["cl-12"],
+		right: ["cl-24"],
+		spacing: SOLID
+	},
+	{
+		left: ["cl-24"],
+		right: ["cl-13"],
+		spacing: SOLID
+	},
+	{
+		left: [
+			"cl-09",
+			"cl-10",
+			"cl-11"
+		],
+		right: ["cl-08"],
+		spacing: SOLID
+	},
 	{
 		left: "any",
 		right: ["cl-01"],
@@ -545,12 +660,12 @@ const PAIR_SPACING_TABLE = new Map([
 	{
 		left: ["cl-25"],
 		right: ["cl-24"],
-		spacing: MIXED_TEXT_QUARTER
+		spacing: UNIT_SYMBOL_QUARTER
 	},
 	{
 		left: ["cl-27"],
 		right: ["cl-25"],
-		spacing: MIXED_TEXT_QUARTER
+		spacing: UNIT_SYMBOL_QUARTER
 	},
 	{
 		left: ["cl-24"],

package/dist/plugin.mjs

@@ -1,3 +1,3 @@
 import { c as ManuscriptResult, d as NamespacedId, s as ValidationIssue } from "./question-or-exclamation-spacing-B5o23ZLf.mjs";
-import { a as logicalInlineMeasurer, p as ParsedManuscript, t as createNovelComposer } from "./novel-composer-Cl6LJXOA.mjs";
+import { a as logicalInlineMeasurer, p as ParsedManuscript, t as createNovelComposer } from "./novel-composer-CROZLBqt.mjs";
 export { ManuscriptResult, NamespacedId, ParsedManuscript, ValidationIssue, createNovelComposer, logicalInlineMeasurer };

package/package.json

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