@akairos/typeset-studio 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akairos/typeset-studio",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Algorithmic typesetting studio & zzhub-pipeline image renderer plugin",
   "publishConfig": {
     "access": "public"
@@ -55,13 +55,10 @@
   "dependencies": {
     "@chenglou/pretext": "^0.0.8",
     "@napi-rs/canvas": "^1.0.10",
-    "clsx": "^2.1.1",
     "hono": "^4.7.4",
-    "html-to-image": "^1.11.11",
     "lucide-react": "^1.16.0",
     "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "tailwind-merge": "^3.0.2"
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/adapter.ts

@@ -2,8 +2,8 @@ import { mkdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { renderTypesetResultToPngs } from "./core/canvas-renderer";
 import { scanLocalFonts } from "./core/font-loader";
-import { FlowImage } from "./core/types";
-import { resolveTypesetResult } from "./server/routes/render";
+import type { FlowImage } from "./core/types";
+import { resolveTypesetResult, type RenderRequestBody } from "./server/routes/render";
 
 // ── Typeset Studio & zzhub-pipeline compatible types ──────────────
 
@@ -102,11 +102,13 @@ export interface ImageRenderPlugin {
 
 // ── Helpers ───────────────────────────────────────────────────────
 
+// 清理流水线标题中的 Markdown 标记。
 function cleanTitle(raw: string): string {
   if (!raw) return "未命名文章";
   return raw.replace(/^#+\s*/, "").trim();
 }
 
+// 将流水线图片标记映射为页码和排版预设。
 function mapBodyImages(
   bodyImages?: Array<{ marker: string; path: string }>,
   pageSpecs?: ImageRenderInput["pageSpecs"],
@@ -131,23 +133,24 @@ function mapBodyImages(
       src: img.path,
       alt: img.marker,
       pageIndex: spec?.page,
-      layoutPreset: (spec?.imageLayout as any) || "mid-right",
+      layoutPreset: (spec?.imageLayout as FlowImage["layoutPreset"]) || "mid-right",
     };
   });
 }
 
 // ── Typeset Studio Pipeline Adapter ───────────────────────────────
 
+// 配置远程地址后，由独立服务负责图片渲染。
 const REMOTE_STUDIO_URL = process.env.TYPESET_STUDIO_URL?.replace(/\/$/, "");
 
+// 下载远程生成的页面，并写入流水线输出目录。
 async function renderRemoteBatch(
   studioUrl: string,
-  body: any,
+  body: RenderRequestBody,
   outputDir: string,
-  filenamePrefix: string,
   route: "wechat-article" | "wechat-newspic",
   kind: "cover" | "page",
-): Promise<{ assets: RenderAsset[]; pageCount: number; pages: ImageRenderOutput["pages"] }> {
+): Promise<ImageRenderOutput> {
   const res = await fetch(`${studioUrl}/api/render/export`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -164,13 +167,12 @@ async function renderRemoteBatch(
   const assets: RenderAsset[] = [];
   const pagesSummary: ImageRenderOutput["pages"] = [];
 
-  for (let i = 0; i < data.pages.length; i++) {
-    const pageItem = data.pages[i];
+  for (const pageItem of data.pages) {
     const pageNum = pageItem.pageNumber;
     const base64Data = pageItem.dataUrl.replace(/^data:image\/png;base64,/, "");
     const buffer = Buffer.from(base64Data, "base64");
     const filename =
-      kind === "cover" ? "cover.png" : `${filenamePrefix}-${String(pageNum).padStart(2, "0")}.png`;
+      kind === "cover" ? "cover.png" : `article-${String(pageNum).padStart(2, "0")}.png`;
     const filePath = join(outputDir, filename);
     await writeFile(filePath, buffer);
 
@@ -190,18 +192,51 @@ async function renderRemoteBatch(
   return { assets, pageCount: data.pageCount, pages: pagesSummary };
 }
 
+// 本地渲染与远程服务共用请求，保留各自的图片输出方式。
+async function renderLocalBatch(
+  body: RenderRequestBody,
+  outputDir: string,
+  route: RenderAsset["route"],
+  kind: RenderAsset["kind"],
+): Promise<ImageRenderOutput> {
+  const { result } = resolveTypesetResult(body);
+  const pngs = await renderTypesetResultToPngs(result);
+  const outputs = kind === "cover" ? pngs.slice(0, 1) : pngs;
+  if (kind === "cover" && outputs.length === 0) {
+    throw new Error("Typeset Studio failed to render cover buffer");
+  }
+
+  const assets: RenderAsset[] = [];
+  const pages: ImageRenderOutput["pages"] = [];
+  for (const [index, output] of outputs.entries()) {
+    const pageNumber = index + 1;
+    const filename = kind === "cover"
+      ? "cover.png"
+      : `article-${String(pageNumber).padStart(2, "0")}.png`;
+    const path = join(outputDir, filename);
+    await writeFile(path, output.buffer);
+    assets.push({ kind, route, path, ...(kind === "page" ? { index: pageNumber } : {}) });
+    const images = result.pages[index].images;
+    pages.push({
+      page: pageNumber,
+      imageCount: images.length,
+      imageSources: images.map((image) => image.src),
+    });
+  }
+  return { assets, pageCount: outputs.length, pages };
+}
+
 export const typesetStudioAdapter: ImageRenderPlugin = {
   name: "typeset-studio",
-  version: "0.2.0",
+  version: "0.2.2",
 
   async doctor(): Promise<PipelinePluginDoctorCheck[]> {
     const checks: PipelinePluginDoctorCheck[] = [];
 
-    // 0. Remote cloud service check (if TYPESET_STUDIO_URL is set)
     if (REMOTE_STUDIO_URL) {
       try {
         const res = await fetch(`${REMOTE_STUDIO_URL}/api/health`);
-        const data = (await res.json()) as any;
+        const data = (await res.json()) as { name?: string };
         checks.push({
           name: "remote-service",
           ok: res.ok,
@@ -216,7 +251,6 @@ export const typesetStudioAdapter: ImageRenderPlugin = {
       }
     }
 
-    // 1. Skia engine check (for local/in-process rendering)
     try {
       const { createCanvas } = await import("@napi-rs/canvas");
       const canvas = createCanvas(10, 10);
@@ -231,14 +265,13 @@ export const typesetStudioAdapter: ImageRenderPlugin = {
     } catch (err) {
       checks.push({
         name: "@napi-rs/canvas",
-        ok: !REMOTE_STUDIO_URL,
+        ok: Boolean(REMOTE_STUDIO_URL),
         message: REMOTE_STUDIO_URL
           ? "@napi-rs/canvas not installed locally (using Cloud Typeset Studio microservice)"
           : `@napi-rs/canvas initialization failed: ${err}`,
       });
     }
 
-    // 2. Local fonts check
     try {
       const localFonts = scanLocalFonts();
       checks.push({
@@ -258,266 +291,51 @@ export const typesetStudioAdapter: ImageRenderPlugin = {
   },
 
   async render(input: ImageRenderInput): Promise<ImageRenderOutput> {
-    const { route, outputDir, title, bodyText, state } = input;
+    const { route, outputDir, bodyText, state } = input;
     await mkdir(outputDir, { recursive: true });
+    if (route === "blog") return { assets: [], pageCount: 0, pages: [] };
 
     const account = state.route.account || "default";
-    const highlightWords = state.route.highlight_words || [];
-    const footerText = input.accountVisualParams?.footer;
-    const watermarkText = account ? `@${account}` : undefined;
-    const effectiveTitle = cleanTitle(title || state.metadata?.title || "");
-
-    // ── 0. Optional: Remote Cloud Microservice Mode ─────────────
-    if (REMOTE_STUDIO_URL) {
-      if (route === "wechat-article") {
-        const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-        return await renderRemoteBatch(
-          REMOTE_STUDIO_URL,
-          {
-            slot: "article_cover",
-            route: "wechat-article",
-            account,
-            title: effectiveTitle,
-            markdown: `# ${effectiveTitle}`,
-            template: input.template,
-            images: coverImages,
-            highlightWords,
-            config: { footerText, watermarkText },
-          },
-          outputDir,
-          "cover",
-          "wechat-article",
-          "cover",
-        );
-      }
-
-      if (route === "wechat-newspic") {
-        const newspicSpec = state.intent?.newspic_render;
-        const paginationMode =
-          input.template === "longform-3-4"
-            ? "multi"
-            : input.template === "poster-3-4"
-            ? "single"
-            : newspicSpec?.pagination_mode || "multi";
-
-        const isMultiPage = paginationMode === "multi";
-        const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-
-        // Remote cover
-        const coverRes = await renderRemoteBatch(
-          REMOTE_STUDIO_URL,
-          {
-            slot: "newspic_cover",
-            route: "wechat-newspic",
-            kind: "cover",
-            account,
-            title: effectiveTitle,
-            markdown: `# ${effectiveTitle}`,
-            template: input.template,
-            images: coverImages,
-            highlightWords,
-            config: { footerText, watermarkText },
-          },
-          outputDir,
-          "cover",
-          "wechat-newspic",
-          "cover",
-        );
-
-        if (!isMultiPage) {
-          return coverRes;
-        }
-
-        // Remote content pages
-        const contentImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-        const contentRes = await renderRemoteBatch(
-          REMOTE_STUDIO_URL,
-          {
-            slot: "newspic_content",
-            route: "wechat-newspic",
-            kind: "content",
-            account,
-            title: effectiveTitle,
-            markdown: bodyText || `# ${effectiveTitle}`,
-            template: input.template,
-            images: contentImages,
-            highlightWords,
-            config: { footerText, watermarkText },
-          },
-          outputDir,
-          "article",
-          "wechat-newspic",
-          "page",
-        );
-
-        return {
-          assets: [...coverRes.assets, ...contentRes.assets],
-          pageCount: contentRes.pageCount,
-          pages: contentRes.pages,
-        };
-      }
-    }
-
-    // ── 1. Route: wechat-article (2.35:1 Cover only) ─────────────
-    if (route === "wechat-article") {
-      const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-
-      const resolved = resolveTypesetResult({
-        slot: "article_cover",
-        route: "wechat-article",
-        account,
-        title: effectiveTitle,
-        markdown: `# ${effectiveTitle}`,
-        template: input.template,
-        images: coverImages,
-        highlightWords,
-        config: {
-          footerText: footerText ?? undefined,
-          watermarkText: watermarkText ?? undefined,
-        },
-      });
-
-      const pngOutputs = await renderTypesetResultToPngs(resolved.result);
-      const coverBuffer = pngOutputs[0]?.buffer;
-      if (!coverBuffer) {
-        throw new Error("Typeset Studio failed to render cover buffer");
-      }
-      const coverPath = join(outputDir, "cover.png");
-      await writeFile(coverPath, coverBuffer);
-
-      const asset: RenderAsset = {
-        kind: "cover",
-        route: "wechat-article",
-        path: coverPath,
-      };
-
-      return {
-        assets: [asset],
-        pageCount: 1,
-        pages: [
-          {
-            page: 1,
-            imageCount: resolved.result.pages[0]?.images.length || 0,
-            imageSources: (resolved.result.pages[0]?.images || []).map((img) => img.src),
-          },
-        ],
-      };
-    }
-
-    // ── 2. Route: blog (no image rendering required) ──────────────
-    if (route === "blog") {
-      return {
-        assets: [],
-        pageCount: 0,
-        pages: [],
-      };
-    }
-
-    // ── 3. Route: wechat-newspic (Poster Cover + Multi-page Content) ─
-    const newspicSpec = state.intent?.newspic_render;
-    const paginationMode =
-      input.template === "longform-3-4"
-        ? "multi"
-        : input.template === "poster-3-4"
-        ? "single"
-        : newspicSpec?.pagination_mode || "multi";
-
-    const isMultiPage = paginationMode === "multi";
-    const assets: RenderAsset[] = [];
-    const pagesSummary: ImageRenderOutput["pages"] = [];
-
-    // 3.1 Render Poster Cover (3:4)
-    const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-    const resolvedCover = resolveTypesetResult({
-      slot: "newspic_cover",
-      route: "wechat-newspic",
-      kind: "cover",
+    const title = cleanTitle(input.title || state.metadata?.title || "");
+    const common: RenderRequestBody = {
       account,
-      title: effectiveTitle,
-      markdown: `# ${effectiveTitle}`,
+      title,
       template: input.template,
-      images: coverImages,
-      highlightWords,
-      config: {
-        footerText: footerText ?? undefined,
-        watermarkText: watermarkText ?? undefined,
-      },
-    });
-
-    const coverPngs = await renderTypesetResultToPngs(resolvedCover.result);
-    const coverBuffer = coverPngs[0]?.buffer;
-    if (!coverBuffer) {
-      throw new Error("Typeset Studio failed to render newspic cover buffer");
-    }
-    const coverPath = join(outputDir, "cover.png");
-    await writeFile(coverPath, coverBuffer);
-    assets.push({
-      kind: "cover",
-      route: "wechat-newspic",
-      path: coverPath,
-    });
-
-    // 3.2 If single-page mode, return immediately
-    if (!isMultiPage) {
-      return {
-        assets,
-        pageCount: 1,
-        pages: [
-          {
-            page: 1,
-            imageCount: resolvedCover.result.pages[0]?.images.length || 0,
-            imageSources: (resolvedCover.result.pages[0]?.images || []).map((img) => img.src),
-          },
-        ],
-      };
-    }
+      images: mapBodyImages(input.bodyImages, input.pageSpecs),
+      highlightWords: state.route.highlight_words || [],
+      config: { footerText: input.accountVisualParams?.footer, watermarkText: `@${account}` },
+    };
+    const articleCover = route === "wechat-article";
+    const renderRoute = articleCover ? "wechat-article" : "wechat-newspic";
+
+    // 统一封面和正文的请求构造，传输方式只在这里分流。
+    const renderBatch = (body: RenderRequestBody, kind: RenderAsset["kind"]) =>
+      REMOTE_STUDIO_URL && (route === "wechat-article" || route === "wechat-newspic")
+        ? renderRemoteBatch(REMOTE_STUDIO_URL, body, outputDir, renderRoute, kind)
+        : renderLocalBatch(body, outputDir, renderRoute, kind);
+
+    const cover = await renderBatch({
+      ...common,
+      route: renderRoute,
+      slot: articleCover ? "article_cover" : "newspic_cover",
+      ...(articleCover ? {} : { kind: "cover" }),
+      markdown: `# ${title}`,
+    }, "cover");
+    const paginationMode = input.template === "longform-3-4"
+      ? "multi"
+      : input.template === "poster-3-4"
+        ? "single"
+        : state.intent?.newspic_render?.pagination_mode || "multi";
+    if (articleCover || paginationMode !== "multi") return cover;
 
-    // 3.3 Render Content Pages (3:4 Multi-page longform)
-    const contentImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-    const resolvedContent = resolveTypesetResult({
-      slot: "newspic_content",
+    const content = await renderBatch({
+      ...common,
       route: "wechat-newspic",
       kind: "content",
-      account,
-      title: effectiveTitle,
-      markdown: bodyText || `# ${effectiveTitle}`,
-      template: input.template,
-      images: contentImages,
-      highlightWords,
-      config: {
-        footerText: footerText ?? undefined,
-        watermarkText: watermarkText ?? undefined,
-      },
-    });
-
-    const contentPngs = await renderTypesetResultToPngs(resolvedContent.result);
-
-    for (let i = 0; i < contentPngs.length; i++) {
-      const pageNum = i + 1;
-      const fileName = `article-${String(pageNum).padStart(2, "0")}.png`;
-      const pagePath = join(outputDir, fileName);
-      await writeFile(pagePath, contentPngs[i].buffer);
-
-      assets.push({
-        kind: "page",
-        route: "wechat-newspic",
-        index: pageNum,
-        path: pagePath,
-      });
-
-      const flowPage = resolvedContent.result.pages[i];
-      pagesSummary.push({
-        page: pageNum,
-        imageCount: flowPage?.images.length || 0,
-        imageSources: (flowPage?.images || []).map((img) => img.src),
-      });
-    }
-
-    return {
-      assets,
-      pageCount: contentPngs.length,
-      pages: pagesSummary,
-    };
+      slot: "newspic_content",
+      markdown: bodyText || `# ${title}`,
+    }, "page");
+    return { ...content, assets: [...cover.assets, ...content.assets] };
   },
 };
 

package/src/core/canvas-draw.ts

@@ -12,16 +12,16 @@ export function resolveCanvasFontFamily(fontName: string, isServer: boolean = fa
   const trimmed = rawFirst.replace(/["'\\]/g, "").trim();
 
   // 1. Explicit font priority matching: The chosen font family MUST come first
-  if (trimmed.includes("Noto Sans") || trimmed === "Noto Sans SC") {
+  if (trimmed.includes("Noto Sans")) {
     return isServer ? '"Hiragino Sans GB", sans-serif' : '"Noto Sans SC", "PingFang SC", sans-serif';
   }
-  if (trimmed.includes("PingFang") || trimmed === "PingFang SC") {
+  if (trimmed.includes("PingFang")) {
     return isServer ? '"Hiragino Sans GB", sans-serif' : '"PingFang SC", "Noto Sans SC", sans-serif';
   }
-  if (trimmed.includes("Noto Serif") || trimmed === "Noto Serif SC") {
+  if (trimmed.includes("Noto Serif")) {
     return isServer ? '"Songti SC", serif' : '"Noto Serif SC", "Songti SC", serif';
   }
-  if (trimmed.includes("Songti") || trimmed === "Songti SC" || trimmed === "STSong") {
+  if (trimmed.includes("Songti") || trimmed === "STSong") {
     return isServer ? '"Songti SC", serif' : '"Songti SC", "Noto Serif SC", serif';
   }
   if (trimmed.includes("Kai") || trimmed.includes("WenKai")) {
@@ -29,7 +29,7 @@ export function resolveCanvasFontFamily(fontName: string, isServer: boolean = fa
       ? '"STKaiti", "Kaiti SC", "Songti SC", serif'
       : '"LXGW WenKai GB Screen", "LXGW WenKai Screen", "Kaiti SC", "STKaiti", serif';
   }
-  if (trimmed.includes("Yuan") || trimmed.includes("Yuanti")) {
+  if (trimmed.includes("Yuan")) {
     return isServer
       ? '"STYuanti", "Yuanti SC", "Hiragino Sans GB", sans-serif'
       : '"Yuanti SC", "STYuanti", "PingFang SC", sans-serif';
@@ -43,7 +43,7 @@ export function resolveCanvasFontFamily(fontName: string, isServer: boolean = fa
 
   // 2. Generic fallbacks (including custom and project-local fonts)
   if (trimmed.toLowerCase().includes("serif") || trimmed.includes("Song")) {
-    return isServer ? `"${trimmed}", "Songti SC", serif` : `"${trimmed}", "Songti SC", serif`;
+    return `"${trimmed}", "Songti SC", serif`;
   }
   return isServer
     ? `"${trimmed}", "Hiragino Sans GB", "PingFang SC", sans-serif`
@@ -93,7 +93,7 @@ export async function drawPageToContext(
   ctx.restore();
 
   // 2. Compute Stage Layout Dimensions
-  const { stageWidth, stageHeight, stageX, stageY } = computeStageDimensions(
+  const { stageX, stageY } = computeStageDimensions(
     spec,
     algorithm.safeArea,
     algorithm.contentBottomGap,
@@ -111,7 +111,7 @@ export async function drawPageToContext(
     // Keep header bar in safe upper margin, safely above stageY
     const headerY = Math.max(24, Math.floor(algorithm.safeArea.top * 0.45));
 
-    if (showWatermark && config.watermarkText?.trim()) {
+    if (showWatermark) {
       ctx.save();
       ctx.font = resolveCanvasFont("600 14px PingFang SC", isServer);
       ctx.fillStyle = theme.watermarkColor;
@@ -286,7 +286,7 @@ export async function drawPageToContext(
       ctx.restore();
     }
 
-    if (showFooterText && config.footerText?.trim()) {
+    if (showFooterText) {
       ctx.save();
       ctx.font = resolveCanvasFont('500 13px PingFang SC', isServer);
       ctx.fillStyle = theme.watermarkColor || theme.captionColor;

package/src/core/engine.ts

@@ -4,7 +4,6 @@ import { paginateBlocks } from "./obstacle-flow";
 import { computeBlockStyles } from "./typography";
 import { resolveImagePlacement } from "./image-layout";
 import {
-  ContentBlock,
   FlowBlock,
   FlowImage,
   FlowPage,
@@ -12,7 +11,7 @@ import {
   TypesetResult,
 } from "./types";
 
-export function getDefaultConfig(aspectRatio = "longform-3-4" as TypesetConfig["aspectRatio"]): TypesetConfig {
+export function getDefaultConfig(aspectRatio: TypesetConfig["aspectRatio"] = "longform-3-4"): TypesetConfig {
   const spec = getCanvasSpec(aspectRatio);
   const isCover = aspectRatio === "wechat-cover-2.35";
   const isSquare = aspectRatio === "square-1-1";
@@ -94,6 +93,17 @@ export function runTypeset(params: {
     bodyFont: config.typography.bodyFont,
   });
 
+  // 自动分页和手动分页共用相同的文字块样式。
+  const createFlowBlocks = (text: string): FlowBlock[] => parseContentBlocks(text).map((block) => ({
+    ...blockStyles[block.kind],
+    kind: block.kind,
+    text: block.text,
+    runs: parseInlineRuns(block.text, highlightWords),
+    bullet: block.kind === "list-item" ? block.bullet ?? "•" : undefined,
+    textIndent: block.kind === "list-item" ? 28 : block.kind === "quote" ? 20 : 0,
+    keepWithNext: ["heading", "subheading", "minor-heading"].includes(block.kind),
+  }));
+
   // Check if explicit page markers exist
   const pageSegments = splitTextByPages(markdown);
   let pages: FlowPage[] = [];
@@ -102,16 +112,7 @@ export function runTypeset(params: {
     // Multi-page explicit segmentation
     pages = pageSegments.map((segmentText, index) => {
       const pageNum = index + 1;
-      const rawBlocks = parseContentBlocks(segmentText);
-      const flowBlocks: FlowBlock[] = rawBlocks.map((b) => ({
-        ...blockStyles[b.kind],
-        kind: b.kind,
-        text: b.text,
-        runs: parseInlineRuns(b.text, highlightWords),
-        bullet: b.kind === "list-item" ? b.bullet ?? "•" : undefined,
-        textIndent: b.kind === "list-item" ? 28 : b.kind === "quote" ? 20 : 0,
-        keepWithNext: ["heading", "subheading", "minor-heading"].includes(b.kind),
-      }));
+      const flowBlocks = createFlowBlocks(segmentText);
 
       // Match images explicitly configured for this page (img.pageIndex === pageNum).
       // If an image has no pageIndex, fallback to Page 1 (index === 0).
@@ -147,16 +148,7 @@ export function runTypeset(params: {
     });
   } else {
     // Single page or auto-flowing pagination
-    const rawBlocks = parseContentBlocks(markdown);
-    const flowBlocks: FlowBlock[] = rawBlocks.map((b) => ({
-      ...blockStyles[b.kind],
-      kind: b.kind,
-      text: b.text,
-      runs: parseInlineRuns(b.text, highlightWords),
-      bullet: b.kind === "list-item" ? b.bullet ?? "•" : undefined,
-      textIndent: b.kind === "list-item" ? 28 : b.kind === "quote" ? 20 : 0,
-      keepWithNext: ["heading", "subheading", "minor-heading"].includes(b.kind),
-    }));
+    const flowBlocks = createFlowBlocks(markdown);
 
     pages = paginateBlocks(flowBlocks, stageWidth, stageHeight, images, {
       obstacleGap: config.algorithm.obstacleGap,

package/src/core/pretext.ts

@@ -2,17 +2,9 @@ export {
   prepareRichInline,
   layoutNextRichInlineLineRange,
   materializeRichInlineLineRange,
-  measureRichInlineStats,
 } from "@chenglou/pretext/rich-inline";
 export type { RichInlineCursor } from "@chenglou/pretext/rich-inline";
 
-export {
-  prepare,
-  layoutNextLineRange,
-  materializeLineRange,
-  measureLineStats,
-} from "@chenglou/pretext";
-
 let initialized = false;
 
 /**

package/src/core/template.ts

@@ -1,4 +1,4 @@
-import { FlowImage, TypesetConfig } from "./types";
+import { FlowImage } from "./types";
 
 /**
  * Applies template image layout configurations to current content images based on index intersection:

package/src/core/typography.ts

@@ -1,19 +1,5 @@
 import { ContentBlockKind } from "./types";
 
-export interface TypographicScale {
-  base: number;
-  ratio: number;
-}
-
-export const MODULAR_SCALES: Record<string, number> = {
-  minorSecond: 1.067,
-  majorSecond: 1.125,
-  minorThird: 1.2,
-  majorThird: 1.25,
-  perfectFourth: 1.333,
-  goldenRatio: 1.618,
-};
-
 export function modularScale(base: number, ratio: number, step: number): number {
   return Math.round(base * Math.pow(ratio, step));
 }

package/src/index.ts

@@ -31,14 +31,14 @@ export { resolveTypesetResult, type RenderRequestBody } from "./server/routes/re
 
 export type {
   AlgorithmParams,
-  AspectRatioPreset,
+  AspectRatioType,
   CanvasSpec,
   ContentBlockKind,
   FlowBlock,
   FlowImage,
   FlowLine,
   FlowPage,
-  InlineFragment,
+  FlowLineFragment,
   TemplateSlot,
   ThemeColors,
   TypesetChromeConfig,