dsh-ppt 0.4.1 → 0.4.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.4.3（2026-09-18）
+
+- 修复：中文分句导致正文丢内容；`--content deck.md` 不读文件；>8 条要点静默丢弃；`deck.json` 版本写死；英文 deck 被标 zh-CN。
+- 稳健性：三件套改为 tmp + rename 原子提交（失败回滚）；过滤 Windows 保留名；文件名探测改一次目录快照。
+- 测试 48 → 60 项。
+## 0.4.2（2026-09-11）
+
+- 适配并验证官方 Harness 0.1.5-rc.1：整套同载、工具/技能契约与 Web 鉴权检查通过。
+- Node 要求与宿主统一为 `^22.19.0 || >=24.0.0`；更新中英文兼容性说明。
+
+## 0.4.1
+
+- 修复中文正文分页：中英文标点都作为句子边界，无标题纯文本严格按「每 5 句一页」分页，不再把整段中文当一句而截断丢正文。
+- CLI `--content <path>` 与 `--content @<path>` 行为一致：路径存在即读取文件，README / SKILL.md 示例可直接复制运行。
+- 单节要点超过 8 条时自动续页（第二页起标题带「（续）」），不再静默丢弃第 9 条之后的要点。
+- manifest `version` 改从 `package.json` 读取，消除与发版号的漂移；测试同步改为动态断言。
+- PPTX 文本与备注 run 的语言跟随 `lang`（zh-CN / en-US），英文 deck 不再被 PowerPoint 标成中文。
+
 ## 0.4.0
 
 - **动效（motion，默认开）**：HTML 放映页间淡入 + 要点按序逐条入场（打印自动兜底为静态）；PPTX 每页原生淡入转场，`bullets` 页按段落构建、放映时点击一次出现一条要点（PowerPoint「出现，按段落」标准时序）。

package/README.en.md

@@ -30,7 +30,7 @@ Example:
 
 ## Compatibility
 
-Verified against the tool and skill registration contracts in `@deepseek-ai/dsh@0.1.2-rc.1` on 2026-09-04 (no relevant API or documentation changes from alpha.5). Built for the cordis patch-bundle plugin model (`cordis.patch.yml` + `dsh.bundle.patch`). No runtime imports of `@deepseek-ai/*` internals.
+Verified with official `@deepseek-ai/dsh@0.1.5-rc.1` and Node `24.16.0` on 2026-09-11: all 18 components load alongside Modlens, with passing tool-schema, skill-registration and offline read-only invocation checks. Uses the `cordis.patch.yml` + `dsh.bundle.patch` bundle model. Node requirements match this Harness release: 22.19 or later within 22.x, or 24 or later. Live external-service workflows require separate configuration and validation.
 
 ## Installation
 
@@ -128,7 +128,7 @@ Output paths resolve against each tool call's `exec.agent.session.header.cwd`: o
 
 - `lang` argument: `zh` (default) / `en` / `bilingual` controls the player UI, page numbers, and closing defaults.
 - Content language is up to the author: for a bilingual deck, prefer "Chinese title + English subtitle" or generate two decks from the same outline.
-- Plugin docs, skill content, and error messages are bilingual.
+- Plugin docs come in Chinese (README.md) and English (this file); CLI and skill error messages are in Chinese.
 
 ## Engineering quality
 

package/README.md

@@ -32,7 +32,7 @@ DSH（DeepSeek Harness）演示文稿技能 + 工具插件：把一句话、一
 
 ## 兼容性
 
-已按 `@deepseek-ai/dsh@0.1.2-rc.1` 的工具与技能注册契约验证（2026-09-04；相较 alpha.5 无相关 API / 文档变化）。遵循 cordis 组合包补丁模型（`cordis.patch.yml` + `dsh.bundle.patch`），运行时不 import 任何 `@deepseek-ai/*` 内部模块。
+已在官方 `@deepseek-ai/dsh@0.1.5-rc.1`、Node `24.16.0` 上验证（2026-09-11）：18 个组件与 Modlens 同载，工具 schema、技能注册及离线只读调用检查通过。采用 `cordis.patch.yml` + `dsh.bundle.patch` 组合包模型。Node 要求与该版本 Harness 一致：22.19 及以上的 22.x，或 24 及以上。外部服务的实际业务操作需按各组件配置单独验证。
 
 ## 安装
 
@@ -130,7 +130,7 @@ dsh plugin --profile web remove dsh-ppt
 
 - `lang` 参数：`zh`（默认）/ `en` / `bilingual`，控制播放器界面、页码与结束页默认文案。
 - 内容语言由你撰写：双语 deck 推荐「中文标题 + 英文副标题」，或同一大纲分别生成中英两份。
-- 插件自身文档、技能正文、错误提示均中英双语。
+- 插件文档提供中英两版（README.md / README.en.md）；CLI 与技能的报错提示为中文。
 
 ## 工程质量
 

package/package.json

@@ -1,70 +1,70 @@
-{
-  "name": "dsh-ppt",
-  "version": "0.4.1",
-  "description": "DSH 演示文稿技能 + 工具插件：一句话或一篇 Markdown 文档 → 完整演示文稿（独立 HTML 网页放映 + 可编辑 PPTX 导出），内置 5 套视觉主题与页间转场/要点入场动画（motion 可关），可配置默认主题/语言，中英双语，SKILL.md 薄路由 + references 按需装载，跨 harness。",
-  "type": "module",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./skills/*": "./skills/*",
-    "./deck-core": "./skills/dsh-ppt/scripts/deck-core.mjs",
-    "./build-deck": "./skills/dsh-ppt/scripts/build-deck.mjs",
-    "./cordis.patch.yml": "./cordis.patch.yml",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "skills",
-    "cordis.patch.yml",
-    "README.md",
-    "README.en.md",
-    "CHANGELOG.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "pnpm run build && node --test \"test/*.test.mjs\"",
-    "test:core": "node --test \"test/*.test.mjs\"",
-    "smoke:cli": "node skills/dsh-ppt/scripts/build-deck.mjs --title \"DSH PPT Smoke\" --content @smoke/sample-deck.md --theme data --lang zh --out .smoke-deck"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    }
-  },
-  "keywords": [
-    "dsh",
-    "deepseek-harness",
-    "dsh-plugin",
-    "plugin",
-    "skills",
-    "ppt",
-    "pptx",
-    "presentation",
-    "slides",
-    "html"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">=22"
-  },
-  "devDependencies": {
-    "@types/node": "^24.0.0",
-    "typescript": "^5.6.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/STARDUSTLC666/dsh-ppt.git"
-  },
-  "bugs": {
-    "url": "https://github.com/STARDUSTLC666/dsh-ppt/issues"
-  },
-  "homepage": "https://github.com/STARDUSTLC666/dsh-ppt#readme",
-  "author": "stardustlc",
-  "packageManager": "pnpm@11.7.0"
-}
+{
+  "name": "dsh-ppt",
+  "version": "0.4.3",
+  "description": "DSH 演示文稿插件：一句话或一篇 Markdown → 网页放映 + 可编辑 PPTX，内置 5 套主题与转场动画。",
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./skills/*": "./skills/*",
+    "./deck-core": "./skills/dsh-ppt/scripts/deck-core.mjs",
+    "./build-deck": "./skills/dsh-ppt/scripts/build-deck.mjs",
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "skills",
+    "cordis.patch.yml",
+    "README.md",
+    "README.en.md",
+    "CHANGELOG.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "pnpm run build && node --test \"test/*.test.mjs\"",
+    "test:core": "node --test \"test/*.test.mjs\"",
+    "smoke:cli": "node skills/dsh-ppt/scripts/build-deck.mjs --title \"DSH PPT Smoke\" --content @smoke/sample-deck.md --theme data --lang zh --out .smoke-deck"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  },
+  "keywords": [
+    "dsh",
+    "deepseek-harness",
+    "dsh-plugin",
+    "plugin",
+    "skills",
+    "ppt",
+    "pptx",
+    "presentation",
+    "slides",
+    "html"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": "^22.19.0 || >=24.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^24.0.0",
+    "typescript": "^5.6.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/STARDUSTLC666/dsh-ppt.git"
+  },
+  "bugs": {
+    "url": "https://github.com/STARDUSTLC666/dsh-ppt/issues"
+  },
+  "homepage": "https://github.com/STARDUSTLC666/dsh-ppt#readme",
+  "author": "stardustlc",
+  "packageManager": "pnpm@11.7.0"
+}

package/skills/dsh-ppt/scripts/build-deck.mjs

@@ -11,7 +11,7 @@
  *   node build-deck.mjs --list-themes
  */
 
-import { readFileSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { resolve as resolvePath } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { buildDeck, listThemes, THEME_IDS, DEFAULT_THEME } from './deck-core.mjs'
@@ -99,6 +99,9 @@ export async function main(argv = process.argv.slice(2), io = {}) {
     content = await readStdin(io.stdin ?? process.stdin)
   } else if (content.startsWith('@')) {
     content = readFileSync(resolvePath(content.slice(1)), 'utf8')
+  } else if (content.trim() !== '' && existsSync(resolvePath(content.trim()))) {
+    // README / SKILL.md 的示例直接传文件路径（不带 @）时也按文件读取
+    content = readFileSync(resolvePath(content.trim()), 'utf8')
   } else if (content.trim() === '' && slides === null) {
     throw new Error('dsh-ppt CLI：--content 不能为空（或用 --slides 传结构化幻灯片）')
   }

package/skills/dsh-ppt/scripts/deck-core.mjs

@@ -14,11 +14,25 @@
  * 零运行时依赖，仅使用 node:fs / node:path / node:zlib。
  */
 
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
 import { resolve as resolvePath } from 'node:path'
 import { deflateRawSync } from 'node:zlib'
 
-export const DECK_VERSION = '0.3.0'
+/**
+ * manifest 版本跟随发布包 package.json；把 skills/dsh-ppt 独立复制到其他
+ * harness（没有 package.json）时回退为 0.0.0，避免版本号悄悄漂移。
+ */
+function readDeckVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync(new URL('../../../package.json', import.meta.url), 'utf8'))
+    const version = String(pkg.version ?? '').trim()
+    return version !== '' ? version : '0.0.0'
+  } catch {
+    return '0.0.0'
+  }
+}
+
+export const DECK_VERSION = readDeckVersion()
 
 // ---------------------------------------------------------------------------
 // 主题
@@ -239,13 +253,17 @@ export function clampInt(value, fallback, min, max) {
   return Math.min(max, Math.max(min, n))
 }
 
+// Windows 保留设备名：首个点之前的主名命中即不可用（NUL、com1、aux.report.html 都算）。
+const WINDOWS_RESERVED_FILE_NAME = /^(con|prn|aux|nul|com[1-9]|lpt[1-9])(\.|$)/i
+
 export function sanitizeFileName(input) {
   const base = String(input ?? 'deck').trim().replace(/\.(html?|pptx|json)$/i, '')
-  const cleaned = base
+  let cleaned = base
     .replace(/[<>:"/\\|?*\u0000-\u001F]/g, '-')
     .replace(/\s+/g, '-')
     .replace(/-+/g, '-')
     .replace(/^-+|-+$/g, '')
+  if (WINDOWS_RESERVED_FILE_NAME.test(cleaned)) cleaned = 'deck-' + cleaned
   return cleaned.slice(0, 120) || 'deck'
 }
 
@@ -256,7 +274,10 @@ const DECK_ARTIFACT_EXTENSIONS = ['.html', '.pptx', '.json']
  * 整组改用 -1/-2… 后缀，避免新旧 deck 被静默混写。
  */
 function resolveDeckFileName(outputDir, requestedFileName, overwrite) {
-  const isAvailable = (candidate) => DECK_ARTIFACT_EXTENSIONS.every((ext) => !existsSync(resolvePath(outputDir, candidate + ext)))
+  // 一次 readdir 建集，替代逐个候选 existsSync 探测（最坏 ~3000 次 stat）；
+  // 统一小写比较，避免 Windows 大小写不敏感文件系统把已占用的名字判成可用。
+  const existing = new Set(readdirSync(outputDir).map((name) => name.toLowerCase()))
+  const isAvailable = (candidate) => DECK_ARTIFACT_EXTENSIONS.every((ext) => !existing.has((candidate + ext).toLowerCase()))
   if (overwrite || isAvailable(requestedFileName)) return requestedFileName
   for (let index = 1; index < 1000; index += 1) {
     const candidate = requestedFileName + '-' + index
@@ -299,7 +320,7 @@ export function stripInlineMarkdown(value) {
 export function splitSentences(value) {
   const text = String(value ?? '').trim()
   if (text === '') return []
-  const parts = text.split(/(?<=[.!?。！？…])\s+/).map((part) => part.trim()).filter(Boolean)
+  const parts = text.split(/(?<=[。！？])|(?<=[.!?…])\s+/).map((part) => part.trim()).filter(Boolean)
   return parts.length > 0 ? parts : [text]
 }
 
@@ -552,16 +573,16 @@ export function parseMarkdownDeck(titleInput, content, lang = 'zh') {
     if (section.heading === '') {
       const points = [...section.bullets, ...section.paragraphs]
         .flatMap((part) => splitSentences(part))
-        .slice(0, 8)
-      if (points.length > 0) {
+      // 超过 8 条自动续页，不再静默丢弃；备注只挂在第一页
+      for (const [pageIndex, pagePoints] of chunk(points, 8).entries()) {
         pointIndex += 1
         const slide = {
           layout: 'bullets',
           kicker: ui.pointKicker + ' ' + pointIndex,
-          title: truncate(points[0], 40) || ui.pointKicker + ' ' + pointIndex,
-          bullets: points,
+          title: truncate(pagePoints[0], 40) || ui.pointKicker + ' ' + pointIndex,
+          bullets: pagePoints,
         }
-        if (specials.length === 0 && notes !== '') slide.notes = notes
+        if (pageIndex === 0 && specials.length === 0 && notes !== '') slide.notes = notes
         slides.push(slide)
       }
       continue
@@ -569,11 +590,16 @@ export function parseMarkdownDeck(titleInput, content, lang = 'zh') {
     const points = [
       ...section.bullets,
       ...section.paragraphs.flatMap((part) => splitSentences(part)),
-    ].slice(0, 8)
-    if (points.length > 0) {
-      const slide = { layout: 'bullets', kicker: section.heading, title: section.heading, bullets: points }
-      if (specials.length === 0 && notes !== '') slide.notes = notes
-      slides.push(slide)
+    ]
+    const pages = chunk(points, 8)
+    if (pages.length > 0) {
+      // 超过 8 条自动续页，不再静默丢弃；备注只挂在第一页
+      pages.forEach((pagePoints, pageIndex) => {
+        const label = pageIndex === 0 ? section.heading : section.heading + '（续）'
+        const slide = { layout: 'bullets', kicker: label, title: label, bullets: pagePoints }
+        if (pageIndex === 0 && specials.length === 0 && notes !== '') slide.notes = notes
+        slides.push(slide)
+      })
     } else if (specials.length === 0) {
       const slide = { layout: 'section', kicker: section.heading, title: section.heading }
       if (notes !== '') slide.notes = notes
@@ -674,6 +700,64 @@ export function normalizeBuildOptions(options = {}) {
   return { title, theme, language, motion, deck, outputDir, fileName, overwrite }
 }
 
+/**
+ * 三件套落盘：三份内容全部先写同目录临时文件，再逐个 rename 提交。
+ * 任一步失败都清理临时文件，并把已提交的目标恢复为调用前的内容，
+ * 避免出现「json/html 已更新、pptx 还是旧的」这类混版状态。
+ */
+function commitDeckArtifacts(artifacts) {
+  const stamp = process.pid.toString(36) + '-' + Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 8)
+  const items = artifacts.map((item, index) => ({ ...item, tempPath: item.path + '.' + stamp + '-' + index + '.tmp' }))
+  const removeTemp = (item) => {
+    try {
+      rmSync(item.tempPath, { force: true })
+    } catch {}
+  }
+
+  // 阶段 0：记下已有产物内容用于回滚；读不出来（如被同名目录占用）先报错，不碰任何文件。
+  const previous = new Map()
+  for (const item of items) {
+    if (!existsSync(item.path)) continue
+    try {
+      previous.set(item.path, readFileSync(item.path))
+    } catch (error) {
+      throw new Error('dsh-ppt：三件套写入失败（' + item.path + ' 已存在但无法读取），原文件未改动：' + error.message)
+    }
+  }
+
+  // 阶段 1：全部写临时文件；这一步失败时目标文件尚未被改动。
+  let written = 0
+  try {
+    for (const item of items) {
+      writeFileSync(item.tempPath, item.data, item.encoding)
+      written += 1
+    }
+  } catch (error) {
+    for (const item of items.slice(0, written + 1)) removeTemp(item)
+    throw new Error('dsh-ppt：写入临时文件失败（' + items[written].path + '），原三件套未改动：' + error.message)
+  }
+
+  // 阶段 2：逐个 rename 提交；中途失败则把已提交的目标回滚成旧内容。
+  const committed = []
+  try {
+    for (const item of items) {
+      renameSync(item.tempPath, item.path)
+      committed.push(item)
+    }
+  } catch (error) {
+    const failedPath = items[committed.length].path
+    for (const item of items) removeTemp(item)
+    for (const item of committed) {
+      try {
+        const previousData = previous.get(item.path)
+        if (previousData === undefined) rmSync(item.path, { force: true })
+        else writeFileSync(item.path, previousData)
+      } catch {}
+    }
+    throw new Error('dsh-ppt：提交三件套失败（' + failedPath + '），已回滚为原文件：' + error.message)
+  }
+}
+
 export function buildDeck(options = {}) {
   const normalized = normalizeBuildOptions(options)
   const { title, theme, language, motion, deck, outputDir, overwrite } = normalized
@@ -693,9 +777,12 @@ export function buildDeck(options = {}) {
   const htmlPath = resolvePath(outputDir, fileName + '.html')
   const pptxPath = resolvePath(outputDir, fileName + '.pptx')
 
-  writeFileSync(jsonPath, JSON.stringify(manifest, null, 2) + '\n', 'utf8')
-  writeFileSync(htmlPath, renderHtml(manifest, theme, language), 'utf8')
-  writeFileSync(pptxPath, buildPptx(manifest, theme, language))
+  // 先生成三份内容再统一提交：生成阶段抛错时也不会留下半套文件。
+  commitDeckArtifacts([
+    { path: jsonPath, data: JSON.stringify(manifest, null, 2) + '\n', encoding: 'utf8' },
+    { path: htmlPath, data: renderHtml(manifest, theme, language), encoding: 'utf8' },
+    { path: pptxPath, data: buildPptx(manifest, theme, language) },
+  ])
 
   return {
     ok: true,
@@ -1058,6 +1145,7 @@ function paragraphXml(text, options = {}) {
     size = 2000,
     color = 'FFFFFF',
     bold = false,
+    lang = 'zh-CN',
     align = 'l',
     bullet = false,
     font = 'Arial',
@@ -1076,7 +1164,7 @@ function paragraphXml(text, options = {}) {
     pPr = '<a:pPr' + (parts.length > 0 ? ' ' + parts.join(' ') : '') + '><a:buNone/></a:pPr>'
   }
   return '<a:p>' + pPr +
-    '<a:r><a:rPr lang="zh-CN" sz="' + size + '" b="' + (bold ? 1 : 0) + '" dirty="0">' +
+    '<a:r><a:rPr lang="' + lang + '" sz="' + size + '" b="' + (bold ? 1 : 0) + '" dirty="0">' +
     '<a:solidFill><a:srgbClr val="' + hex(color) + '"/></a:solidFill>' +
     '<a:latin typeface="' + escapeXml(runFont) + '"/><a:ea typeface="' + escapeXml(runFont) + '"/></a:rPr>' +
     '<a:t>' + escapeXml(text) + '</a:t></a:r></a:p>'
@@ -1103,8 +1191,9 @@ function accentBarXml(id, name, box, color) {
 }
 
 /** 原生 OOXML 表格（graphicFrame + a:tbl）：首行主题色表头，隔行面板色。 */
-function tableGraphicXml(id, name, box, rows, theme) {
+function tableGraphicXml(id, name, box, rows, theme, langId) {
   const p = theme.palette
+  const lang = langId || 'zh-CN'
   const font = pptxFontName(theme.fonts.body)
   const safeRows = rows.length > 0 ? rows : [['']]
   const cols = Math.max(1, safeRows[0].length)
@@ -1113,7 +1202,7 @@ function tableGraphicXml(id, name, box, rows, theme) {
   const rowH = 420000
   const cellXml = (text, fill, color, bold) =>
     '<a:tc><a:txBody><a:bodyPr anchor="ctr"/><a:lstStyle/><a:p><a:pPr algn="l"><a:buNone/></a:pPr>' +
-    '<a:r><a:rPr lang="zh-CN" sz="1400" b="' + (bold ? 1 : 0) + '" dirty="0">' +
+    '<a:r><a:rPr lang="' + lang + '" sz="1400" b="' + (bold ? 1 : 0) + '" dirty="0">' +
     '<a:solidFill><a:srgbClr val="' + hex(color) + '"/></a:solidFill>' +
     '<a:latin typeface="' + escapeXml(font) + '"/><a:ea typeface="' + escapeXml(font) + '"/></a:rPr>' +
     '<a:t>' + escapeXml(text) + '</a:t></a:r></a:p></a:txBody>' +
@@ -1142,6 +1231,9 @@ function slideShapeList(slide, index, total, theme, langId) {
   const p = theme.palette
   const font = pptxFontName(theme.fonts.heading)
   const bodyFont = pptxFontName(theme.fonts.body) // 保留：v0.1 后续用于统一正文字体
+  const lang = langId || 'zh-CN'
+  // PPTX 每个文本 run 的语言跟随 deck.lang（zh-CN / en-US），不再写死中文
+  const para = (content, options = {}) => paragraphXml(content, { lang, ...options })
   const shapes = []
   const kicker = slide.kicker || ''
   const title = slide.title || ''
@@ -1153,95 +1245,95 @@ function slideShapeList(slide, index, total, theme, langId) {
   if (slide.layout === 'cover') {
     shapes.push(accentBarXml(idBase + 1, 'Accent bar', { x: 914400, y: 2250000, w: 240000, h: 1600000 }, p.accent))
     shapes.push(textShapeXml(idBase + 2, 'Title', { x: 1550000, y: 2160000, w: 9250000, h: 1800000 }, [
-      paragraphXml(title, { size: 4400, color: p.fg, bold: true, font }),
+      para(title, { size: 4400, color: p.fg, bold: true, font }),
     ]))
     if (subtitle !== '') {
       shapes.push(textShapeXml(idBase + 3, 'Subtitle', { x: 1570000, y: 4150000, w: 9000000, h: 1200000 }, [
-        paragraphXml(subtitle, { size: 2200, color: p.muted, font: theme.fonts.body }),
+        para(subtitle, { size: 2200, color: p.muted, font: theme.fonts.body }),
       ]))
     }
     if (kicker !== '') {
       shapes.push(textShapeXml(idBase + 4, 'Kicker', { x: 1570000, y: 5800000, w: 7000000, h: 500000 }, [
-        paragraphXml(kicker, { size: 1400, color: p.accent, bold: true, font: theme.fonts.body }),
+        para(kicker, { size: 1400, color: p.accent, bold: true, font: theme.fonts.body }),
       ]))
     }
   } else if (slide.layout === 'section') {
     if (kicker !== '') {
       shapes.push(textShapeXml(idBase + 1, 'Kicker', { x: 1050000, y: 2250000, w: 9000000, h: 500000 }, [
-        paragraphXml(kicker, { size: 1600, color: p.accent, bold: true, font: theme.fonts.body }),
+        para(kicker, { size: 1600, color: p.accent, bold: true, font: theme.fonts.body }),
       ]))
     }
     shapes.push(accentBarXml(idBase + 2, 'Accent bar', { x: 1050000, y: 2850000, w: 1600000, h: 160000 }, p.accent2))
     shapes.push(textShapeXml(idBase + 3, 'Title', { x: 1050000, y: 3150000, w: 10200000, h: 1400000 }, [
-      paragraphXml(title, { size: 4000, color: p.fg, bold: true, font }),
+      para(title, { size: 4000, color: p.fg, bold: true, font }),
     ]))
     if (subtitle !== '') {
       shapes.push(textShapeXml(idBase + 4, 'Subtitle', { x: 1070000, y: 4750000, w: 9000000, h: 900000 }, [
-        paragraphXml(subtitle, { size: 1800, color: p.muted, font: theme.fonts.body }),
+        para(subtitle, { size: 1800, color: p.muted, font: theme.fonts.body }),
       ]))
     }
   } else if (slide.layout === 'statement') {
     shapes.push(accentBarXml(idBase + 1, 'Accent bar', { x: 914400, y: 1900000, w: 200000, h: 2800000 }, p.accent))
     shapes.push(textShapeXml(idBase + 2, 'Statement', { x: 1500000, y: 1950000, w: 9400000, h: 2700000 }, [
-      paragraphXml(title || slide.text || '', { size: 3600, color: p.fg, bold: true, font }),
+      para(title || slide.text || '', { size: 3600, color: p.fg, bold: true, font }),
     ]))
     if (subtitle !== '') {
       shapes.push(textShapeXml(idBase + 3, 'Subtitle', { x: 1520000, y: 4900000, w: 9000000, h: 800000 }, [
-        paragraphXml(subtitle, { size: 1800, color: p.muted, font: theme.fonts.body }),
+        para(subtitle, { size: 1800, color: p.muted, font: theme.fonts.body }),
       ]))
     }
   } else if (slide.layout === 'quote') {
     shapes.push(textShapeXml(idBase + 1, 'Quote mark', { x: 900000, y: 1050000, w: 1700000, h: 1900000 }, [
-      paragraphXml('\u201C', { size: 9600, color: p.accent, bold: true, font }),
+      para('\u201C', { size: 9600, color: p.accent, bold: true, font }),
     ]))
     shapes.push(textShapeXml(idBase + 2, 'Quote', { x: 1050000, y: 2550000, w: 10100000, h: 2600000 }, [
-      paragraphXml(title || slide.text || '', { size: 3000, color: p.fg, bold: true, font }),
+      para(title || slide.text || '', { size: 3000, color: p.fg, bold: true, font }),
     ]))
     if (subtitle !== '') {
       shapes.push(textShapeXml(idBase + 3, 'Attribution', { x: 1070000, y: 5300000, w: 9000000, h: 600000 }, [
-        paragraphXml('\u2014\u2014 ' + subtitle, { size: 1600, color: p.muted, font: theme.fonts.body }),
+        para('\u2014\u2014 ' + subtitle, { size: 1600, color: p.muted, font: theme.fonts.body }),
       ]))
     }
   } else if (slide.layout === 'table') {
     const hasTitle = title !== '' && title !== kicker
     if (kicker !== '') {
       shapes.push(textShapeXml(idBase + 1, 'Kicker', { x: 900000, y: 420000, w: 10000000, h: 420000 }, [
-        paragraphXml(kicker, { size: 1400, color: p.accent, bold: true, font: theme.fonts.body }),
+        para(kicker, { size: 1400, color: p.accent, bold: true, font: theme.fonts.body }),
       ]))
     }
     if (hasTitle) {
       shapes.push(textShapeXml(idBase + 2, 'Title', { x: 900000, y: 920000, w: 10300000, h: 800000 }, [
-        paragraphXml(title, { size: 3400, color: p.fg, bold: true, font }),
+        para(title, { size: 3400, color: p.fg, bold: true, font }),
       ]))
     }
-    shapes.push(tableGraphicXml(idBase + 3, 'Table', { x: 900000, y: hasTitle ? 1950000 : 900000, w: 10300000 }, Array.isArray(slide.rows) ? slide.rows : [], theme))
+    shapes.push(tableGraphicXml(idBase + 3, 'Table', { x: 900000, y: hasTitle ? 1950000 : 900000, w: 10300000 }, Array.isArray(slide.rows) ? slide.rows : [], theme, lang))
   } else if (slide.layout === 'closing') {
     shapes.push(textShapeXml(idBase + 1, 'Title', { x: 1050000, y: 2300000, w: 10200000, h: 1700000 }, [
-      paragraphXml(title || '谢谢', { size: 5200, color: p.fg, bold: true, align: 'ctr', font }),
+      para(title || '谢谢', { size: 5200, color: p.fg, bold: true, align: 'ctr', font }),
     ]))
     if (subtitle !== '') {
       shapes.push(textShapeXml(idBase + 2, 'Subtitle', { x: 1050000, y: 4200000, w: 10200000, h: 900000 }, [
-        paragraphXml(subtitle, { size: 2000, color: p.accent, bold: true, align: 'ctr', font: theme.fonts.body }),
+        para(subtitle, { size: 2000, color: p.accent, bold: true, align: 'ctr', font: theme.fonts.body }),
       ]))
     }
   } else {
     // bullets（默认布局）
     if (kicker !== '') {
       shapes.push(textShapeXml(idBase + 1, 'Kicker', { x: 900000, y: 420000, w: 10000000, h: 420000 }, [
-        paragraphXml(kicker, { size: 1400, color: p.accent, bold: true, font: theme.fonts.body }),
+        para(kicker, { size: 1400, color: p.accent, bold: true, font: theme.fonts.body }),
       ]))
     }
     shapes.push(textShapeXml(idBase + 2, 'Title', { x: 900000, y: 920000, w: 10300000, h: 800000 }, [
-      paragraphXml(title, { size: 3400, color: p.fg, bold: true, font }),
+      para(title, { size: 3400, color: p.fg, bold: true, font }),
     ]))
     const bodyParagraphs = bullets.length > 0
-      ? bullets.map((bullet) => paragraphXml(bullet, { size: 2000, color: p.fg, bullet: true, font: theme.fonts.body, spaceAfter: 600 }))
-      : [paragraphXml(subtitle || '', { size: 2000, color: p.fg, font: theme.fonts.body })]
+      ? bullets.map((bullet) => para(bullet, { size: 2000, color: p.fg, bullet: true, font: theme.fonts.body, spaceAfter: 600 }))
+      : [para(subtitle || '', { size: 2000, color: p.fg, font: theme.fonts.body })]
     shapes.push(textShapeXml(idBase + 3, 'Body', { x: 1050000, y: 1850000, w: 10100000, h: 4500000 }, bodyParagraphs))
   }
 
   shapes.push(textShapeXml(idBase + 9, 'Page number', { x: 10600000, y: 6250000, w: 1200000, h: 400000 }, [
-    paragraphXml(footer, { size: 1000, color: p.muted, align: 'r', font: theme.fonts.body }),
+    para(footer, { size: 1000, color: p.muted, align: 'r', font: theme.fonts.body }),
   ]))
 
   return shapes.join('')
@@ -1366,10 +1458,11 @@ function notesMasterRelXml() {
     '</Relationships>'
 }
 
-function notesSlideXml(notes) {
+function notesSlideXml(notes, langId) {
+  const lang = langId || 'zh-CN'
   const paragraphs = String(notes ?? '').split('\n')
     .filter((line) => line.trim() !== '')
-    .map((line) => '<a:p><a:r><a:rPr lang="zh-CN" sz="1200" dirty="0"/><a:t>' + escapeXml(line) + '</a:t></a:r></a:p>')
+    .map((line) => '<a:p><a:r><a:rPr lang="' + lang + '" sz="1200" dirty="0"/><a:t>' + escapeXml(line) + '</a:t></a:r></a:p>')
     .join('')
   return '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
     '<p:notes xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" ' +
@@ -1635,10 +1728,10 @@ export function buildPptx(manifest, themeInput, languageInput) {
   }
   slides.forEach((slide, index) => {
     const hasNotes = noteIndexes.includes(index)
-    entries.push({ name: 'ppt/slides/slide' + (index + 1) + '.xml', data: slideXml(slide, index, slides.length, theme, language.id, motion) })
+    entries.push({ name: 'ppt/slides/slide' + (index + 1) + '.xml', data: slideXml(slide, index, slides.length, theme, language.attr, motion) })
     entries.push({ name: 'ppt/slides/_rels/slide' + (index + 1) + '.xml.rels', data: slideRelXml(hasNotes, index + 1) })
     if (hasNotes) {
-      entries.push({ name: 'ppt/notesSlides/notesSlide' + (index + 1) + '.xml', data: notesSlideXml(slide.notes) })
+      entries.push({ name: 'ppt/notesSlides/notesSlide' + (index + 1) + '.xml', data: notesSlideXml(slide.notes, language.attr) })
       entries.push({ name: 'ppt/notesSlides/_rels/notesSlide' + (index + 1) + '.xml.rels', data: notesSlideRelXml(index + 1) })
     }
   })