@sushichan044/kg-core 0.11.2 → 0.12.0

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-tcseYHc8.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 { t as describeCause } from "./describe-cause-SABI_1ex.mjs";
 import * as v from "valibot";
 const Rejection = { schema: readonlyObject({ reason: v.string() }) };
@@ -598,16 +598,48 @@ function joinIssues(issues) {
 }
 //#endregion
 //#region src/appearance/font-preset.ts
+const FIXED_PITCH = {
+	features: {
+		palt: 0,
+		vpal: 0,
+		halt: 0,
+		vhal: 0,
+		vkrn: 0,
+		liga: 1
+	},
+	westernKerning: "normal",
+	synthesis: "weight style"
+};
 const FONT_PRESETS = {
 	mincho: {
 		id: "mincho",
-		label: "明朝",
-		family: "\"Yu Mincho\", \"Hiragino Mincho ProN\", \"Hiragino Mincho Pro\", serif"
+		label: "倫明朝",
+		fontName: "KGRinMincho100",
+		family: "\"KGRinMincho100\", \"Yu Mincho\", \"Hiragino Mincho ProN\", serif",
+		textTransforms: ["combine-kana-voicing-marks"],
+		measurement: "browser-shaped",
+		rendering: {
+			...FIXED_PITCH,
+			synthesis: "style"
+		}
 	},
 	gothic: {
 		id: "gothic",
 		label: "ゴシック",
-		family: "\"Yu Gothic\", \"Hiragino Kaku Gothic ProN\", system-ui, sans-serif"
+		fontName: "",
+		family: "\"Yu Gothic\", \"Hiragino Kaku Gothic ProN\", system-ui, sans-serif",
+		textTransforms: [],
+		measurement: "logical",
+		rendering: FIXED_PITCH
+	},
+	"genei-koburi": {
+		id: "genei-koburi",
+		label: "源暎こぶり明朝",
+		fontName: "KGGenEiKoburi61",
+		family: "\"KGGenEiKoburi61\", \"Yu Mincho\", \"Hiragino Mincho ProN\", serif",
+		textTransforms: [],
+		measurement: "browser-shaped",
+		rendering: FIXED_PITCH
 	}
 };
 const FontPreset = {
@@ -615,4 +647,123 @@ const FontPreset = {
 	all: Object.values(FONT_PRESETS)
 };
 //#endregion
-export { ComposeError, FontPreset, FontPresetId, FontSizeQ, ManuscriptAppearanceSettings, ManuscriptDiagnostic, ManuscriptGeometry, ManuscriptOffsets, ManuscriptPageSettings, ManuscriptRange, ManuscriptResult, NovelCompositionSettings, NovelFlowSettings, PaperSize, PaperSizeId, ParseError, composeManuscript, kakuyomuParser, novelComposer, parseManuscript, pixivParser, plainTextParser };
+//#region src/appearance/internal/font-text-transforms.ts
+const transforms = { "combine-kana-voicing-marks": (text) => text.replace(/([\u3041-\u3096\u30A1-\u30FA\u31F0-\u31FF])([\u309B\u309C])/gu, (_, kana, mark) => kana + (mark === "゛" ? "゙" : "゚")) };
+function applyFontTextTransforms(text, rules) {
+	return rules.reduce((value, rule) => transforms[rule](value), text);
+}
+//#endregion
+//#region src/appearance/font-preparation.ts
+function prepareTextForFont(text, fontPreset) {
+	return applyFontTextTransforms(text, FontPreset.of(fontPreset).textTransforms);
+}
+/**
+* Prepare display text after parsing; source and UTF-16 offsets remain unchanged.
+*/
+function prepareManuscriptForFont(parsed, fontPreset) {
+	if (FontPreset.of(fontPreset).textTransforms.length === 0) return {
+		parsed,
+		mapRange: (range) => range
+	};
+	const boundaries = /* @__PURE__ */ new Set([0, parsed.displayText.length]);
+	for (const annotation of parsed.annotations) {
+		boundaries.add(annotation.range.display.start);
+		boundaries.add(annotation.range.display.end);
+		if (annotation.kind === "ruby" && annotation.reading.kind !== "group") for (const member of parsed.graphemes.slice(annotation.range.graphemes.start, annotation.range.graphemes.end)) boundaries.add(member.range.display.start);
+	}
+	for (const [index, member] of parsed.graphemes.entries()) {
+		const previous = parsed.graphemes[index - 1];
+		if (previous !== void 0 && previous.range.source.end !== member.range.source.start) boundaries.add(member.range.display.start);
+	}
+	const ordered = [...boundaries].sort((a, b) => a - b);
+	const parts = [];
+	const graphemes = [];
+	let originalIndex = 0;
+	for (let i = 1; i < ordered.length; i += 1) {
+		const start = ordered[i - 1];
+		const end = ordered[i];
+		if (start === void 0 || end === void 0) continue;
+		const text = prepareTextForFont(parsed.displayText.slice(start, end), fontPreset);
+		parts.push(text);
+		for (const { segment, index } of graphemeSegmenter.segment(text)) {
+			const displayStart = start + index;
+			const displayEnd = displayStart + segment.length;
+			while ((parsed.graphemes[originalIndex]?.range.display.end ?? Infinity) <= displayStart) originalIndex += 1;
+			const first = parsed.graphemes[originalIndex];
+			let last = first;
+			while (last !== void 0 && last.range.display.end < displayEnd) {
+				originalIndex += 1;
+				last = parsed.graphemes[originalIndex];
+			}
+			if (first === void 0 || last === void 0) throw new Error("Font preparation lost a source member");
+			graphemes.push({
+				value: segment,
+				range: ManuscriptRange.of({
+					source: {
+						start: first.range.source.start,
+						end: last.range.source.end
+					},
+					display: {
+						start: displayStart,
+						end: displayEnd
+					},
+					graphemes: {
+						start: graphemes.length,
+						end: graphemes.length + 1
+					}
+				})
+			});
+		}
+	}
+	const boundaryIndex = (offset, end) => {
+		let low = 0;
+		let high = graphemes.length;
+		while (low < high) {
+			const mid = Math.floor((low + high) / 2);
+			const member = graphemes[mid];
+			if (member !== void 0 && (end ? member.range.display.start < offset : member.range.display.end <= offset)) low = mid + 1;
+			else high = mid;
+		}
+		return low;
+	};
+	const mapRange = (range) => {
+		const start = boundaryIndex(range.display.start, false);
+		return ManuscriptRange.of({
+			...range,
+			graphemes: {
+				start,
+				end: range.display.start === range.display.end ? start : boundaryIndex(range.display.end, true)
+			}
+		});
+	};
+	const annotations = parsed.annotations.map((annotation) => {
+		const range = mapRange(annotation.range);
+		if (annotation.kind !== "ruby") return {
+			...annotation,
+			range
+		};
+		const reading = annotation.reading.kind === "group" ? {
+			kind: "group",
+			text: prepareTextForFont(annotation.reading.text, fontPreset)
+		} : {
+			...annotation.reading,
+			segments: annotation.reading.segments.map((text) => prepareTextForFont(text, fontPreset))
+		};
+		return {
+			...annotation,
+			range,
+			reading
+		};
+	});
+	return {
+		parsed: v.parse(ParsedManuscript.contractFor(parsed.source), {
+			source: parsed.source,
+			displayText: parts.join(""),
+			graphemes,
+			annotations
+		}),
+		mapRange
+	};
+}
+//#endregion
+export { ComposeError, FontPreset, FontPresetId, FontSizeQ, ManuscriptAppearanceSettings, ManuscriptDiagnostic, ManuscriptGeometry, ManuscriptOffsets, ManuscriptPageSettings, ManuscriptRange, ManuscriptResult, NovelCompositionSettings, NovelFlowSettings, PaperSize, PaperSizeId, ParseError, composeManuscript, kakuyomuParser, novelComposer, parseManuscript, pixivParser, plainTextParser, prepareManuscriptForFont, prepareTextForFont };

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

@@ -134,7 +134,11 @@ const A6_PAGE_FORMAT = {
 };
 //#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)
@@ -1139,7 +1143,7 @@ const HYPHENS = /* @__PURE__ */ new Set("‐‑⁃–");
 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("￥＄£#＃");
@@ -1162,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";
@@ -1923,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,
@@ -1935,6 +1941,7 @@ const MeasurementSession = { create: (provider, settings) => {
 		} : {
 			text,
 			kind,
+			...style === void 0 ? {} : { style },
 			presentation: "mixed",
 			fontPreset: settings.appearance.fontPreset,
 			fontSizeQ: settings.appearance.fontSizeQ,
@@ -1949,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,
@@ -1980,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({
@@ -2929,44 +2936,81 @@ function displayedLines(graphemes) {
 	if (lines.length > 1 && endedWithLineBreak) lines.pop();
 	return lines;
 }
+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 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,
-					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 = [];
@@ -2975,8 +3019,8 @@ function measureSourceLine(sourceLine, annotations, measurements, additionalSent
 	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
@@ -3113,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;
 		}

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-DnJkvxHU.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-B9FtjZvc.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-tcseYHc8.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)),