@sushichan044/kg-core 0.11.1 → 0.11.3

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

@@ -1,4 +1,4 @@
-import { _ as nonNegativeInteger, a as CLOSING_BRACKETS, c as assertNever, d as ManuscriptResult, g as TextRange, h as ManuscriptRange, i as TATE_CHU_YOKO_MARKS, l as graphemeSegmenter, m as NamespacedId, o as OPENING_BRACKETS, r as DIVIDING_PUNCTUATION, s as characterClass, t as questionOrExclamationSpacings, v as readonlyArray, y as readonlyObject } from "./question-or-exclamation-spacing-C5cFLeKr.mjs";
+import { _ as ManuscriptRange, a as characterClass, b as readonlyArray, c as isSentenceEndingMark, d as graphemeSegmenter, g as NamespacedId, i as OPENING_BRACKETS, l as validAdditionalSentenceEndingMarks, o as SENTENCE_ENDING_MARKS, p as ManuscriptResult, r as CLOSING_BRACKETS, s as TATE_CHU_YOKO_MARKS, t as questionOrExclamationSpacings, u as assertNever, v as TextRange, x as readonlyObject, y as nonNegativeInteger } from "./question-or-exclamation-spacing-D7TSDUG8.mjs";
 import * as v from "valibot";
 import { eastAsianWidth } from "get-east-asian-width";
 const BoldAnnotation = { schema: readonlyObject({
@@ -116,9 +116,29 @@ const A5_PAGE_FORMAT = {
 		outerMm: 13
 	}
 };
+const A6_PAGE_FORMAT = {
+	fontSizeQ: 12,
+	flow: {
+		lineLengthEm: 41,
+		linesPerStage: 17,
+		stagesPerPage: 1
+	},
+	page: {
+		lineGapMm: 7 / 4,
+		stageGapMm: 0,
+		topMm: 12.5,
+		bottomMm: 12.5,
+		innerMm: 16,
+		outerMm: 10
+	}
+};
 //#endregion
 //#region src/appearance/font-preset-id.ts
-const FontPresetIdSchema = v.picklist(["mincho", "gothic"]);
+const FontPresetIdSchema = v.picklist([
+	"mincho",
+	"gothic",
+	"genei-koburi"
+]);
 const FontPresetId = {
 	schema: FontPresetIdSchema,
 	is: (value) => v.is(FontPresetIdSchema, value)
@@ -331,6 +351,7 @@ const NovelFlowSettings = {
 //#endregion
 //#region src/composer/composition-settings.ts
 const NovelCompositionSettingsSchema = v.pipe(readonlyObject({
+	additionalSentenceEndingMarks: v.optional(v.pipe(v.string(), v.check(validAdditionalSentenceEndingMarks))),
 	flow: NovelFlowSettings.schema,
 	offsets: ManuscriptOffsets.schema,
 	appearance: ManuscriptAppearanceSettings.schema,
@@ -338,7 +359,10 @@ const NovelCompositionSettingsSchema = v.pipe(readonlyObject({
 }), v.check(({ flow, offsets }) => LineOffset.total(offsets.stage) <= ManuscriptOffsets.maxStageTotal(flow) && LineOffset.total(offsets.page) <= ManuscriptOffsets.maxPageTotal(flow, offsets.stage), "page or stage offsets leave no usable novel lines"), v.check(({ flow, appearance, page }) => {
 	const geometry = ManuscriptGeometry.of(flow, appearance, page);
 	return Math.abs(geometry.contentHeightMm + page.topMm + page.bottomMm - geometry.paperHeightMm) <= 1e-6 && Math.abs(geometry.contentWidthMm + page.innerMm + page.outerMm - geometry.paperWidthMm) <= 1e-6;
-}, "text dimensions and margins must match the paper dimensions"), v.check(({ appearance, page }) => page.lineGapMm + 1e-6 >= appearance.fontSizeQ / 8, "line gap must leave room for half-size annotations"), v.check(({ flow, appearance, page }) => appearance.paperSize !== "a5" || appearance.fontSizeQ === A5_PAGE_FORMAT.fontSizeQ && flow.lineLengthEm === A5_PAGE_FORMAT.flow.lineLengthEm && flow.linesPerStage === A5_PAGE_FORMAT.flow.linesPerStage && flow.stagesPerPage === A5_PAGE_FORMAT.flow.stagesPerPage && page.lineGapMm === A5_PAGE_FORMAT.page.lineGapMm && page.stageGapMm === A5_PAGE_FORMAT.page.stageGapMm && page.topMm === A5_PAGE_FORMAT.page.topMm && page.bottomMm === A5_PAGE_FORMAT.page.bottomMm && page.innerMm === A5_PAGE_FORMAT.page.innerMm && page.outerMm === A5_PAGE_FORMAT.page.outerMm, "A5 uses the fixed 12.7Q, 27-character, 23-line, two-stage format"));
+}, "text dimensions and margins must match the paper dimensions"), v.check(({ appearance, page }) => page.lineGapMm + 1e-6 >= appearance.fontSizeQ / 8, "line gap must leave room for half-size annotations"), v.check(({ flow, appearance, page }) => {
+	const format = appearance.paperSize === "a5" ? A5_PAGE_FORMAT : appearance.paperSize === "a6" ? A6_PAGE_FORMAT : null;
+	return format === null || appearance.fontSizeQ === format.fontSizeQ && flow.lineLengthEm === format.flow.lineLengthEm && flow.linesPerStage === format.flow.linesPerStage && flow.stagesPerPage === format.flow.stagesPerPage && page.lineGapMm === format.page.lineGapMm && page.stageGapMm === format.page.stageGapMm && page.topMm === format.page.topMm && page.bottomMm === format.page.bottomMm && page.innerMm === format.page.innerMm && page.outerMm === format.page.outerMm;
+}, "A5 and A6 use their fixed page formats"));
 const NovelCompositionSettings = {
 	schema: NovelCompositionSettingsSchema,
 	defaults: {
@@ -348,21 +372,22 @@ const NovelCompositionSettings = {
 		page: ManuscriptPageSettings.defaults
 	},
 	/**
-	* Select the fixed A5 format, or centre the current grid on another paper size.
+	* Select the fixed A5 or A6 format, or centre the current grid on another paper size.
 	*/
 	forPaper: (paperSize, settings) => {
 		const appearance = {
 			...settings.appearance,
 			paperSize
 		};
-		if (paperSize === "a5") return {
+		const format = paperSize === "a5" ? A5_PAGE_FORMAT : paperSize === "a6" ? A6_PAGE_FORMAT : null;
+		if (format !== null) return {
 			...settings,
-			flow: A5_PAGE_FORMAT.flow,
+			flow: format.flow,
 			appearance: {
 				...appearance,
-				fontSizeQ: A5_PAGE_FORMAT.fontSizeQ
+				fontSizeQ: format.fontSizeQ
 			},
-			page: A5_PAGE_FORMAT.page
+			page: format.page
 		};
 		return {
 			...settings,
@@ -524,7 +549,7 @@ function presentationOf(text) {
 * Recognize sentence-wide presentation while keeping words as separate line-break units. Standalone
 * dotted abbreviations retain the existing per-token presentation.
 */
-function recognize(graphemes) {
+function recognizeText(graphemes) {
 	const runs = [];
 	const push = (members, presentation) => {
 		const range = ManuscriptRange.merge(members.map((member) => member.range));
@@ -569,6 +594,25 @@ function recognize(graphemes) {
 	}
 	return runs;
 }
+/**
+* Split configured symbols before recognizing western words and presentation runs.
+*/
+function recognize(graphemes, additionalSentenceEndingMarks = "") {
+	const runs = [];
+	let start = 0;
+	for (const [index, grapheme] of graphemes.entries()) {
+		if (!isSentenceEndingMark(grapheme.value, additionalSentenceEndingMarks) || isSentenceEndingMark(grapheme.value)) continue;
+		runs.push(...recognizeText(graphemes.slice(start, index)));
+		runs.push({
+			range: grapheme.range,
+			members: [grapheme],
+			presentation: "mixed"
+		});
+		start = index + 1;
+	}
+	runs.push(...recognizeText(graphemes.slice(start)));
+	return runs;
+}
 const CompositionRun = { recognize };
 //#endregion
 //#region src/composer/internal/emphasis-placement.ts
@@ -1096,10 +1140,10 @@ const boundaryClasses = [
 const OPENING = /* @__PURE__ */ new Set(`${OPENING_BRACKETS}【〘〝｟«`);
 const CLOSING = /* @__PURE__ */ new Set(`${CLOSING_BRACKETS}】〙〟｠»`);
 const HYPHENS = /* @__PURE__ */ new Set("‐‑⁃–");
-const DIVIDING_MARKS = new Set(DIVIDING_PUNCTUATION);
+const DIVIDING_MARKS = new Set(SENTENCE_ENDING_MARKS);
 const COMBINED_DIVIDING_MARKS = new Set(TATE_CHU_YOKO_MARKS);
 const MIDDLE_DOTS = /* @__PURE__ */ new Set("・：；");
-const SMALL_KANA = /* @__PURE__ */ new Set("ァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖ");
+const SMALL_KANA = /* @__PURE__ */ new Set("ァィゥェォッャュョヮヵヶㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿぁぃぅぇぉっゃゅょゎゕゖ");
 const ITERATION_MARKS = /* @__PURE__ */ new Set("ヽヾゝゞ々〻");
 const INSEPARABLE = /* @__PURE__ */ new Set("—―…‥─〳〴〵");
 const PREFIXED_ABBREVIATIONS = /* @__PURE__ */ new Set("￥＄£#＃");
@@ -1122,6 +1166,7 @@ const WESTERN = /^[\p{Script=Latin}\p{Script=Greek}\p{Script=Cyrillic}]$/u;
 * the same as a tate-chu-yoko run's 3.2.5.
 */
 function classify({ value, presentation }) {
+	value = value.replace(/[\u3099\u309A]/gu, "");
 	switch (presentation) {
 		case "tate-chu-yoko": return COMBINED_DIVIDING_MARKS.has(value) ? "cl-04" : "cl-30";
 		case "upright": return "cl-19";
@@ -1883,10 +1928,11 @@ const RunMeasurement = {
 //#region src/composer/internal/measurement-session.ts
 const MeasurementSession = { create: (provider, settings) => {
 	const cache = /* @__PURE__ */ new Map();
-	const get = (text, kind, presentation = "mixed") => {
+	const get = (text, kind, presentation = "mixed", style) => {
 		const request = kind === "base" ? {
 			text,
 			kind,
+			...style === void 0 ? {} : { style },
 			presentation,
 			fontPreset: settings.appearance.fontPreset,
 			fontSizeQ: settings.appearance.fontSizeQ,
@@ -1895,6 +1941,7 @@ const MeasurementSession = { create: (provider, settings) => {
 		} : {
 			text,
 			kind,
+			...style === void 0 ? {} : { style },
 			presentation: "mixed",
 			fontPreset: settings.appearance.fontPreset,
 			fontSizeQ: settings.appearance.fontSizeQ,
@@ -1909,8 +1956,8 @@ const MeasurementSession = { create: (provider, settings) => {
 	};
 	return {
 		get,
-		pieces: (text, kind, presentation) => {
-			const full = get(text, kind, presentation);
+		pieces: (text, kind, presentation, style) => {
+			const full = get(text, kind, presentation, style);
 			if (full === void 0) return void 0;
 			if (full.kind === "clustered") return full.clusters.map((cluster) => ({
 				textRange: cluster.textRange,
@@ -1940,7 +1987,7 @@ const MeasurementSession = { create: (provider, settings) => {
 			const pieces = [];
 			let offsetEm = 0;
 			for (const { segment, index } of segments) {
-				const measured = get(segment, kind, presentation);
+				const measured = get(segment, kind, presentation, style);
 				if (measured === void 0) return void 0;
 				const cluster = measured.kind === "clustered" ? measured.clusters[0] : void 0;
 				pieces.push({
@@ -2688,8 +2735,8 @@ const RubyLineLayout = {
 };
 //#endregion
 //#region src/composer/internal/source-space.ts
-const SourceSpace = { collect: (graphemes, advancesEm) => {
-	const gaps = new Set(questionOrExclamationSpacings(graphemes.map(({ value }) => value).join("")).filter((spacing) => spacing.kind === "valid").map(({ gap }) => gap.start));
+const SourceSpace = { collect: (graphemes, advancesEm, additionalSentenceEndingMarks = "") => {
+	const gaps = new Set(questionOrExclamationSpacings(graphemes.map(({ value }) => value).join(""), additionalSentenceEndingMarks).filter((spacing) => spacing.kind === "valid").map(({ gap }) => gap.start));
 	let offset = 0;
 	return graphemes.flatMap((grapheme, index) => {
 		const separator = gaps.has(offset);
@@ -2854,7 +2901,7 @@ function graphemeWidth(grapheme) {
 	for (const character of grapheme) {
 		const codePoint = character.codePointAt(0);
 		if (codePoint !== void 0) {
-			const characterWidth = "！？‼⁇⁈⁉".includes(character) ? 2 : eastAsianWidth(codePoint, { ambiguousAsWide: true });
+			const characterWidth = SENTENCE_ENDING_MARKS.includes(character) ? 2 : eastAsianWidth(codePoint, { ambiguousAsWide: true });
 			width = Math.max(width, characterWidth);
 		}
 	}
@@ -2889,43 +2936,81 @@ function displayedLines(graphemes) {
 	if (lines.length > 1 && endedWithLineBreak) lines.pop();
 	return lines;
 }
-function measureSourceLine(sourceLine, annotations, measurements) {
-	const runs = CompositionRun.recognize(sourceLine);
+function styleGroups(run, annotations) {
+	const groups = [];
+	if (annotations.length === 0) return [{
+		members: run.members,
+		style: {
+			weight: 400,
+			slant: "normal"
+		}
+	}];
+	for (const member of run.members) {
+		const styles = annotations.filter((annotation) => (annotation.kind === "bold" || annotation.kind === "italic") && ManuscriptRange.overlaps(annotation.range, member.range));
+		const weight = styles.some(({ kind }) => kind === "bold") ? 700 : 400;
+		const slant = styles.some(({ kind }) => kind === "italic") ? "italic" : "normal";
+		const last = groups.at(-1);
+		if (last !== void 0 && (run.presentation !== "sideways" || last.style.weight === weight && last.style.slant === slant)) last.members.push(member);
+		else groups.push({
+			members: [member],
+			style: {
+				weight,
+				slant
+			}
+		});
+	}
+	return groups;
+}
+/**
+* Preserve shaped advances while keeping partial annotations on their own bases.
+*/
+function measureSourceLine(sourceLine, annotations, measurements, additionalSentenceEndingMarks) {
+	const runs = CompositionRun.recognize(sourceLine, additionalSentenceEndingMarks);
 	const rubyAssociations = RubyAssociation.collect(annotations, sourceLine);
+	const styles = annotations.filter(({ kind }) => kind === "bold" || kind === "italic");
 	const atoms = [];
+	let renderGroup = 0;
 	for (const [runIndex, run] of runs.entries()) {
-		const text = run.members.map(({ value }) => value).join("");
-		const pieces = measurements.pieces(text, "base", run.presentation);
-		if (pieces === void 0) return void 0;
-		const combineRun = run.presentation === "tate-chu-yoko" || pieces.length < run.members.length;
-		let memberStart = 0;
-		for (const piece of pieces) {
-			const memberCount = [...graphemeSegmenter.segment(piece.value)].length;
-			const members = run.members.slice(memberStart, memberStart + memberCount);
-			const clusterRange = memberCount > 1 ? ManuscriptRange.merge(members.map(({ range }) => range)) : null;
-			for (const [memberIndex, grapheme] of members.entries()) {
-				const first = memberIndex === 0;
-				const renderAdvanceEm = first ? piece.renderSpan.advanceEm : 0;
-				const measuredAdvanceEm = first ? piece.layoutSpan.advanceEm : 0;
-				const characterClass = TYPESETTING_PROFILE.classify({
-					value: grapheme.value,
-					presentation: run.presentation
-				});
-				const metrics = TYPESETTING_PROFILE.boxMetrics(characterClass, measuredAdvanceEm);
-				atoms.push({
-					grapheme,
-					runIndex,
-					characterClass,
-					intrinsicBoxAdvanceEm: metrics.advanceEm,
-					boxAdvanceEm: metrics.advanceEm,
-					renderAdvanceEm,
-					renderOffsetEm: metrics.renderOffsetEm + (first ? piece.renderSpan.offsetEm - piece.layoutSpan.offsetEm : 0),
-					presentation: run.presentation,
-					clusterRange,
-					combineRun
-				});
+		const partialRuby = run.presentation === "sideways" && rubyAssociations.some(({ baseRange }) => ManuscriptRange.overlaps(baseRange, run.range) && (baseRange.graphemes.start > run.range.graphemes.start || baseRange.graphemes.end < run.range.graphemes.end));
+		for (const group of styleGroups(run, styles)) {
+			renderGroup += 1;
+			const text = group.members.map(({ value }) => value).join("");
+			const style = group.style.weight === 400 && group.style.slant === "normal" ? void 0 : group.style;
+			const pieces = measurements.pieces(text, "base", run.presentation, style);
+			if (pieces === void 0) return void 0;
+			const clusteredSideways = run.presentation === "sideways" && measurements.get(text, "base", run.presentation, style)?.kind === "clustered";
+			const combineRun = run.presentation === "tate-chu-yoko" || pieces.length < group.members.length || clusteredSideways && group.members.length > 1 && !partialRuby;
+			let memberStart = 0;
+			for (const piece of pieces) {
+				const memberCount = [...graphemeSegmenter.segment(piece.value)].length;
+				const members = group.members.slice(memberStart, memberStart + memberCount);
+				const clusterRange = memberCount > 1 ? ManuscriptRange.merge(members.map(({ range }) => range)) : null;
+				for (const [memberIndex, grapheme] of members.entries()) {
+					const first = memberIndex === 0;
+					const renderAdvanceEm = first ? piece.renderSpan.advanceEm : 0;
+					const measuredAdvanceEm = first ? piece.layoutSpan.advanceEm : 0;
+					const sentenceEndingMark = isSentenceEndingMark(grapheme.value, additionalSentenceEndingMarks);
+					const characterClass = sentenceEndingMark ? "cl-04" : TYPESETTING_PROFILE.classify({
+						value: grapheme.value,
+						presentation: run.presentation
+					});
+					const metrics = TYPESETTING_PROFILE.boxMetrics(characterClass, sentenceEndingMark && !combineRun ? 1 : measuredAdvanceEm);
+					atoms.push({
+						grapheme,
+						runIndex,
+						renderGroup,
+						characterClass,
+						intrinsicBoxAdvanceEm: metrics.advanceEm,
+						boxAdvanceEm: metrics.advanceEm,
+						renderAdvanceEm,
+						renderOffsetEm: metrics.renderOffsetEm + (first ? piece.renderSpan.offsetEm - piece.layoutSpan.offsetEm : 0),
+						presentation: run.presentation,
+						clusterRange,
+						combineRun
+					});
+				}
+				memberStart += memberCount;
 			}
-			memberStart += memberCount;
 		}
 	}
 	const candidateReadings = [];
@@ -2934,8 +3019,8 @@ function measureSourceLine(sourceLine, annotations, measurements) {
 	const physicalRange = (first, last) => {
 		const left = atoms[first];
 		const right = atoms[last];
-		while (first > 0 && left?.combineRun === true && atoms[first - 1]?.runIndex === left.runIndex) first -= 1;
-		while (last + 1 < atoms.length && right?.combineRun === true && atoms[last + 1]?.runIndex === right.runIndex) last += 1;
+		while (first > 0 && left?.combineRun === true && atoms[first - 1]?.renderGroup === left.renderGroup) first -= 1;
+		while (last + 1 < atoms.length && right?.combineRun === true && atoms[last + 1]?.renderGroup === right.renderGroup) last += 1;
 		return {
 			start: first,
 			end: last + 1
@@ -2965,7 +3050,7 @@ function measureSourceLine(sourceLine, annotations, measurements) {
 			});
 		}
 	}
-	const sourceSpaces = SourceSpace.collect(sourceLine, atoms.map(({ boxAdvanceEm }) => boxAdvanceEm));
+	const sourceSpaces = SourceSpace.collect(sourceLine, atoms.map(({ boxAdvanceEm }) => boxAdvanceEm), additionalSentenceEndingMarks);
 	return {
 		atoms,
 		runs,
@@ -3072,7 +3157,7 @@ function renderUnits(raw) {
 		const members = [first];
 		if (first.atom.combineRun) while (index + 1 < raw.length) {
 			const next = raw[index + 1];
-			if (next?.kind !== "member" || next.atom.runIndex !== first.atom.runIndex) break;
+			if (next?.kind !== "member" || next.atom.renderGroup !== first.atom.renderGroup) break;
 			members.push(next);
 			index += 1;
 		}
@@ -3408,7 +3493,7 @@ function createCompose(provider) {
 	return (manuscript, settings) => {
 		const measurements = MeasurementSession.create(provider, settings);
 		const sourceLines = displayedLines(manuscript.graphemes);
-		const measured = sourceLines.map((line) => measureSourceLine(line, manuscript.annotations, measurements));
+		const measured = sourceLines.map((line) => measureSourceLine(line, manuscript.annotations, measurements, settings.additionalSentenceEndingMarks ?? ""));
 		if (measured.some((line) => line === void 0)) return ManuscriptResult.fail({ reason: "run measurer returned invalid metrics or cluster mappings" });
 		const manuscriptLines = [];
 		for (const line of measured) {

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-CvlmQ3AY.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 * 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 { d as ManuscriptResult, m as NamespacedId, u as ValidationIssue, y as readonlyObject } from "./question-or-exclamation-spacing-C5cFLeKr.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-z0cv8OHb.mjs";
+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 v from "valibot";
 const PresentationKind = { schema: v.picklist([
 	"mixed",
@@ -11,6 +11,10 @@ const PresentationKind = { schema: v.picklist([
 //#region src/composer/measurement-request.ts
 const context = {
 	text: v.string(),
+	style: v.optional(readonlyObject({
+		weight: v.picklist([400, 700]),
+		slant: v.picklist(["normal", "italic"])
+	})),
 	fontPreset: FontPresetId.schema,
 	fontSizeQ: FontSizeQ.schema,
 	scale: v.pipe(v.number(), v.finite(), v.minValue(Number.MIN_VALUE)),