@sushichan044/kg-core 0.10.2 → 0.11.0

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

@@ -99,6 +99,24 @@ const ParsedManuscript = {
 	})))
 };
 //#endregion
+//#region src/appearance/a5-page-format.ts
+const A5_PAGE_FORMAT = {
+	fontSizeQ: 12.7,
+	flow: {
+		lineLengthEm: 27,
+		linesPerStage: 23,
+		stagesPerPage: 2
+	},
+	page: {
+		lineGapMm: 1.825,
+		stageGapMm: 10,
+		topMm: 12,
+		bottomMm: 16.55,
+		innerMm: 21.825,
+		outerMm: 13
+	}
+};
+//#endregion
 //#region src/appearance/font-preset-id.ts
 const FontPresetIdSchema = v.picklist(["mincho", "gothic"]);
 const FontPresetId = {
@@ -106,17 +124,11 @@ const FontPresetId = {
 	is: (value) => v.is(FontPresetIdSchema, value)
 };
 //#endregion
-//#region src/appearance/font-size-pt.ts
-const RANGE = {
-	min: 6,
-	max: 24,
-	step: .5
-};
-const FontSizePtSchema = v.pipe(v.number(), v.finite(), v.minValue(RANGE.min), v.maxValue(RANGE.max), v.multipleOf(RANGE.step));
-const FontSizePt = {
-	schema: FontSizePtSchema,
-	range: RANGE,
-	is: (value) => v.is(FontSizePtSchema, value)
+//#region src/appearance/font-size-q.ts
+const FontSizeQSchema = v.pipe(v.number(), v.finite(), v.minValue(Number.MIN_VALUE));
+const FontSizeQ = {
+	schema: FontSizeQSchema,
+	is: (value) => v.is(FontSizeQSchema, value)
 };
 //#endregion
 //#region src/appearance/paper-size-id.ts
@@ -135,12 +147,12 @@ const PaperSizeId = {
 const ManuscriptAppearanceSettings = {
 	schema: readonlyObject({
 		paperSize: PaperSizeId.schema,
-		fontSizePt: FontSizePt.schema,
+		fontSizeQ: FontSizeQ.schema,
 		fontPreset: FontPresetId.schema
 	}),
 	defaults: {
 		paperSize: "a5",
-		fontSizePt: 9,
+		fontSizeQ: A5_PAGE_FORMAT.fontSizeQ,
 		fontPreset: "mincho"
 	}
 };
@@ -152,6 +164,110 @@ const LineOffset = {
 	total: (offset) => offset.leading + offset.trailing
 };
 //#endregion
+//#region src/appearance/paper-size.ts
+const PAPER_SIZES = {
+	a4: {
+		id: "a4",
+		label: "A4",
+		widthMm: 210,
+		heightMm: 297
+	},
+	a5: {
+		id: "a5",
+		label: "A5",
+		widthMm: 148,
+		heightMm: 210
+	},
+	a6: {
+		id: "a6",
+		label: "A6（文庫）",
+		widthMm: 105,
+		heightMm: 148
+	},
+	"jis-b5": {
+		id: "jis-b5",
+		label: "B5（JIS）",
+		widthMm: 182,
+		heightMm: 257
+	},
+	"jis-b6": {
+		id: "jis-b6",
+		label: "B6（JIS）",
+		widthMm: 128,
+		heightMm: 182
+	},
+	shinsho: {
+		id: "shinsho",
+		label: "新書",
+		widthMm: 106,
+		heightMm: 173
+	}
+};
+const PaperSize = {
+	of: (id) => PAPER_SIZES[id],
+	all: Object.values(PAPER_SIZES)
+};
+//#endregion
+//#region src/composer/page-settings.ts
+const length$1 = () => v.pipe(v.number(), v.finite(), v.minValue(0));
+const ManuscriptPageSettings = {
+	schema: readonlyObject({
+		lineGapMm: length$1(),
+		stageGapMm: length$1(),
+		topMm: length$1(),
+		bottomMm: length$1(),
+		innerMm: length$1(),
+		outerMm: length$1()
+	}),
+	defaults: A5_PAGE_FORMAT.page,
+	/**
+	* Centre a non-A5 text grid using half-cell line gaps and two-cell stage gaps.
+	*/
+	centered: (flow, appearance) => {
+		const cell = appearance.fontSizeQ / 4;
+		const paper = PaperSize.of(appearance.paperSize);
+		const lineGapMm = cell / 2;
+		const stageGapMm = cell * 2;
+		const horizontal = (paper.widthMm - flow.linesPerStage * cell - (flow.linesPerStage - 1) * lineGapMm) / 2;
+		const vertical = (paper.heightMm - flow.stagesPerPage * flow.lineLengthEm * cell - (flow.stagesPerPage - 1) * stageGapMm) / 2;
+		return {
+			lineGapMm,
+			stageGapMm,
+			topMm: vertical,
+			bottomMm: vertical,
+			innerMm: horizontal,
+			outerMm: horizontal
+		};
+	}
+};
+//#endregion
+//#region src/composer/manuscript-geometry.ts
+const length = () => v.pipe(v.number(), v.finite(), v.minValue(0));
+const ManuscriptGeometry = {
+	schema: readonlyObject({
+		...ManuscriptPageSettings.schema.entries,
+		paperWidthMm: length(),
+		paperHeightMm: length(),
+		cellSizeMm: length(),
+		fontSizeQ: FontSizeQ.schema,
+		contentWidthMm: length(),
+		contentHeightMm: length()
+	}),
+	of: (flow, appearance, page) => {
+		const paper = PaperSize.of(appearance.paperSize);
+		const cellSizeMm = appearance.fontSizeQ / 4;
+		return {
+			...page,
+			paperWidthMm: paper.widthMm,
+			paperHeightMm: paper.heightMm,
+			cellSizeMm,
+			fontSizeQ: appearance.fontSizeQ,
+			contentWidthMm: flow.linesPerStage * cellSizeMm + (flow.linesPerStage - 1) * page.lineGapMm,
+			contentHeightMm: flow.stagesPerPage * flow.lineLengthEm * cellSizeMm + (flow.stagesPerPage - 1) * page.stageGapMm
+		};
+	}
+};
+//#endregion
 //#region src/composer/manuscript-offsets.ts
 const MAX_DOCUMENT_OFFSET = 1e4;
 const ManuscriptOffsets = {
@@ -210,25 +326,49 @@ const NovelFlowSettings = {
 		stagesPerPage: boundedCount(RANGES.stagesPerPage)
 	}),
 	ranges: RANGES,
-	defaults: {
-		lineLengthEm: 27,
-		linesPerStage: 23,
-		stagesPerPage: 2
-	}
+	defaults: A5_PAGE_FORMAT.flow
 };
 //#endregion
 //#region src/composer/composition-settings.ts
 const NovelCompositionSettingsSchema = v.pipe(readonlyObject({
 	flow: NovelFlowSettings.schema,
 	offsets: ManuscriptOffsets.schema,
-	appearance: ManuscriptAppearanceSettings.schema
-}), 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"));
+	appearance: ManuscriptAppearanceSettings.schema,
+	page: ManuscriptPageSettings.schema
+}), 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"));
 const NovelCompositionSettings = {
 	schema: NovelCompositionSettingsSchema,
 	defaults: {
 		flow: NovelFlowSettings.defaults,
 		offsets: ManuscriptOffsets.defaults,
-		appearance: ManuscriptAppearanceSettings.defaults
+		appearance: ManuscriptAppearanceSettings.defaults,
+		page: ManuscriptPageSettings.defaults
+	},
+	/**
+	* Select the fixed A5 format, or centre the current grid on another paper size.
+	*/
+	forPaper: (paperSize, settings) => {
+		const appearance = {
+			...settings.appearance,
+			paperSize
+		};
+		if (paperSize === "a5") return {
+			...settings,
+			flow: A5_PAGE_FORMAT.flow,
+			appearance: {
+				...appearance,
+				fontSizeQ: A5_PAGE_FORMAT.fontSizeQ
+			},
+			page: A5_PAGE_FORMAT.page
+		};
+		return {
+			...settings,
+			appearance,
+			page: ManuscriptPageSettings.centered(settings.flow, appearance)
+		};
 	},
 	is: (value) => v.is(NovelCompositionSettingsSchema, value)
 };
@@ -1749,7 +1889,7 @@ const MeasurementSession = { create: (provider, settings) => {
 			kind,
 			presentation,
 			fontPreset: settings.appearance.fontPreset,
-			fontSizePt: settings.appearance.fontSizePt,
+			fontSizeQ: settings.appearance.fontSizeQ,
 			scale: 1,
 			writingMode: "vertical-rl"
 		} : {
@@ -1757,7 +1897,7 @@ const MeasurementSession = { create: (provider, settings) => {
 			kind,
 			presentation: "mixed",
 			fontPreset: settings.appearance.fontPreset,
-			fontSizePt: settings.appearance.fontSizePt,
+			fontSizeQ: settings.appearance.fontSizeQ,
 			scale: defaultBookStyle.annotation.sizeEm,
 			writingMode: "vertical-rl"
 		};
@@ -2578,121 +2718,6 @@ const SourceSpace = { collect: (graphemes, advancesEm) => {
 		return [];
 	});
 } };
-//#endregion
-//#region src/appearance/paper-size.ts
-const PAPER_SIZES = {
-	a4: {
-		id: "a4",
-		label: "A4",
-		widthMm: 210,
-		heightMm: 297
-	},
-	a5: {
-		id: "a5",
-		label: "A5",
-		widthMm: 148,
-		heightMm: 210
-	},
-	a6: {
-		id: "a6",
-		label: "A6（文庫）",
-		widthMm: 105,
-		heightMm: 148
-	},
-	"jis-b5": {
-		id: "jis-b5",
-		label: "B5（JIS）",
-		widthMm: 182,
-		heightMm: 257
-	},
-	"jis-b6": {
-		id: "jis-b6",
-		label: "B6（JIS）",
-		widthMm: 128,
-		heightMm: 182
-	},
-	shinsho: {
-		id: "shinsho",
-		label: "新書",
-		widthMm: 106,
-		heightMm: 173
-	}
-};
-const PaperSize = {
-	of: (id) => PAPER_SIZES[id],
-	all: Object.values(PAPER_SIZES)
-};
-//#endregion
-//#region src/internal/length.ts
-const PT_PER_MM = 72 / 25.4;
-function ptToMm(pt) {
-	return pt / PT_PER_MM;
-}
-function mmToPt(mm) {
-	return mm * PT_PER_MM;
-}
-//#endregion
-//#region src/composer/manuscript-geometry.ts
-const STAGE_GAP_CELLS = 2;
-const LINE_GAP_CELLS = .5;
-const nonNegativeLength = () => v.pipe(v.number(), v.finite(), v.minValue(0));
-const ManuscriptGeometrySchema = readonlyObject({
-	paperWidthMm: nonNegativeLength(),
-	paperHeightMm: nonNegativeLength(),
-	cellSizeMm: nonNegativeLength(),
-	lineGapMm: nonNegativeLength(),
-	fontSizePt: FontSizePt.schema,
-	contentWidthMm: nonNegativeLength(),
-	contentHeightMm: nonNegativeLength(),
-	marginInlineMm: v.pipe(v.number(), v.finite()),
-	marginBlockMm: v.pipe(v.number(), v.finite()),
-	fitsPaper: v.boolean()
-});
-/**
-* Every stage stacked vertically, plus the gap between adjacent stages.
-*/
-function contentHeightInEm(flow) {
-	return flow.stagesPerPage * flow.lineLengthEm + STAGE_GAP_CELLS * (flow.stagesPerPage - 1);
-}
-/**
-* Every vertical line side by side, plus the gap between adjacent lines.
-*/
-function contentWidthInEm(flow) {
-	return flow.linesPerStage + LINE_GAP_CELLS * (flow.linesPerStage - 1);
-}
-const ManuscriptGeometry = {
-	schema: ManuscriptGeometrySchema,
-	of: (flow, appearance) => {
-		const paper = PaperSize.of(appearance.paperSize);
-		const cellSizeMm = ptToMm(appearance.fontSizePt);
-		const contentWidthMm = contentWidthInEm(flow) * cellSizeMm;
-		const contentHeightMm = contentHeightInEm(flow) * cellSizeMm;
-		const marginInlineMm = (paper.widthMm - contentWidthMm) / 2;
-		const marginBlockMm = (paper.heightMm - contentHeightMm) / 2;
-		return {
-			paperWidthMm: paper.widthMm,
-			paperHeightMm: paper.heightMm,
-			cellSizeMm,
-			lineGapMm: LINE_GAP_CELLS * cellSizeMm,
-			fontSizePt: appearance.fontSizePt,
-			contentWidthMm,
-			contentHeightMm,
-			marginInlineMm,
-			marginBlockMm,
-			fitsPaper: marginInlineMm >= 0 && marginBlockMm >= 0
-		};
-	},
-	/**
-	* The largest step-aligned point size whose text area still fits the paper.
-	*/
-	maxFontSizePt: (flow, paperSizeId) => {
-		const paper = PaperSize.of(paperSizeId);
-		const maxCellSizeMm = Math.min(paper.widthMm / contentWidthInEm(flow), paper.heightMm / contentHeightInEm(flow));
-		const steps = Math.floor(mmToPt(maxCellSizeMm) / FontSizePt.range.step + 1e-9);
-		const aligned = Math.round(steps * FontSizePt.range.step * 1e3) / 1e3;
-		return Math.min(FontSizePt.range.max, Math.max(FontSizePt.range.min, aligned));
-	}
-};
 const CompositionStatistics = { schema: readonlyObject({
 	chars: nonNegativeInteger(),
 	sourceLines: nonNegativeInteger(),
@@ -3400,7 +3425,7 @@ function createCompose(provider) {
 		], settings);
 		return ManuscriptResult.succeed({
 			pages,
-			geometry: ManuscriptGeometry.of(settings.flow, settings.appearance),
+			geometry: ManuscriptGeometry.of(settings.flow, settings.appearance, settings.page),
 			stats: {
 				chars: sourceLines.reduce((total, line) => total + line.length, 0),
 				sourceLines: sourceLines.length,
@@ -3419,4 +3444,4 @@ function createNovelComposer(options) {
 }
 const novelComposer = createNovelComposer({ measurer: logicalRunMeasurer });
 //#endregion
-export { PaperSize as a, MeasurementTextRange as c, ManuscriptOffsets as d, ManuscriptAppearanceSettings as f, ParsedManuscript as g, FontPresetId as h, ManuscriptGeometry as i, NovelCompositionSettings as l, FontSizePt as m, novelComposer as n, RunMeasurement as o, PaperSizeId as p, logicalRunMeasurer as r, MeasuredCluster as s, createNovelComposer as t, NovelFlowSettings as u };
+export { ParsedManuscript as _, MeasuredCluster as a, NovelFlowSettings as c, ManuscriptPageSettings as d, PaperSize as f, FontPresetId as g, FontSizeQ as h, RunMeasurement as i, ManuscriptOffsets as l, PaperSizeId as m, novelComposer as n, MeasurementTextRange as o, ManuscriptAppearanceSettings as p, logicalRunMeasurer as r, NovelCompositionSettings as s, createNovelComposer as t, ManuscriptGeometry as u };

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, d as ManuscriptComposer, f as ManuscriptParser, o as logicalRunMeasurer, p as Rejection, r as createNovelComposer, s as RunMeasurement, t as PresentationKind } from "./presentation-kind-BwIZFSZS.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-BCQndPoK.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 { c as MeasurementTextRange, g as ParsedManuscript, h as FontPresetId, m as FontSizePt, o as RunMeasurement, r as logicalRunMeasurer, s as MeasuredCluster, t as createNovelComposer } from "./novel-composer-CHNWyvn8.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 * as v from "valibot";
 const PresentationKind = { schema: v.picklist([
 	"mixed",
@@ -12,7 +12,7 @@ const PresentationKind = { schema: v.picklist([
 const context = {
 	text: v.string(),
 	fontPreset: FontPresetId.schema,
-	fontSizePt: FontSizePt.schema,
+	fontSizeQ: FontSizeQ.schema,
 	scale: v.pipe(v.number(), v.finite(), v.minValue(Number.MIN_VALUE)),
 	writingMode: v.literal("vertical-rl")
 };