@sushichan044/kg-core 0.11.1 → 0.11.3

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { c as assertNever, d as ManuscriptResult, f as ManuscriptDiagnostic, h as ManuscriptRange, l as graphemeSegmenter, m as NamespacedId, u as ValidationIssue, y as readonlyObject } from "./question-or-exclamation-spacing-C5cFLeKr.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-z0cv8OHb.mjs";
+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 { 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/lint.d.mts

@@ -440,13 +440,11 @@ export declare function createParagraphOpeningRule(options?: ParagraphOpeningOpt
 export declare const punctuationBeforeClosingQuoteRule: () => ParsedProofreadingRule;
 //#endregion
 //#region src/proofreading/rules/space-after-question-or-exclamation.d.ts
-/**
- * The gap that follows every run of ！ or ？ (区切り約物, JLReq 3.1.6). A dividing punctuation mark ends a
- * sentence without a full stop, so a full em of white stands in for the one a 句点 would have
- * carried. A run at the end of a line or right before a closing bracket is already separated from
- * what follows and needs no gap; anywhere else it takes exactly one ideographic space.
- */
 export declare const spaceAfterQuestionOrExclamationRule: () => ParsedProofreadingRule;
+type SpaceAfterQuestionOrExclamationOptions = Readonly<{
+  additionalSentenceEndingMarks?: string;
+}>;
+export declare function createSpaceAfterQuestionOrExclamationRule(options?: SpaceAfterQuestionOrExclamationOptions): ManuscriptResult<ParsedProofreadingRule, InvalidRuleOptions>;
 //#endregion
 //#region src/proofreading/rules/variant-character.d.ts
 /**
@@ -458,4 +456,4 @@ export declare const spaceAfterQuestionOrExclamationRule: () => ParsedProofreadi
  */
 export declare const variantCharacterRule: () => ParsedProofreadingRule;
 //#endregion
-export type { ComposedProofreadingRule, ConsistentKanjiOpeningOptions, DashOptions, KanjiOpeningPair, MaxArabicNumeralDigitsOptions, ParagraphOpeningOptions, ParsedProofreadingRule, ProofreadOptions, ProofreadingReport, ProofreadingRule, ProofreadingRuleContext, ProofreadingRuleMessages };
+export type { ComposedProofreadingRule, ConsistentKanjiOpeningOptions, DashOptions, KanjiOpeningPair, MaxArabicNumeralDigitsOptions, ParagraphOpeningOptions, ParsedProofreadingRule, ProofreadOptions, ProofreadingReport, ProofreadingRule, ProofreadingRuleContext, ProofreadingRuleMessages, SpaceAfterQuestionOrExclamationOptions };

package/dist/lint.mjs

@@ -1,4 +1,4 @@
-import { a as CLOSING_BRACKETS, c as assertNever, d as ManuscriptResult, f as ManuscriptDiagnostic, h as ManuscriptRange, l as graphemeSegmenter, m as NamespacedId, n as leadingSpaces, o as OPENING_BRACKETS, p as DiagnosticSeverity, s as characterClass, t as questionOrExclamationSpacings, u as ValidationIssue, v as readonlyArray, y as readonlyObject } from "./question-or-exclamation-spacing-C5cFLeKr.mjs";
+import { _ as ManuscriptRange, a as characterClass, b as readonlyArray, d as graphemeSegmenter, f as ValidationIssue, g as NamespacedId, h as DiagnosticSeverity, i as OPENING_BRACKETS, l as validAdditionalSentenceEndingMarks, m as ManuscriptDiagnostic, n as leadingSpaces, p as ManuscriptResult, r as CLOSING_BRACKETS, t as questionOrExclamationSpacings, u as assertNever, x as readonlyObject } from "./question-or-exclamation-spacing-D7TSDUG8.mjs";
 import { t as describeCause } from "./describe-cause-SABI_1ex.mjs";
 import * as v from "valibot";
 //#region src/proofreading/invalid-rule-options.ts
@@ -333,7 +333,7 @@ const DEFAULT_PAIRS = [
 * Reports the first kanji occurrence of every pair the manuscript also writes in kana. Whether the
 * two spellings are a deliberate distinction is the author's call, so the finding is a warning.
 */
-function build$3(pairs) {
+function build$4(pairs) {
 	return defineParsedRule(RULE_ID$5, MESSAGE, (manuscript, report) => {
 		for (const { closed, opened } of pairs) {
 			if (!manuscript.displayText.includes(opened)) continue;
@@ -349,7 +349,7 @@ function build$3(pairs) {
 		}
 	});
 }
-const consistentKanjiOpeningRule = () => build$3(DEFAULT_PAIRS);
+const consistentKanjiOpeningRule = () => build$4(DEFAULT_PAIRS);
 function createConsistentKanjiOpeningRule(options = {}) {
 	if (options.pairs === void 0) return ManuscriptResult.succeed(consistentKanjiOpeningRule());
 	const pairs = v.safeParse(PairsSchema, options.pairs);
@@ -359,7 +359,7 @@ function createConsistentKanjiOpeningRule(options = {}) {
 		option: "pairs",
 		issues: ValidationIssue.from(pairs.issues)
 	});
-	return ManuscriptResult.succeed(build$3(pairs.output));
+	return ManuscriptResult.succeed(build$4(pairs.output));
 }
 //#endregion
 //#region src/proofreading/rules/internal/mixed-width.ts
@@ -431,7 +431,7 @@ function messageIdFor(run, preferred) {
 * must match, since only a repeat of the same character joins without a seam. JLReq classes the
 * dash as 分離禁止文字 (cl-08) for the same reason: the pair must not be split across lines.
 */
-function build$2(preferred) {
+function build$3(preferred) {
 	const messages = {
 		character: `ダッシュには「${preferred}」を使ってください`,
 		"even-count": EVEN_COUNT_MESSAGE
@@ -462,7 +462,7 @@ function build$2(preferred) {
 		}
 	};
 }
-const dashRule = () => build$2(DEFAULT_PREFERRED);
+const dashRule = () => build$3(DEFAULT_PREFERRED);
 function createDashRule(options = {}) {
 	if (options.preferred === void 0) return ManuscriptResult.succeed(dashRule());
 	const preferred = v.safeParse(DashCharacterSchema, options.preferred);
@@ -472,7 +472,7 @@ function createDashRule(options = {}) {
 		option: "preferred",
 		issues: ValidationIssue.from(preferred.issues)
 	});
-	return ManuscriptResult.succeed(build$2(preferred.output));
+	return ManuscriptResult.succeed(build$3(preferred.output));
 }
 //#endregion
 //#region src/proofreading/rules/ellipsis-character.ts
@@ -582,7 +582,7 @@ const MaxDigitsSchema = v.pipe(v.number(), v.finite(), v.integer(), v.minValue(1
 * upright inside one em, but a longer one has nowhere to go: it either turns the line sideways or
 * breaks across it. The usual limit is two digits, past which a novel spells the number in kanji.
 */
-function build$1(maxDigits) {
+function build$2(maxDigits) {
 	return defineMatchRule({
 		id: RULE_ID$2,
 		pattern: /([0-9０-９]+)(?:[.．]([0-9０-９]+))?/gu,
@@ -590,7 +590,7 @@ function build$1(maxDigits) {
 		message: `${maxDigits}桁を超えるアラビア数字が使われています`
 	});
 }
-const maxArabicNumeralDigitsRule = () => build$1(DEFAULT_MAX_DIGITS);
+const maxArabicNumeralDigitsRule = () => build$2(DEFAULT_MAX_DIGITS);
 function createMaxArabicNumeralDigitsRule(options = {}) {
 	if (options.maxDigits === void 0) return ManuscriptResult.succeed(maxArabicNumeralDigitsRule());
 	const maxDigits = v.safeParse(MaxDigitsSchema, options.maxDigits);
@@ -600,7 +600,7 @@ function createMaxArabicNumeralDigitsRule(options = {}) {
 		option: "maxDigits",
 		issues: ValidationIssue.from(maxDigits.issues)
 	});
-	return ManuscriptResult.succeed(build$1(maxDigits.output));
+	return ManuscriptResult.succeed(build$2(maxDigits.output));
 }
 //#endregion
 //#region src/proofreading/rules/minus-before-number.ts
@@ -664,7 +664,7 @@ const OpeningBracketsSchema = v.pipe(v.string(), v.nonEmpty());
 * The three findings are branches of that one decision rather than separate rules, so a line can
 * never collect two of them at once.
 */
-function build(openingBrackets) {
+function build$1(openingBrackets) {
 	return {
 		kind: "parsed",
 		meta: {
@@ -693,7 +693,7 @@ function build(openingBrackets) {
 		}
 	};
 }
-const paragraphOpeningRule = () => build(OPENING_BRACKETS);
+const paragraphOpeningRule = () => build$1(OPENING_BRACKETS);
 function createParagraphOpeningRule(options = {}) {
 	if (options.openingBrackets === void 0) return ManuscriptResult.succeed(paragraphOpeningRule());
 	const brackets = v.safeParse(OpeningBracketsSchema, options.openingBrackets);
@@ -703,7 +703,7 @@ function createParagraphOpeningRule(options = {}) {
 		option: "openingBrackets",
 		issues: ValidationIssue.from(brackets.issues)
 	});
-	return ManuscriptResult.succeed(build(brackets.output));
+	return ManuscriptResult.succeed(build$1(brackets.output));
 }
 //#endregion
 //#region src/proofreading/rules/punctuation-before-closing-quote.ts
@@ -722,8 +722,8 @@ const punctuationBeforeClosingQuoteRule = () => defineMatchRule({
 //#region src/proofreading/rules/space-after-question-or-exclamation.ts
 const RULE_ID = "kg/space-after-question-or-exclamation";
 const MESSAGES = {
-	default: "感嘆符または疑問符の直後には全角スペースか閉じ括弧が必要です",
-	"space-width": "感嘆符または疑問符の直後の空白は全角スペース1字にしてください",
+	default: "文末記号の直後には全角スペースか閉じ括弧が必要です",
+	"space-width": "文末記号の直後の空白は全角スペース1字にしてください",
 	"before-closing-bracket": "閉じ括弧の直前に空白を置くことはできません"
 };
 /**
@@ -732,7 +732,7 @@ const MESSAGES = {
 * carried. A run at the end of a line or right before a closing bracket is already separated from
 * what follows and needs no gap; anywhere else it takes exactly one ideographic space.
 */
-const spaceAfterQuestionOrExclamationRule = () => ({
+const build = (additionalSentenceEndingMarks = "") => ({
 	kind: "parsed",
 	meta: {
 		id: RULE_ID,
@@ -745,7 +745,7 @@ const spaceAfterQuestionOrExclamationRule = () => ({
 				messageId
 			});
 		};
-		for (const line of splitDisplayLines(manuscript.displayText)) for (const spacing of questionOrExclamationSpacings(line.text)) switch (spacing.kind) {
+		for (const line of splitDisplayLines(manuscript.displayText)) for (const spacing of questionOrExclamationSpacings(line.text, additionalSentenceEndingMarks)) switch (spacing.kind) {
 			case "valid": break;
 			case "missing":
 				report(line.start + spacing.marks.start, line.start + spacing.marks.end, "default");
@@ -760,6 +760,17 @@ const spaceAfterQuestionOrExclamationRule = () => ({
 		}
 	}
 });
+const spaceAfterQuestionOrExclamationRule = () => build();
+function createSpaceAfterQuestionOrExclamationRule(options = {}) {
+	const result = v.safeParse(v.pipe(v.string(), v.check(validAdditionalSentenceEndingMarks)), options.additionalSentenceEndingMarks === void 0 ? "" : options.additionalSentenceEndingMarks);
+	if (!result.success) return ManuscriptResult.fail({
+		kind: "InvalidRuleOptions",
+		ruleId: RULE_ID,
+		option: "additionalSentenceEndingMarks",
+		issues: ValidationIssue.from(result.issues)
+	});
+	return ManuscriptResult.succeed(build(result.output));
+}
 //#endregion
 //#region src/proofreading/rules/variant-character.ts
 /**
@@ -809,4 +820,4 @@ function createDefaultProofreadingRules() {
 	];
 }
 //#endregion
-export { InvalidRuleOptions, ProofreadError, ProofreadingRuleMeta, consistentKanjiOpeningRule, consistentLatinWidthRule, consistentNumeralWidthRule, createConsistentKanjiOpeningRule, createDashRule, createDefaultProofreadingRules, createMaxArabicNumeralDigitsRule, createParagraphOpeningRule, dashRule, ellipsisCharacterRule, evenEllipsisRule, fullwidthJapanesePunctuationRule, maxArabicNumeralDigitsRule, minusBeforeNumberRule, noConsecutiveInterpunctRule, noConsecutivePunctuationRule, paragraphOpeningRule, proofreadManuscript, punctuationBeforeClosingQuoteRule, spaceAfterQuestionOrExclamationRule, variantCharacterRule };
+export { InvalidRuleOptions, ProofreadError, ProofreadingRuleMeta, consistentKanjiOpeningRule, consistentLatinWidthRule, consistentNumeralWidthRule, createConsistentKanjiOpeningRule, createDashRule, createDefaultProofreadingRules, createMaxArabicNumeralDigitsRule, createParagraphOpeningRule, createSpaceAfterQuestionOrExclamationRule, dashRule, ellipsisCharacterRule, evenEllipsisRule, fullwidthJapanesePunctuationRule, maxArabicNumeralDigitsRule, minusBeforeNumberRule, noConsecutiveInterpunctRule, noConsecutivePunctuationRule, paragraphOpeningRule, proofreadManuscript, punctuationBeforeClosingQuoteRule, spaceAfterQuestionOrExclamationRule, variantCharacterRule };