dsh-ppt 0.5.1 → 0.7.0

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

@@ -17,19 +17,23 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
 import { resolve as resolvePath, join as joinPath } from 'node:path'
 import { deflateRawSync } from 'node:zlib'
+import { MEDIA_LAYOUTS, MEDIA_CSS, normalizeMediaSlide, renderMediaHtml, mediaBoxes } from './deck-media.mjs'
+import { renderDelivery } from './deck-delivery.mjs'
 
 /**
  * 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'
+  for (const file of ['../../../package.json', '../package.json']) {
+    try {
+      const pkg = JSON.parse(readFileSync(new URL(file, import.meta.url), 'utf8'))
+      if (!['dsh-ppt', 'dsh-ppt-skill'].includes(pkg.name)) continue
+      const version = String(pkg.version ?? '').trim()
+      if (version) return version
+    } catch { /* Copied skill may have no parent manifest. */ }
   }
+  return '0.0.0'
 }
 
 export const DECK_VERSION = readDeckVersion()
@@ -158,21 +162,21 @@ export const LANGUAGES = {
       notesToggle: '备注',
       closingTitle: '谢谢',
       closingSubtitle: '讨论与问答',
-      generatedBy: '由 dsh-ppt 生成',
-      overviewToggle: '总览',
-      presenterToggle: '演讲者',
-      presenterLabel: '演讲者视图 · Presenter view',
-      helpTitle: '快捷键 · Shortcuts',
-      noNotes: '（本页无备注）',
-      closeLabel: '关闭',
-      currentLabel: '当前页 · Current',
-      nextLabel: '下一页 · Next',
-      timerLabel: '计时 · Timer',
+      generatedBy: '由 dsh-ppt 生成',
+      overviewToggle: '总览',
+      presenterToggle: '演讲者',
+      presenterLabel: '演讲者视图 · Presenter view',
+      helpTitle: '快捷键 · Shortcuts',
+      noNotes: '（本页无备注）',
+      closeLabel: '关闭',
+      currentLabel: '当前页 · Current',
+      nextLabel: '下一页 · Next',
+      timerLabel: '计时 · Timer',
       presenterHint: '备注：未开演讲者窗口时按 S 显示在顶部；打开后只在演讲者窗口显示，观众看不到',
-      wrapHint: '已环绕到',
-      popupBlocked: '浏览器拦截了演讲者窗口，请允许弹出窗口后按 V 重试',
-      fullscreenUnavailable: '当前窗口无法进入全屏，请在浏览器中独立打开演示文件后重试。',
-      notesCloseLabel: '关闭备注',
+      wrapHint: '已环绕到',
+      popupBlocked: '浏览器拦截了演讲者窗口，请允许弹出窗口后按 V 重试',
+      fullscreenUnavailable: '当前窗口无法进入全屏，请在浏览器中独立打开演示文件后重试。',
+      notesCloseLabel: '关闭备注',
       overviewHint: '点击缩略图跳页，方向键切换，Enter 进入，Esc 退出'
     },
   },
@@ -194,21 +198,21 @@ export const LANGUAGES = {
       notesToggle: 'Notes',
       closingTitle: 'Thank You',
       closingSubtitle: 'Discussion & Q&A',
-      generatedBy: 'Generated with dsh-ppt',
-      overviewToggle: 'Overview',
-      presenterToggle: 'Presenter',
-      presenterLabel: 'Presenter view',
-      helpTitle: 'Keyboard shortcuts',
-      noNotes: '(No notes on this slide)',
-      closeLabel: 'Close',
-      currentLabel: 'Current',
-      nextLabel: 'Next',
-      timerLabel: 'Timer',
+      generatedBy: 'Generated with dsh-ppt',
+      overviewToggle: 'Overview',
+      presenterToggle: 'Presenter',
+      presenterLabel: 'Presenter view',
+      helpTitle: 'Keyboard shortcuts',
+      noNotes: '(No notes on this slide)',
+      closeLabel: 'Close',
+      currentLabel: 'Current',
+      nextLabel: 'Next',
+      timerLabel: 'Timer',
       presenterHint: 'Notes: S shows them on top until a presenter window is open; afterwards only in the presenter window.',
-      wrapHint: 'Wrapped to',
-      popupBlocked: 'The presenter window was blocked. Allow pop-ups and press V to retry.',
-      fullscreenUnavailable: 'Fullscreen is unavailable here. Open the presentation in a browser tab and try again.',
-      notesCloseLabel: 'Close notes',
+      wrapHint: 'Wrapped to',
+      popupBlocked: 'The presenter window was blocked. Allow pop-ups and press V to retry.',
+      fullscreenUnavailable: 'Fullscreen is unavailable here. Open the presentation in a browser tab and try again.',
+      notesCloseLabel: 'Close notes',
       overviewHint: 'Click a thumbnail to jump; arrows move, Enter opens, Esc exits'
     },
   },
@@ -230,135 +234,135 @@ export const LANGUAGES = {
       notesToggle: '备注 · Notes',
       closingTitle: '谢谢 · Thank You',
       closingSubtitle: '讨论与问答 · Q&A',
-      generatedBy: '由 dsh-ppt 生成 · Generated with dsh-ppt',
-      overviewToggle: '总览 · Overview',
-      presenterToggle: '演讲者 · Presenter',
-      presenterLabel: '演讲者视图 · Presenter view',
-      helpTitle: '快捷键 · Shortcuts',
-      noNotes: '（本页无备注 · No notes on this slide）',
-      closeLabel: '关闭 · Close',
-      currentLabel: '当前页 · Current',
-      nextLabel: '下一页 · Next',
-      timerLabel: '计时 · Timer',
+      generatedBy: '由 dsh-ppt 生成 · Generated with dsh-ppt',
+      overviewToggle: '总览 · Overview',
+      presenterToggle: '演讲者 · Presenter',
+      presenterLabel: '演讲者视图 · Presenter view',
+      helpTitle: '快捷键 · Shortcuts',
+      noNotes: '（本页无备注 · No notes on this slide）',
+      closeLabel: '关闭 · Close',
+      currentLabel: '当前页 · Current',
+      nextLabel: '下一页 · Next',
+      timerLabel: '计时 · Timer',
       presenterHint: '备注：未开演讲者窗口时按 S 显示在顶部；打开后只在演讲者窗口显示 · Notes: S shows on top until a presenter window is open',
-      wrapHint: '已环绕到 · Wrapped to',
-      popupBlocked: '浏览器拦截了演讲者窗口 · Presenter window blocked; allow pop-ups and press V',
-      fullscreenUnavailable: '当前窗口无法全屏，请独立打开演示文件 · Open this presentation in a browser tab for fullscreen.',
-      notesCloseLabel: '关闭备注 · Close notes',
-      overviewHint: '点击缩略图跳页 · Click to jump, arrows move, Enter opens, Esc exits'
-    },
-  },
-}
-
- // ---------------------------------------------------------------------------
-// 主题预览（ppt_themes preview=true / buildThemePreview）
-// ---------------------------------------------------------------------------
-
-function themePages(lang) {
-  return lang === 'en'
-    ? { title: 'dsh-ppt theme gallery', hint: 'Pick a theme id for ppt_create', usage: 'theme', dark: 'dark', light: 'light', palette: 'Palette' }
-    : { title: 'dsh-ppt 主题预览', hint: '把 id 填给 ppt_create 的 theme 参数', usage: 'theme', dark: '深色', light: '浅色', palette: '色板' }
-}
-
-/** 单套主题的 960x540 SVG 色板卡：可直接放进 README / npm 首屏。 */
-export function renderThemeSvg(input, lang = 'zh') {
-  const theme = typeof input === 'string' ? resolveTheme(input) : input
-  const pick = (pair) => (lang === 'en' ? pair.en : pair.zh)
-  const p = theme.palette
-  const L = themePages(lang === 'en' ? 'en' : 'zh')
-  const font = theme.fonts.heading.replace(/"/g, "'")
-  const bodyFont = theme.fonts.body.replace(/"/g, "'")
-  const out = []
-  out.push('<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 540" width="960" height="540" role="img" aria-label="' + escapeXml(theme.id + ' ' + pick(theme.name)) + '">')
-  out.push('<rect width="960" height="540" fill="' + p.bg + '"/>')
-  out.push('<rect x="0" y="0" width="960" height="6" fill="' + p.accent + '"/><rect x="0" y="534" width="960" height="6" fill="' + p.accent2 + '"/>')
-  out.push('<rect x="36" y="40" width="560" height="360" rx="16" fill="' + p.panel + '" stroke="' + hexToRgba(p.muted, 0.45) + '"/>')
-  out.push('<text x="64" y="92" fill="' + p.accent + '" font-family="' + escapeXml(bodyFont) + '" font-size="14" font-weight="700" letter-spacing="3">' + escapeXml(pick(theme.mood).toUpperCase()) + '</text>')
-  out.push('<text x="64" y="158" fill="' + p.fg + '" font-family="' + escapeXml(font) + '" font-size="42" font-weight="800">' + escapeXml('Aa ' + pick(theme.name)) + '</text>')
-  out.push('<circle cx="72" cy="206" r="5" fill="' + p.accent + '"/><rect x="92" y="199" width="360" height="12" rx="6" fill="' + hexToRgba(p.fg, 0.75) + '"/>')
-  out.push('<circle cx="72" cy="240" r="5" fill="' + p.accent + '"/><rect x="92" y="233" width="300" height="12" rx="6" fill="' + hexToRgba(p.fg, 0.55) + '"/>')
-  out.push('<circle cx="72" cy="274" r="5" fill="' + p.accent + '"/><rect x="92" y="267" width="330" height="12" rx="6" fill="' + hexToRgba(p.fg, 0.55) + '"/>')
-  out.push('<rect x="64" y="312" width="500" height="34" rx="6" fill="' + p.accent + '"/>')
-  out.push('<text x="78" y="334" fill="' + p.bg + '" font-family="' + escapeXml(bodyFont) + '" font-size="14" font-weight="700">dsh-ppt</text>')
-  out.push('<text x="470" y="334" fill="' + p.bg + '" font-family="' + escapeXml(bodyFont) + '" font-size="14" font-weight="700" text-anchor="end">1,234</text>')
-  out.push('<rect x="64" y="346" width="500" height="2" fill="' + hexToRgba(p.muted, 0.5) + '"/>')
-  out.push('<text x="64" y="378" fill="' + p.muted + '" font-family="' + escapeXml(bodyFont) + '" font-size="13">' + escapeXml(theme.id + ' · ' + (theme.dark ? L.dark : L.light) + ' · v' + DECK_VERSION) + '</text>')
-  const swatches = ['bg', 'panel', 'fg', 'muted', 'accent', 'accent2']
-  const labels = ['bg', 'panel', 'fg', 'muted', 'accent', 'accent2']
-  out.push('<text x="632" y="76" fill="' + p.muted + '" font-family="' + escapeXml(bodyFont) + '" font-size="13" font-weight="700" letter-spacing="2">' + escapeXml(L.palette.toUpperCase()) + '</text>')
-  swatches.forEach((key, i) => {
-    const y = 96 + i * 62
-    out.push('<rect x="632" y="' + y + '" width="44" height="44" rx="10" fill="' + p[key] + '" stroke="' + hexToRgba(p.muted, 0.45) + '"/>')
-    out.push('<text x="692" y="' + (y + 20) + '" fill="' + p.fg + '" font-family="' + escapeXml(bodyFont) + '" font-size="14" font-weight="600">' + escapeXml(labels[i]) + '</text>')
-    out.push('<text x="692" y="' + (y + 38) + '" fill="' + p.muted + '" font-family="' + escapeXml(bodyFont) + '" font-size="13">' + escapeXml(String(p[key]).toUpperCase()) + '</text>')
-  })
-  out.push('<text x="632" y="508" fill="' + p.muted + '" font-family="' + escapeXml(bodyFont) + '" font-size="12">' + escapeXml(pick(theme.bestFor)).slice(0, 44) + '</text>')
-  out.push('</svg>')
-  return out.join('')
-}
-
-/** 自包含主题对比页：5 套主题并排，含色板与用法。 */
-export function renderThemePreviewHtml(lang = 'zh') {
-  const L = themePages(lang === 'en' ? 'en' : 'zh')
-  const cards = THEME_IDS.map((id) => {
-    const theme = THEMES[id]
-    const pick = (pair) => (lang === 'en' ? pair.en : pair.zh)
-    const chips = Object.keys(theme.palette).map((key) =>
-      '<span class="chip"><i style="background:' + theme.palette[key] + '"></i>' + escapeHtml(String(theme.palette[key]).toUpperCase()) + '</span>').join('')
-    return '<figure class="card" id="theme-' + escapeHtml(id) + '">' +
-      renderThemeSvg(theme, lang === 'en' ? 'en' : 'zh') +
-      '<figcaption><div class="row"><strong>' + escapeHtml(id) + '</strong><span class="badge">' + escapeHtml(pick(theme.name)) + '</span></div>' +
-      '<p class="muted">' + escapeHtml(pick(theme.mood)) + ' · ' + escapeHtml(pick(theme.bestFor)) + '</p>' +
-      '<p class="chips">' + chips + '</p>' +
-      '<p class="usage">' + escapeHtml(L.usage) + ': <code>' + escapeHtml(id) + '</code></p></figcaption></figure>'
-  }).join('')
-  return '<!DOCTYPE html>' + eolSafe('<html lang="zh-CN">') +
-    '<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">' +
-    '<title>' + escapeHtml(L.title) + '</title><style>' +
-    'body{margin:0;background:#0b0f17;color:#e8f1ff;font-family:"Segoe UI","PingFang SC","Microsoft YaHei",sans-serif;padding:28px}' +
-    'h1{font-size:26px;margin:0 0 6px}p.sub{color:#8b98ad;margin:0 0 24px;font-size:14px}' +
-    '.grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(430px,1fr));gap:22px}' +
-    '.card{margin:0;background:#111827;border:1px solid #263043;border-radius:16px;overflow:hidden}' +
-    '.card svg{display:block;width:100%;height:auto}' +
-    'figcaption{padding:14px 16px 16px}.row{display:flex;align-items:center;gap:10px;font-size:16px}' +
-    '.badge{color:#8b98ad;font-size:13px}.muted{color:#8b98ad;font-size:13px;margin:6px 0 10px;line-height:1.5}' +
-    '.chips{display:flex;flex-wrap:wrap;gap:6px;margin:0 0 10px}.chip{display:inline-flex;align-items:center;gap:6px;font-size:12px;color:#aab6c9;background:#0b0f17;border:1px solid #263043;border-radius:99px;padding:3px 9px}' +
-    '.chip i{width:10px;height:10px;border-radius:3px;display:inline-block}' +
-    '.usage{margin:0;font-size:13px;color:#aab6c9}code{background:#0b0f17;border:1px solid #263043;border-radius:6px;padding:1px 6px}' +
-    '@media (prefers-reduced-motion: reduce){*{transition:none!important;animation:none!important}}' +
-    '</style></head><body><h1>' + escapeHtml(L.title) + '</h1><p class="sub">' + escapeHtml(L.hint) + ' · dsh-ppt v' + escapeHtml(DECK_VERSION) + '</p>' +
-    '<div class="grid">' + cards + '</div></body></html>'
-}
-
-function eolSafe(text) { return text }
-
-/** 写主题对比页 + 每套主题 SVG 色板卡；默认不覆盖同名文件。 */
-export function buildThemePreview(options = {}) {
-  const langInput = typeof options.lang === 'string' && options.lang.trim() !== '' ? options.lang.trim() : 'zh'
-  const language = resolveLanguage(langInput)
-  const outputDir = resolvePath(String(options.outputDir ?? '.'))
-  mkdirSync(outputDir, { recursive: true })
-  const overwrite = options.overwrite === true
-  const pickPath = (base, ext) => {
-    const first = resolvePath(joinPath(outputDir, base + ext))
-    if (overwrite || !existsSync(first)) return first
-    for (let i = 1; i < 1000; i += 1) {
-      const candidate = resolvePath(joinPath(outputDir, base + '-' + i + ext))
-      if (!existsSync(candidate)) return candidate
-    }
-    throw new Error('dsh-ppt：找不到可用的预览文件名（同名前缀超过 999 个），请允许 overwrite。')
-  }
-  const htmlPath = pickPath('themes-preview', '.html')
-  writeFileSync(htmlPath, renderThemePreviewHtml(language.id), 'utf8')
-  const svgs = THEME_IDS.map((id) => {
-    const svgPath = pickPath('theme-' + id, '.svg')
-    writeFileSync(svgPath, renderThemeSvg(id, language.id), 'utf8')
-    return { id, path: svgPath }
-  })
-  return { ok: true, outputDir, htmlPath, svgs, themeCount: THEME_IDS.length, language: language.id }
-}
-
-
+      wrapHint: '已环绕到 · Wrapped to',
+      popupBlocked: '浏览器拦截了演讲者窗口 · Presenter window blocked; allow pop-ups and press V',
+      fullscreenUnavailable: '当前窗口无法全屏，请独立打开演示文件 · Open this presentation in a browser tab for fullscreen.',
+      notesCloseLabel: '关闭备注 · Close notes',
+      overviewHint: '点击缩略图跳页 · Click to jump, arrows move, Enter opens, Esc exits'
+    },
+  },
+}
+
+ // ---------------------------------------------------------------------------
+// 主题预览（ppt_themes preview=true / buildThemePreview）
+// ---------------------------------------------------------------------------
+
+function themePages(lang) {
+  return lang === 'en'
+    ? { title: 'dsh-ppt theme gallery', hint: 'Pick a theme id for ppt_create', usage: 'theme', dark: 'dark', light: 'light', palette: 'Palette' }
+    : { title: 'dsh-ppt 主题预览', hint: '把 id 填给 ppt_create 的 theme 参数', usage: 'theme', dark: '深色', light: '浅色', palette: '色板' }
+}
+
+/** 单套主题的 960x540 SVG 色板卡：可直接放进 README / npm 首屏。 */
+export function renderThemeSvg(input, lang = 'zh') {
+  const theme = typeof input === 'string' ? resolveTheme(input) : input
+  const pick = (pair) => (lang === 'en' ? pair.en : pair.zh)
+  const p = theme.palette
+  const L = themePages(lang === 'en' ? 'en' : 'zh')
+  const font = theme.fonts.heading.replace(/"/g, "'")
+  const bodyFont = theme.fonts.body.replace(/"/g, "'")
+  const out = []
+  out.push('<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 540" width="960" height="540" role="img" aria-label="' + escapeXml(theme.id + ' ' + pick(theme.name)) + '">')
+  out.push('<rect width="960" height="540" fill="' + p.bg + '"/>')
+  out.push('<rect x="0" y="0" width="960" height="6" fill="' + p.accent + '"/><rect x="0" y="534" width="960" height="6" fill="' + p.accent2 + '"/>')
+  out.push('<rect x="36" y="40" width="560" height="360" rx="16" fill="' + p.panel + '" stroke="' + hexToRgba(p.muted, 0.45) + '"/>')
+  out.push('<text x="64" y="92" fill="' + p.accent + '" font-family="' + escapeXml(bodyFont) + '" font-size="14" font-weight="700" letter-spacing="3">' + escapeXml(pick(theme.mood).toUpperCase()) + '</text>')
+  out.push('<text x="64" y="158" fill="' + p.fg + '" font-family="' + escapeXml(font) + '" font-size="42" font-weight="800">' + escapeXml('Aa ' + pick(theme.name)) + '</text>')
+  out.push('<circle cx="72" cy="206" r="5" fill="' + p.accent + '"/><rect x="92" y="199" width="360" height="12" rx="6" fill="' + hexToRgba(p.fg, 0.75) + '"/>')
+  out.push('<circle cx="72" cy="240" r="5" fill="' + p.accent + '"/><rect x="92" y="233" width="300" height="12" rx="6" fill="' + hexToRgba(p.fg, 0.55) + '"/>')
+  out.push('<circle cx="72" cy="274" r="5" fill="' + p.accent + '"/><rect x="92" y="267" width="330" height="12" rx="6" fill="' + hexToRgba(p.fg, 0.55) + '"/>')
+  out.push('<rect x="64" y="312" width="500" height="34" rx="6" fill="' + p.accent + '"/>')
+  out.push('<text x="78" y="334" fill="' + p.bg + '" font-family="' + escapeXml(bodyFont) + '" font-size="14" font-weight="700">dsh-ppt</text>')
+  out.push('<text x="470" y="334" fill="' + p.bg + '" font-family="' + escapeXml(bodyFont) + '" font-size="14" font-weight="700" text-anchor="end">1,234</text>')
+  out.push('<rect x="64" y="346" width="500" height="2" fill="' + hexToRgba(p.muted, 0.5) + '"/>')
+  out.push('<text x="64" y="378" fill="' + p.muted + '" font-family="' + escapeXml(bodyFont) + '" font-size="13">' + escapeXml(theme.id + ' · ' + (theme.dark ? L.dark : L.light) + ' · v' + DECK_VERSION) + '</text>')
+  const swatches = ['bg', 'panel', 'fg', 'muted', 'accent', 'accent2']
+  const labels = ['bg', 'panel', 'fg', 'muted', 'accent', 'accent2']
+  out.push('<text x="632" y="76" fill="' + p.muted + '" font-family="' + escapeXml(bodyFont) + '" font-size="13" font-weight="700" letter-spacing="2">' + escapeXml(L.palette.toUpperCase()) + '</text>')
+  swatches.forEach((key, i) => {
+    const y = 96 + i * 62
+    out.push('<rect x="632" y="' + y + '" width="44" height="44" rx="10" fill="' + p[key] + '" stroke="' + hexToRgba(p.muted, 0.45) + '"/>')
+    out.push('<text x="692" y="' + (y + 20) + '" fill="' + p.fg + '" font-family="' + escapeXml(bodyFont) + '" font-size="14" font-weight="600">' + escapeXml(labels[i]) + '</text>')
+    out.push('<text x="692" y="' + (y + 38) + '" fill="' + p.muted + '" font-family="' + escapeXml(bodyFont) + '" font-size="13">' + escapeXml(String(p[key]).toUpperCase()) + '</text>')
+  })
+  out.push('<text x="632" y="508" fill="' + p.muted + '" font-family="' + escapeXml(bodyFont) + '" font-size="12">' + escapeXml(pick(theme.bestFor)).slice(0, 44) + '</text>')
+  out.push('</svg>')
+  return out.join('')
+}
+
+/** 自包含主题对比页：5 套主题并排，含色板与用法。 */
+export function renderThemePreviewHtml(lang = 'zh') {
+  const L = themePages(lang === 'en' ? 'en' : 'zh')
+  const cards = THEME_IDS.map((id) => {
+    const theme = THEMES[id]
+    const pick = (pair) => (lang === 'en' ? pair.en : pair.zh)
+    const chips = Object.keys(theme.palette).map((key) =>
+      '<span class="chip"><i style="background:' + theme.palette[key] + '"></i>' + escapeHtml(String(theme.palette[key]).toUpperCase()) + '</span>').join('')
+    return '<figure class="card" id="theme-' + escapeHtml(id) + '">' +
+      renderThemeSvg(theme, lang === 'en' ? 'en' : 'zh') +
+      '<figcaption><div class="row"><strong>' + escapeHtml(id) + '</strong><span class="badge">' + escapeHtml(pick(theme.name)) + '</span></div>' +
+      '<p class="muted">' + escapeHtml(pick(theme.mood)) + ' · ' + escapeHtml(pick(theme.bestFor)) + '</p>' +
+      '<p class="chips">' + chips + '</p>' +
+      '<p class="usage">' + escapeHtml(L.usage) + ': <code>' + escapeHtml(id) + '</code></p></figcaption></figure>'
+  }).join('')
+  return '<!DOCTYPE html>' + eolSafe('<html lang="zh-CN">') +
+    '<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">' +
+    '<title>' + escapeHtml(L.title) + '</title><style>' +
+    'body{margin:0;background:#0b0f17;color:#e8f1ff;font-family:"Segoe UI","PingFang SC","Microsoft YaHei",sans-serif;padding:28px}' +
+    'h1{font-size:26px;margin:0 0 6px}p.sub{color:#8b98ad;margin:0 0 24px;font-size:14px}' +
+    '.grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(430px,1fr));gap:22px}' +
+    '.card{margin:0;background:#111827;border:1px solid #263043;border-radius:16px;overflow:hidden}' +
+    '.card svg{display:block;width:100%;height:auto}' +
+    'figcaption{padding:14px 16px 16px}.row{display:flex;align-items:center;gap:10px;font-size:16px}' +
+    '.badge{color:#8b98ad;font-size:13px}.muted{color:#8b98ad;font-size:13px;margin:6px 0 10px;line-height:1.5}' +
+    '.chips{display:flex;flex-wrap:wrap;gap:6px;margin:0 0 10px}.chip{display:inline-flex;align-items:center;gap:6px;font-size:12px;color:#aab6c9;background:#0b0f17;border:1px solid #263043;border-radius:99px;padding:3px 9px}' +
+    '.chip i{width:10px;height:10px;border-radius:3px;display:inline-block}' +
+    '.usage{margin:0;font-size:13px;color:#aab6c9}code{background:#0b0f17;border:1px solid #263043;border-radius:6px;padding:1px 6px}' +
+    '@media (prefers-reduced-motion: reduce){*{transition:none!important;animation:none!important}}' +
+    '</style></head><body><h1>' + escapeHtml(L.title) + '</h1><p class="sub">' + escapeHtml(L.hint) + ' · dsh-ppt v' + escapeHtml(DECK_VERSION) + '</p>' +
+    '<div class="grid">' + cards + '</div></body></html>'
+}
+
+function eolSafe(text) { return text }
+
+/** 写主题对比页 + 每套主题 SVG 色板卡；默认不覆盖同名文件。 */
+export function buildThemePreview(options = {}) {
+  const langInput = typeof options.lang === 'string' && options.lang.trim() !== '' ? options.lang.trim() : 'zh'
+  const language = resolveLanguage(langInput)
+  const outputDir = resolvePath(String(options.outputDir ?? '.'))
+  mkdirSync(outputDir, { recursive: true })
+  const overwrite = options.overwrite === true
+  const pickPath = (base, ext) => {
+    const first = resolvePath(joinPath(outputDir, base + ext))
+    if (overwrite || !existsSync(first)) return first
+    for (let i = 1; i < 1000; i += 1) {
+      const candidate = resolvePath(joinPath(outputDir, base + '-' + i + ext))
+      if (!existsSync(candidate)) return candidate
+    }
+    throw new Error('dsh-ppt：找不到可用的预览文件名（同名前缀超过 999 个），请允许 overwrite。')
+  }
+  const htmlPath = pickPath('themes-preview', '.html')
+  writeFileSync(htmlPath, renderThemePreviewHtml(language.id), 'utf8')
+  const svgs = THEME_IDS.map((id) => {
+    const svgPath = pickPath('theme-' + id, '.svg')
+    writeFileSync(svgPath, renderThemeSvg(id, language.id), 'utf8')
+    return { id, path: svgPath }
+  })
+  return { ok: true, outputDir, htmlPath, svgs, themeCount: THEME_IDS.length, language: language.id }
+}
+
+
 export function resolveTheme(input) {
   const id = String(input ?? DEFAULT_THEME).trim().toLowerCase()
   const theme = THEMES[id]
@@ -430,7 +434,7 @@ const DECK_ARTIFACT_EXTENSIONS = ['.html', '.pptx', '.json']
  * 为三件套选择同一个可用文件名前缀。默认不覆盖：任一产物已存在时，
  * 整组改用 -1/-2… 后缀，避免新旧 deck 被静默混写。
  */
-function resolveDeckFileName(outputDir, requestedFileName, overwrite) {
+export function resolveDeckFileName(outputDir, requestedFileName, overwrite) {
   // 一次 readdir 建集，替代逐个候选 existsSync 探测（最坏 ~3000 次 stat）；
   // 统一小写比较，避免 Windows 大小写不敏感文件系统把已占用的名字判成可用。
   const existing = new Set(readdirSync(outputDir).map((name) => name.toLowerCase()))
@@ -794,11 +798,11 @@ export function parseMarkdownDeck(titleInput, content, lang = 'zh') {
   return { title: coverTitle || 'Untitled', subtitle: coverSubtitle, slides }
 }
 
-const SLIDE_LAYOUTS = new Set(['cover', 'section', 'bullets', 'statement', 'closing', 'quote', 'table'])
+const SLIDE_LAYOUTS = new Set(['cover', 'section', 'bullets', 'statement', 'closing', 'quote', 'table', ...MEDIA_LAYOUTS])
 
 function normalizeSlide(raw, index) {
   const source = (raw !== null && typeof raw === 'object') ? raw : {}
-  const layout = SLIDE_LAYOUTS.has(source.layout) ? source.layout : 'bullets'
+  const layout = SLIDE_LAYOUTS.has(source.layout) ? source.layout : source.chart ? 'chart' : source.image ? 'image-right' : 'bullets'
   const title = stripInlineMarkdown(source.title ?? '')
   const subtitle = stripInlineMarkdown(source.subtitle ?? '')
   const kicker = stripInlineMarkdown(source.kicker ?? '')
@@ -811,6 +815,7 @@ function normalizeSlide(raw, index) {
   } else if (typeof source.bullets === 'string' && source.bullets.trim() !== '') {
     bullets = splitSentences(source.bullets)
   }
+  if (MEDIA_LAYOUTS.has(layout)) return normalizeMediaSlide(source, { layout, kicker, title, subtitle, text, bullets, ...(notes !== '' ? { notes } : {}) }, index)
   if (layout === 'statement' && title === '' && text !== '') {
     return { layout, kicker, title: text, subtitle: subtitle || '', bullets, ...(notes !== '' ? { notes } : {}) }
   }
@@ -891,7 +896,7 @@ export function normalizeBuildOptions(options = {}) {
  * 任一步失败都清理临时文件，并把已提交的目标恢复为调用前的内容，
  * 避免出现「json/html 已更新、pptx 还是旧的」这类混版状态。
  */
-function commitDeckArtifacts(artifacts) {
+export 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) => {
@@ -945,6 +950,9 @@ function commitDeckArtifacts(artifacts) {
 }
 
 export function buildDeck(options = {}) {
+  if (options.brand || options.template || options.slides?.some(slide => MEDIA_LAYOUTS.has(slide.layout) || slide.image || slide.chart)) {
+    throw new Error('dsh-ppt：图片、图表、模板与品牌请使用异步 buildDeckAsync 或 ppt_create / CLI')
+  }
   const normalized = normalizeBuildOptions(options)
   const { title, theme, language, motion, deck, outputDir, overwrite } = normalized
   mkdirSync(outputDir, { recursive: true })
@@ -966,7 +974,7 @@ export function buildDeck(options = {}) {
   // 先生成三份内容再统一提交：生成阶段抛错时也不会留下半套文件。
   commitDeckArtifacts([
     { path: jsonPath, data: JSON.stringify(manifest, null, 2) + '\n', encoding: 'utf8' },
-    { path: htmlPath, data: renderHtml(manifest, theme, language), encoding: 'utf8' },
+    { path: htmlPath, data: renderHtml(manifest, theme, language, { pptx: pptxPath, json: jsonPath }), encoding: 'utf8' },
     { path: pptxPath, data: buildPptx(manifest, theme, language) },
   ])
 
@@ -992,189 +1000,192 @@ export function buildDeck(options = {}) {
 // HTML 网页放映
 // ---------------------------------------------------------------------------
 
-export function renderHtml(manifest, theme, language) {
-  const t = theme
-  const lang = language
-  const ui = lang.ui
-  const motion = manifest.motion !== false
-  const motionCss = motion
-    ? `body.motion .slide.is-active{animation:slide-in .45s cubic-bezier(.22,.8,.36,1)}
-@keyframes slide-in{from{opacity:0;transform:translateY(24px)}to{opacity:1;transform:none}}
-body.motion .bullets li{
-  opacity:0;animation:bullet-in .55s cubic-bezier(.22,.8,.36,1) forwards;
-  animation-delay:calc(var(--i, 0)*90ms + .12s);
-}
-@keyframes bullet-in{from{opacity:0;transform:translateY(14px)}to{opacity:1;transform:none}}`
-    : ''
-  const slides = manifest.slides.map((slide, index) => {
-    const label = slide.title || slide.kicker || (ui.slide + ' ' + (index + 1))
-    return '<div class="slide-frame" data-frame="' + (index + 1) + '" tabindex="-1" role="button" aria-label="' + escapeHtml(String(label)) + '">' +
-      renderHtmlSlide(slide, index, ui, lang.id) + '</div>'
-  }).join('\n')
-  const themeLabel = t.name[lang.id] ?? t.name.en
+export function renderHtml(manifest, theme, language, files = {}) {
+  const t = theme
+  const lang = language
+  const ui = lang.ui
+  const motion = manifest.motion !== false
+  const motionCss = motion
+    ? `body.motion .slide.is-active{animation:slide-in .45s cubic-bezier(.22,.8,.36,1)}
+@keyframes slide-in{from{opacity:0;transform:translateY(24px)}to{opacity:1;transform:none}}
+body.motion .bullets li{
+  opacity:0;animation:bullet-in .55s cubic-bezier(.22,.8,.36,1) forwards;
+  animation-delay:calc(var(--i, 0)*90ms + .12s);
+}
+@keyframes bullet-in{from{opacity:0;transform:translateY(14px)}to{opacity:1;transform:none}}`
+    : ''
+  const slides = manifest.slides.map((slide, index) => {
+    const label = slide.title || slide.kicker || (ui.slide + ' ' + (index + 1))
+    return '<div class="slide-frame" data-frame="' + (index + 1) + '" tabindex="-1" role="button" aria-label="' + escapeHtml(String(label)) + '">' +
+      renderHtmlSlide(slide, index, ui, lang.id, manifest, theme) + '</div>'
+  }).join('\n')
+  const themeLabel = t.name[lang.id] ?? t.name.en
   const total = manifest.slides.length
-
-  return `<!DOCTYPE html>
-<html lang="${lang.attr}">
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="icon" href="data:,">
-<title>${escapeHtml(manifest.title)}</title>
-<style>
-:root{
-  --bg:${t.palette.bg};
-  --panel:${t.palette.panel};
-  --fg:${t.palette.fg};
-  --muted:${t.palette.muted};
-  --accent:${t.palette.accent};
-  --accent2:${t.palette.accent2};
-  --font-heading:${t.fonts.heading};
-  --font-body:${t.fonts.body};
-}
-*{box-sizing:border-box}
-html,body{height:100%}
-body{
-  margin:0;background:var(--bg);color:var(--fg);
-  font-family:var(--font-body);overflow:hidden;
-  -webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;
-}
-#stage{position:fixed;inset:0}
-.slide-frame{position:fixed;inset:0}
-.slide{
-  position:absolute;inset:0;display:none;flex-direction:column;justify-content:center;
-  padding:clamp(34px,7vw,110px);overflow:hidden;
-}
-.slide::before{
-  content:"";position:absolute;inset:-20%;pointer-events:none;z-index:-1;
-  background:
-    radial-gradient(42% 34% at 82% 18%, ${hexToRgba(t.palette.accent, t.dark ? 0.22 : 0.12)}, transparent 70%),
-    radial-gradient(36% 30% at 12% 86%, ${hexToRgba(t.palette.accent2, t.dark ? 0.16 : 0.12)}, transparent 70%),
-    radial-gradient(70% 60% at 50% 50%, ${hexToRgba(t.palette.panel, 0.55)}, transparent 100%);
-}
-.slide.is-active{display:flex}
-${motionCss}
-.kicker{
-  color:var(--accent);font-weight:700;letter-spacing:.18em;text-transform:uppercase;
-  font-size:clamp(12px,1.3vw,18px);margin-bottom:22px;
-}
-h1,h2,.statement-title{font-family:var(--font-heading);line-height:1.06;letter-spacing:-.015em;margin:0}
-h1{font-size:clamp(44px,7.4vw,118px);max-width:20ch}
-h2{font-size:clamp(34px,5vw,82px);max-width:20ch}
-.subtitle{
-  color:var(--muted);font-size:clamp(18px,2.3vw,34px);line-height:1.5;
-  max-width:46em;margin-top:28px;
-}
-.meta{
-  color:var(--muted);font-size:clamp(12px,1.2vw,16px);margin-top:48px;
-  letter-spacing:.06em;
-}
-.bullets ul{margin:30px 0 0;padding:0;list-style:none;display:grid;gap:clamp(12px,1.6vw,24px)}
-.bullets li{
-  position:relative;padding-left:clamp(28px,2.6vw,44px);
-  font-size:clamp(20px,2.6vw,40px);line-height:1.35;max-width:24em;
-}
-.bullets li::before{
-  content:"";position:absolute;left:0;top:.58em;width:.5em;height:.5em;
-  background:var(--accent);border-radius:2px;box-shadow:.28em .28em 0 color-mix(in srgb, var(--accent2) 78%, transparent);
-}
-.section .kicker{margin-bottom:10px}
-.section .accent-line{width:min(180px,18vw);height:6px;background:var(--accent);margin:28px 0}
-.statement-title{
-  font-size:clamp(34px,5.4vw,88px);max-width:22ch;font-weight:800;
-  border-left:6px solid var(--accent);padding-left:clamp(22px,3vw,48px);
-}
-.closing{text-align:center;align-items:center}
-.closing h1,.closing .statement-title{font-size:clamp(52px,9vw,148px)}
-.closing .subtitle{color:var(--accent);font-weight:700}
-.cover h1{font-weight:900}
-.quote-mark{
-  font-family:var(--font-heading);font-size:clamp(90px,13vw,210px);line-height:.62;
-  color:var(--accent);margin-bottom:clamp(14px,2vw,30px);
-}
-.quote-text{
-  font-family:var(--font-heading);font-size:clamp(26px,4.2vw,62px);line-height:1.28;
-  font-weight:700;max-width:22ch;margin:0;
-}
-.quote-attr{color:var(--muted);margin-top:clamp(18px,2.6vw,34px);font-size:clamp(15px,1.8vw,26px);letter-spacing:.04em}
-table.deck-table{
-  border-collapse:collapse;margin-top:clamp(20px,3vw,42px);width:100%;max-width:100%;
-  font-size:clamp(14px,1.55vw,23px);
-}
-.deck-table th{
-  background:color-mix(in srgb, var(--accent) 26%, var(--bg));color:var(--fg);
-  text-align:left;font-weight:700;padding:.6em .9em;letter-spacing:.02em;
-  border-bottom:2px solid var(--accent);
-}
-.deck-table td{
-  padding:.55em .9em;border-bottom:1px solid color-mix(in srgb, var(--muted) 55%, transparent);
-  color:var(--fg);
-}
-.deck-table .num{text-align:right;font-variant-numeric:tabular-nums}
-.deck-table tbody tr:nth-child(even){background:color-mix(in srgb, var(--panel) 62%, transparent)}
-#progress{position:fixed;top:0;left:0;height:3px;width:0;background:var(--accent);z-index:30;transition:width .25s}
-#hud{
-  position:fixed;right:22px;bottom:18px;z-index:50;display:flex;gap:10px;align-items:center;
-  color:var(--muted);font-size:13px;letter-spacing:.08em;font-variant-numeric:tabular-nums;
-}
-#hud button{
-  background:color-mix(in srgb, var(--panel) 88%, transparent);color:var(--fg);
-  border:1px solid color-mix(in srgb, var(--muted) 45%, transparent);border-radius:99px;
-  padding:8px 14px;min-height:34px;font:inherit;cursor:pointer;
-}
-#hud button:hover{border-color:var(--accent);color:var(--accent)}
-#notes-panel{
-  position:fixed;left:0;right:0;bottom:64px;z-index:40;display:none;
-  background:color-mix(in srgb, var(--panel) 96%, black 4%);
-  border-top:2px solid var(--accent);
-  padding:14px clamp(22px,4vw,64px) 18px;max-height:38vh;overflow:auto;
-}
-body.notes-open #notes-panel{display:block}
-#notes-panel .notes-head{display:flex;align-items:center;justify-content:space-between;gap:16px}
-#notes-close{
-  background:transparent;color:var(--muted);border:1px solid color-mix(in srgb, var(--muted) 45%, transparent);
-  border-radius:99px;padding:4px 12px;font:inherit;cursor:pointer;min-height:30px;
-}
-#notes-close:hover{color:var(--accent);border-color:var(--accent)}
-#notes-panel .notes-label{
-  color:var(--accent);font-weight:700;letter-spacing:.14em;text-transform:uppercase;
-  font-size:12px;margin-bottom:8px;
-}
-#notes-text{white-space:pre-wrap;line-height:1.65;font-size:clamp(15px,1.5vw,18px);color:var(--fg)}
-#notes-text.is-empty{color:var(--muted);font-style:italic}
-#help-panel{
-  position:fixed;right:22px;bottom:64px;z-index:60;max-width:390px;
-  background:color-mix(in srgb, var(--panel) 96%, black 4%);color:var(--fg);
-  border:1px solid color-mix(in srgb, var(--accent) 55%, transparent);border-radius:14px;
-  padding:16px 20px;box-shadow:0 18px 50px rgba(0,0,0,.45);font-size:14px;line-height:1.8;
-}
-#help-panel[hidden]{display:none}
-#help-panel kbd{
-  background:color-mix(in srgb, var(--accent) 22%, transparent);border-radius:5px;
-  padding:1px 6px;font-family:inherit;font-size:12px;
-}
-#toast{
-  position:fixed;left:50%;bottom:84px;transform:translateX(-50%);z-index:70;
-  background:color-mix(in srgb, var(--panel) 96%, black 4%);color:var(--fg);
-  border:1px solid color-mix(in srgb, var(--accent) 55%, transparent);border-radius:99px;
-  padding:9px 18px;font-size:13px;
-}
-#toast[hidden]{display:none}
-#blank{position:fixed;inset:0;z-index:80;display:none;pointer-events:none}
-body.blank-black #blank{display:block;background:#000}
-body.blank-white #blank{display:block;background:#fff}
-body.blank-black #hud,body.blank-white #hud{visibility:hidden;pointer-events:none}
-:focus-visible{outline:2px solid var(--accent);outline-offset:2px}
-body.overview #stage{
-  display:grid;grid-template-columns:repeat(auto-fill,minmax(300px,1fr));gap:18px;
-  padding:18px 18px 92px;position:fixed;inset:0;overflow:auto;align-content:start;
-}
-body.overview .slide-frame{
-  position:relative;inset:auto;width:100%;aspect-ratio:16/9;overflow:hidden;
-  border:1px solid color-mix(in srgb, var(--muted) 35%, transparent);border-radius:12px;
-  cursor:pointer;background:var(--bg);outline:none;
-}
-body.overview .slide-frame:hover{border-color:var(--accent)}
+  const delivery = renderDelivery(manifest, files, lang.id)
+
+  return `<!DOCTYPE html>
+<html lang="${lang.attr}">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="icon" href="data:,">
+<title>${escapeHtml(manifest.title)}</title>
+<style>
+:root{
+  --bg:${t.palette.bg};
+  --panel:${t.palette.panel};
+  --fg:${t.palette.fg};
+  --muted:${t.palette.muted};
+  --accent:${t.palette.accent};
+  --accent2:${t.palette.accent2};
+  --font-heading:${t.fonts.heading};
+  --font-body:${t.fonts.body};
+}
+*{box-sizing:border-box}
+html,body{height:100%}
+body{
+  margin:0;background:var(--bg);color:var(--fg);
+  font-family:var(--font-body);overflow:hidden;
+  -webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;
+}
+#stage{position:fixed;inset:0}
+.slide-frame{position:fixed;inset:0}
+.slide{
+  position:absolute;inset:0;display:none;flex-direction:column;justify-content:center;
+  padding:clamp(34px,7vw,110px);overflow:hidden;
+}
+.slide::before{
+  content:"";position:absolute;inset:-20%;pointer-events:none;z-index:-1;
+  background:
+    radial-gradient(42% 34% at 82% 18%, ${hexToRgba(t.palette.accent, t.dark ? 0.22 : 0.12)}, transparent 70%),
+    radial-gradient(36% 30% at 12% 86%, ${hexToRgba(t.palette.accent2, t.dark ? 0.16 : 0.12)}, transparent 70%),
+    radial-gradient(70% 60% at 50% 50%, ${hexToRgba(t.palette.panel, 0.55)}, transparent 100%);
+}
+.slide.is-active{display:flex}
+${motionCss}
+${MEDIA_CSS}
+.kicker{
+  color:var(--accent);font-weight:700;letter-spacing:.18em;text-transform:uppercase;
+  font-size:clamp(12px,1.3vw,18px);margin-bottom:22px;
+}
+h1,h2,.statement-title{font-family:var(--font-heading);line-height:1.06;letter-spacing:-.015em;margin:0}
+h1{font-size:clamp(44px,7.4vw,118px);max-width:20ch}
+h2{font-size:clamp(34px,5vw,82px);max-width:20ch}
+.subtitle{
+  color:var(--muted);font-size:clamp(18px,2.3vw,34px);line-height:1.5;
+  max-width:46em;margin-top:28px;
+}
+.meta{
+  color:var(--muted);font-size:clamp(12px,1.2vw,16px);margin-top:48px;
+  letter-spacing:.06em;
+}
+.bullets ul{margin:30px 0 0;padding:0;list-style:none;display:grid;gap:clamp(12px,1.6vw,24px)}
+.bullets li{
+  position:relative;padding-left:clamp(28px,2.6vw,44px);
+  font-size:clamp(20px,2.6vw,40px);line-height:1.35;max-width:24em;
+}
+.bullets li::before{
+  content:"";position:absolute;left:0;top:.58em;width:.5em;height:.5em;
+  background:var(--accent);border-radius:2px;box-shadow:.28em .28em 0 color-mix(in srgb, var(--accent2) 78%, transparent);
+}
+.section .kicker{margin-bottom:10px}
+.section .accent-line{width:min(180px,18vw);height:6px;background:var(--accent);margin:28px 0}
+.statement-title{
+  font-size:clamp(34px,5.4vw,88px);max-width:22ch;font-weight:800;
+  border-left:6px solid var(--accent);padding-left:clamp(22px,3vw,48px);
+}
+.closing{text-align:center;align-items:center}
+.closing h1,.closing .statement-title{font-size:clamp(52px,9vw,148px)}
+.closing .subtitle{color:var(--accent);font-weight:700}
+.cover h1{font-weight:900}
+.quote-mark{
+  font-family:var(--font-heading);font-size:clamp(90px,13vw,210px);line-height:.62;
+  color:var(--accent);margin-bottom:clamp(14px,2vw,30px);
+}
+.quote-text{
+  font-family:var(--font-heading);font-size:clamp(26px,4.2vw,62px);line-height:1.28;
+  font-weight:700;max-width:22ch;margin:0;
+}
+.quote-attr{color:var(--muted);margin-top:clamp(18px,2.6vw,34px);font-size:clamp(15px,1.8vw,26px);letter-spacing:.04em}
+table.deck-table{
+  border-collapse:collapse;margin-top:clamp(20px,3vw,42px);width:100%;max-width:100%;
+  font-size:clamp(14px,1.55vw,23px);
+}
+.deck-table th{
+  background:color-mix(in srgb, var(--accent) 26%, var(--bg));color:var(--fg);
+  text-align:left;font-weight:700;padding:.6em .9em;letter-spacing:.02em;
+  border-bottom:2px solid var(--accent);
+}
+.deck-table td{
+  padding:.55em .9em;border-bottom:1px solid color-mix(in srgb, var(--muted) 55%, transparent);
+  color:var(--fg);
+}
+.deck-table .num{text-align:right;font-variant-numeric:tabular-nums}
+.deck-table tbody tr:nth-child(even){background:color-mix(in srgb, var(--panel) 62%, transparent)}
+#progress{position:fixed;top:0;left:0;height:3px;width:0;background:var(--accent);z-index:30;transition:width .25s}
+#hud{
+  position:fixed;left:22px;right:22px;bottom:18px;z-index:50;display:flex;flex-wrap:wrap;justify-content:flex-end;gap:10px;align-items:center;
+  color:var(--muted);font-size:13px;letter-spacing:.08em;font-variant-numeric:tabular-nums;
+}
+#hud button{
+  background:color-mix(in srgb, var(--panel) 88%, transparent);color:var(--fg);
+  border:1px solid color-mix(in srgb, var(--muted) 45%, transparent);border-radius:99px;
+  padding:8px 14px;min-height:34px;font:inherit;cursor:pointer;
+}
+#hud button:hover{border-color:var(--accent);color:var(--accent)}
+#notes-panel{
+  position:fixed;left:0;right:0;bottom:64px;z-index:40;display:none;
+  background:color-mix(in srgb, var(--panel) 96%, black 4%);
+  border-top:2px solid var(--accent);
+  padding:14px clamp(22px,4vw,64px) 18px;max-height:38vh;overflow:auto;
+}
+body.notes-open #notes-panel{display:block}
+#notes-panel .notes-head{display:flex;align-items:center;justify-content:space-between;gap:16px}
+#notes-close{
+  background:transparent;color:var(--muted);border:1px solid color-mix(in srgb, var(--muted) 45%, transparent);
+  border-radius:99px;padding:4px 12px;font:inherit;cursor:pointer;min-height:30px;
+}
+#notes-close:hover{color:var(--accent);border-color:var(--accent)}
+#notes-panel .notes-label{
+  color:var(--accent);font-weight:700;letter-spacing:.14em;text-transform:uppercase;
+  font-size:12px;margin-bottom:8px;
+}
+#notes-text{white-space:pre-wrap;line-height:1.65;font-size:clamp(15px,1.5vw,18px);color:var(--fg)}
+#notes-text.is-empty{color:var(--muted);font-style:italic}
+#help-panel{
+  position:fixed;right:22px;bottom:64px;z-index:60;max-width:390px;
+  background:color-mix(in srgb, var(--panel) 96%, black 4%);color:var(--fg);
+  border:1px solid color-mix(in srgb, var(--accent) 55%, transparent);border-radius:14px;
+  padding:16px 20px;box-shadow:0 18px 50px rgba(0,0,0,.45);font-size:14px;line-height:1.8;
+}
+#help-panel[hidden]{display:none}
+#help-panel kbd{
+  background:color-mix(in srgb, var(--accent) 22%, transparent);border-radius:5px;
+  padding:1px 6px;font-family:inherit;font-size:12px;
+}
+#toast{
+  position:fixed;left:50%;bottom:84px;transform:translateX(-50%);z-index:70;
+  background:color-mix(in srgb, var(--panel) 96%, black 4%);color:var(--fg);
+  border:1px solid color-mix(in srgb, var(--accent) 55%, transparent);border-radius:99px;
+  padding:9px 18px;font-size:13px;
+}
+#toast[hidden]{display:none}
+#blank{position:fixed;inset:0;z-index:80;display:none;pointer-events:none}
+body.blank-black #blank{display:block;background:#000}
+body.blank-white #blank{display:block;background:#fff}
+body.blank-black #hud,body.blank-white #hud{visibility:hidden;pointer-events:none}
+:focus-visible{outline:2px solid var(--accent);outline-offset:2px}
+body.overview #stage{
+  display:grid;grid-template-columns:repeat(auto-fill,minmax(300px,1fr));gap:18px;
+  grid-auto-rows:var(--deck-thumb-height,180px);
+  padding:18px 18px 92px;position:fixed;inset:0;overflow:auto;align-content:start;
+}
+body.overview .slide-frame{
+  position:relative;inset:auto;width:100%;aspect-ratio:16/9;overflow:hidden;
+  border:1px solid color-mix(in srgb, var(--muted) 35%, transparent);border-radius:12px;
+  cursor:pointer;background:var(--bg);outline:none;
+}
+body.overview .slide-frame:hover{border-color:var(--accent)}
 body.overview .slide-frame.is-current{outline:2px solid var(--accent);outline-offset:2px}
 body.overview .slide-frame:focus-visible{outline:2px solid var(--accent);outline-offset:-3px}
 body.overview .slide-frame::after{
@@ -1182,125 +1193,130 @@ body.overview .slide-frame::after{
   font-size:12px;color:var(--muted);background:color-mix(in srgb, var(--bg) 84%, transparent);
   border:1px solid color-mix(in srgb, var(--muted) 40%, transparent);border-radius:6px;
   padding:1px 7px;font-variant-numeric:tabular-nums;
-}
-body.overview .slide{
-  display:flex !important;position:absolute;inset:0;width:100vw;height:100vh;
-  transform:scale(var(--deck-thumb-scale,.25));transform-origin:top left;pointer-events:none;
-  animation:none !important;
-}
-body.overview .bullets li{opacity:1 !important;animation:none !important}
-body.overview #notes-panel,body.presenting #notes-panel{display:none !important}
+}
+body.overview .slide{
+  display:flex !important;position:absolute;inset:0;width:1280px;height:720px;
+  transform:scale(var(--deck-thumb-scale,.25));transform-origin:top left;pointer-events:none;
+  animation:none !important;
+}
+body.overview .bullets li{opacity:1 !important;animation:none !important}
+body.overview .media-canvas{width:1280px;height:720px}
+body.overview #notes-panel,body.presenting #notes-panel{display:none !important}
 body.presenting #notes-toggle{opacity:.55}
 body.presenting #hud{opacity:0;pointer-events:none;transition:opacity .25s}
-body.presenting #hud:hover{opacity:1;pointer-events:auto}
-@media (max-width:900px){
-  .slide{padding:clamp(22px,5vw,44px)}
-  h1{font-size:clamp(34px,8.5vw,64px)}
-  h2{font-size:clamp(26px,6.5vw,48px)}
-  .statement-title{font-size:clamp(26px,7vw,54px)}
-  .subtitle{font-size:clamp(16px,3.4vw,24px)}
-  .bullets li{font-size:clamp(16px,3.4vw,24px)}
-  .kicker{font-size:13px}
-  .deck-table{font-size:14px}
-  .deck-table th,.deck-table td{padding:.55em .6em}
-  #hud{right:10px;bottom:10px;gap:8px;font-size:12px}
-  #hud button{padding:10px 16px;min-height:44px}
-  #notes-panel{bottom:68px;max-height:45vh}
-  #help-panel{right:10px;bottom:68px;left:10px;max-width:none}
-}
-@media (max-width:640px){
-  #theme-label{display:none}
-}
-@media (prefers-reduced-motion: reduce){
-  *,*::before,*::after{animation:none !important;transition:none !important}
-}
-@media print{
-  html,body{height:auto;overflow:visible;background:#fff}
-  .slide-frame{position:relative;display:block !important}
-  .slide{position:relative;display:block !important;height:100vh;page-break-after:always;padding:48px}
-  ${motion ? 'body.motion .bullets li{opacity:1 !important;animation:none !important}' : ''}
-  #progress,#hud,#notes-panel,#help-panel,#toast{display:none !important}
-}
+body.presenting #hud:hover{opacity:1;pointer-events:auto}
+@media (max-width:900px){
+  .slide{padding:clamp(22px,5vw,44px)}
+  h1{font-size:clamp(34px,8.5vw,64px)}
+  h2{font-size:clamp(26px,6.5vw,48px)}
+  .statement-title{font-size:clamp(26px,7vw,54px)}
+  .subtitle{font-size:clamp(16px,3.4vw,24px)}
+  .bullets li{font-size:clamp(16px,3.4vw,24px)}
+  .kicker{font-size:13px}
+  .deck-table{font-size:14px}
+  .deck-table th,.deck-table td{padding:.55em .6em}
+  #hud{left:10px;right:10px;bottom:10px;gap:6px;font-size:12px}
+  #hud button{padding:10px 16px;min-height:44px}
+  #notes-panel{bottom:68px;max-height:45vh}
+  #help-panel{right:10px;bottom:68px;left:10px;max-width:none}
+}
+@media (max-width:640px){
+  #theme-label{display:none}
+}
+@media (prefers-reduced-motion: reduce){
+  *,*::before,*::after{animation:none !important;transition:none !important}
+}
+@media print{
+  html,body{height:auto;overflow:visible;background:#fff}
+  .slide-frame{position:relative;display:block !important}
+  .slide{position:relative;display:block !important;height:100vh;page-break-after:always;padding:48px}
+  ${motion ? 'body.motion .bullets li{opacity:1 !important;animation:none !important}' : ''}
+  #progress,#hud,#notes-panel,#help-panel,#toast{display:none !important}
+}
+${delivery.css}
 </style>
 </head>
 <body class="${motion ? 'motion' : 'no-motion'}">
 <div id="progress" aria-hidden="true"></div>
-<div id="stage">
-${slides}
-</div>
-<div id="hud" aria-live="polite">
+${delivery.body}
+<div id="stage">
+${slides}
+</div>
+<div id="hud" aria-live="polite">
   <span id="counter">${ui.slide} 1 ${ui.of} ${total}</span>
-  <span id="theme-label">${ui.theme} · ${escapeHtml(themeLabel)}</span>
-  <button id="notes-toggle" type="button" title="S · ${escapeHtml(ui.notesToggle)}" aria-controls="notes-panel" aria-expanded="false">${escapeHtml(ui.notesToggle)}</button>
-  <button id="presenter-toggle" type="button" title="V · ${escapeHtml(ui.presenterToggle)}">${escapeHtml(ui.presenterToggle)}</button>
-  <button id="overview-toggle" type="button" title="G · ${escapeHtml(ui.overviewToggle)}" aria-pressed="false">${escapeHtml(ui.overviewToggle)}</button>
-  <button id="help-toggle" type="button" title="?" aria-label="${escapeHtml(ui.helpTitle)}">?</button>
-  <button id="fullscreen" type="button" title="F · Fullscreen" aria-label="Fullscreen">⛶</button>
-</div>
-<div id="notes-panel" role="region" aria-label="${escapeHtml(ui.notesLabel)}">
-  <div class="notes-head">
-    <span class="notes-label">${escapeHtml(ui.notesLabel)}</span>
-    <button id="notes-close" type="button" aria-label="${escapeHtml(ui.notesCloseLabel)}">×</button>
-  </div>
-  <div id="notes-text"></div>
-</div>
-<div id="help-panel" hidden>
-  <div class="notes-label">${escapeHtml(ui.helpTitle)}</div>
-  <p><kbd>←</kbd> <kbd>→</kbd> / <kbd>Space</kbd> 翻页 · <kbd>Home</kbd> / <kbd>End</kbd> 首末页 · <kbd>S</kbd> ${escapeHtml(ui.notesToggle)} · <kbd>V</kbd> ${escapeHtml(ui.presenterToggle)} · <kbd>G</kbd> ${escapeHtml(ui.overviewToggle)} · <kbd>F</kbd> 全屏 · <kbd>P</kbd> 打印 · <kbd>B</kbd> 黑屏 · <kbd>W</kbd> 白屏 · <kbd>Esc</kbd> ${escapeHtml(ui.closeLabel)} · <kbd>?</kbd> ${escapeHtml(ui.helpTitle)}</p>
-  <p>${escapeHtml(ui.presenterHint)}</p>
-  <p>${escapeHtml(ui.overviewHint)}</p>
-</div>
-<div id="toast" role="status" hidden></div>
-<div id="blank" aria-hidden="true"></div>
-<script>
-(() => {
-  const frames = Array.from(document.querySelectorAll('.slide-frame'));
-  const slides = Array.from(document.querySelectorAll('.slide'));
-  const counter = document.getElementById('counter');
-  const progress = document.getElementById('progress');
-  const fullscreenBtn = document.getElementById('fullscreen');
-  const notesPanel = document.getElementById('notes-panel');
-  const notesText = document.getElementById('notes-text');
-  const notesBtn = document.getElementById('notes-toggle');
-  const notesClose = document.getElementById('notes-close');
-  const presenterBtn = document.getElementById('presenter-toggle');
-  const overviewBtn = document.getElementById('overview-toggle');
-  const helpBtn = document.getElementById('help-toggle');
-  const helpPanel = document.getElementById('help-panel');
-  const toastEl = document.getElementById('toast');
+  ${delivery.navigation}
+  <span id="theme-label">${ui.theme} · ${escapeHtml(themeLabel)}</span>
+  <button id="notes-toggle" type="button" title="S · ${escapeHtml(ui.notesToggle)}" aria-controls="notes-panel" aria-expanded="false">${escapeHtml(ui.notesToggle)}</button>
+  <button id="presenter-toggle" type="button" title="V · ${escapeHtml(ui.presenterToggle)}">${escapeHtml(ui.presenterToggle)}</button>
+  <button id="overview-toggle" type="button" title="G · ${escapeHtml(ui.overviewToggle)}" aria-pressed="false">${escapeHtml(ui.overviewToggle)}</button>
+  <button id="help-toggle" type="button" title="?" aria-label="${escapeHtml(ui.helpTitle)}">?</button>
+  <button id="fullscreen" type="button" title="F · Fullscreen" aria-label="Fullscreen">⛶</button>
+</div>
+<div id="notes-panel" role="region" aria-label="${escapeHtml(ui.notesLabel)}">
+  <div class="notes-head">
+    <span class="notes-label">${escapeHtml(ui.notesLabel)}</span>
+    <button id="notes-close" type="button" aria-label="${escapeHtml(ui.notesCloseLabel)}">×</button>
+  </div>
+  <div id="notes-text"></div>
+</div>
+<div id="help-panel" hidden>
+  <div class="notes-label">${escapeHtml(ui.helpTitle)}</div>
+  <p><kbd>←</kbd> <kbd>→</kbd> / <kbd>Space</kbd> 翻页 · <kbd>Home</kbd> / <kbd>End</kbd> 首末页 · <kbd>S</kbd> ${escapeHtml(ui.notesToggle)} · <kbd>V</kbd> ${escapeHtml(ui.presenterToggle)} · <kbd>G</kbd> ${escapeHtml(ui.overviewToggle)} · <kbd>F</kbd> 全屏 · <kbd>P</kbd> 打印 · <kbd>B</kbd> 黑屏 · <kbd>W</kbd> 白屏 · <kbd>Esc</kbd> ${escapeHtml(ui.closeLabel)} · <kbd>?</kbd> ${escapeHtml(ui.helpTitle)}</p>
+  <p>${escapeHtml(ui.presenterHint)}</p>
+  <p>${escapeHtml(ui.overviewHint)}</p>
+</div>
+<div id="toast" role="status" hidden></div>
+<div id="blank" aria-hidden="true"></div>
+<script>
+(() => {
+  const frames = Array.from(document.querySelectorAll('.slide-frame'));
+  const slides = Array.from(document.querySelectorAll('.slide'));
+  const counter = document.getElementById('counter');
+  const progress = document.getElementById('progress');
+  const fullscreenBtn = document.getElementById('fullscreen');
+  const notesPanel = document.getElementById('notes-panel');
+  const notesText = document.getElementById('notes-text');
+  const notesBtn = document.getElementById('notes-toggle');
+  const notesClose = document.getElementById('notes-close');
+  const presenterBtn = document.getElementById('presenter-toggle');
+  const overviewBtn = document.getElementById('overview-toggle');
+  const helpBtn = document.getElementById('help-toggle');
+  const helpPanel = document.getElementById('help-panel');
+  const toastEl = document.getElementById('toast');
   let index = 0;
-  let presenterWin = null;
-  let presenterInitSent = false;
-  let toastTimer = 0;
-  const total = slides.length;
-  const ui = ${JSON.stringify(ui).replace(/</g, '\\u003c')};
-
-  function notesOf(i) { return slides[i] && slides[i].dataset ? (slides[i].dataset.notes || '') : ''; }
-  function titleOf(i) {
-    const el = slides[i] ? slides[i].querySelector('h1,h2,.statement-title,.quote-text') : null;
-    return el ? el.textContent.trim() : '';
-  }
-  function state() {
-    const next = (index + 1) % total;
-    return { index: index, total: total, title: titleOf(index), notes: notesOf(index), nextTitle: titleOf(next), nextNotes: notesOf(next) };
-  }
-  window.__dshPpt = { go: function (delta) { go(index + delta); }, jump: function (i) { go(i); }, state: state };
-
-  function toast(message) {
-    toastEl.textContent = message;
-    toastEl.hidden = false;
-    clearTimeout(toastTimer);
-    toastTimer = setTimeout(function () { toastEl.hidden = true; }, 2600);
-  }
-
-  function syncNotes() {
-    const notes = notesOf(index);
-    notesText.textContent = notes || ui.noNotes;
-    notesText.classList.toggle('is-empty', notes === '');
-    notesBtn.setAttribute('aria-expanded', document.body.classList.contains('notes-open') ? 'true' : 'false');
-    updatePresenter();
-  }
-
+  let syncDelivery = () => {};
+  let presenterWin = null;
+  let presenterInitSent = false;
+  let toastTimer = 0;
+  const total = slides.length;
+  const ui = ${JSON.stringify(ui).replace(/</g, '\\u003c')};
+
+  function notesOf(i) { return slides[i] && slides[i].dataset ? (slides[i].dataset.notes || '') : ''; }
+  function titleOf(i) {
+    const el = slides[i] ? slides[i].querySelector('h1,h2,.statement-title,.quote-text') : null;
+    return el ? el.textContent.trim() : '';
+  }
+  function state() {
+    const next = (index + 1) % total;
+    return { index: index, total: total, title: titleOf(index), notes: notesOf(index), nextTitle: titleOf(next), nextNotes: notesOf(next) };
+  }
+  window.__dshPpt = { go: function (delta) { go(index + delta); }, jump: function (i) { go(i); }, state: state };
+
+  function toast(message) {
+    toastEl.textContent = message;
+    toastEl.hidden = false;
+    clearTimeout(toastTimer);
+    toastTimer = setTimeout(function () { toastEl.hidden = true; }, 2600);
+  }
+
+  function syncNotes() {
+    const notes = notesOf(index);
+    notesText.textContent = notes || ui.noNotes;
+    notesText.classList.toggle('is-empty', notes === '');
+    notesBtn.setAttribute('aria-expanded', document.body.classList.contains('notes-open') ? 'true' : 'false');
+    updatePresenter();
+  }
+
   function sendInit() {
     if (!presenterOpen()) return;
     try {
@@ -1333,51 +1349,55 @@ ${slides}
 
   function updatePresenter() { sendState(); }
 
-  function go(next) {
-    if (document.body.classList.contains('blank-black') || document.body.classList.contains('blank-white')) setBlank(null);
-    const wrapped = next < 0 || next >= total;
-    index = (next + total) % total;
-    slides.forEach(function (slide, i) {
-      slide.classList.toggle('is-active', i === index);
-      if (frames[i]) frames[i].classList.toggle('is-current', i === index);
-    });
+  function go(next) {
+    if (document.body.classList.contains('blank-black') || document.body.classList.contains('blank-white')) setBlank(null);
+    const wrapped = next < 0 || next >= total;
+    index = (next + total) % total;
+    slides.forEach(function (slide, i) {
+      slide.classList.toggle('is-active', i === index);
+      if (frames[i]) frames[i].classList.toggle('is-current', i === index);
+    });
     counter.textContent = ui.slide + ' ' + (index + 1) + ' ' + ui.of + ' ' + total;
-    progress.style.width = ((index + 1) / total * 100) + '%';
-    document.title = (index + 1) + ' / ' + total + ' · ' + ${JSON.stringify(manifest.title).replace(/</g, '\\u003c')};
-    try { history.replaceState?.(null, '', '#slide-' + (index + 1)); } catch (_) { /* file:// 下个别浏览器可能拒绝 */ }
-    if (wrapped) toast(ui.wrapHint + ' ' + (index + 1) + ' / ' + total);
-    syncNotes();
-  }
-
-  function notesOpen() { return document.body.classList.contains('notes-open'); }
-  function presenterOpen() { try { return !!(presenterWin && !presenterWin.closed); } catch (_) { return false; } }
-
-  function setNotes(on) {
-    document.body.classList.toggle('notes-open', on);
-    if (on) setOverview(false);
-    syncNotes();
-  }
-
-  function updateThumbScale() {
-    if (!document.body.classList.contains('overview')) return;
-    requestAnimationFrame(function () {
-      const width = frames[0] ? frames[0].getBoundingClientRect().width : 0;
-      if (width > 0) document.documentElement.style.setProperty('--deck-thumb-scale', String(width / window.innerWidth));
-    });
-  }
-
-  function setOverview(on) {
-    document.body.classList.toggle('overview', on);
-    overviewBtn.setAttribute('aria-pressed', on ? 'true' : 'false');
-    frames.forEach(function (frame) { frame.tabIndex = on ? 0 : -1; });
-    if (on) {
-      document.body.classList.remove('notes-open');
-      helpPanel.hidden = true;
-      syncNotes();
-      updateThumbScale();
-    }
-  }
-
+    syncDelivery(index);
+    progress.style.width = ((index + 1) / total * 100) + '%';
+    document.title = (index + 1) + ' / ' + total + ' · ' + ${JSON.stringify(manifest.title).replace(/</g, '\\u003c')};
+    try { history.replaceState?.(null, '', '#slide-' + (index + 1)); } catch (_) { /* file:// 下个别浏览器可能拒绝 */ }
+    if (wrapped) toast(ui.wrapHint + ' ' + (index + 1) + ' / ' + total);
+    syncNotes();
+  }
+
+  function notesOpen() { return document.body.classList.contains('notes-open'); }
+  function presenterOpen() { try { return !!(presenterWin && !presenterWin.closed); } catch (_) { return false; } }
+
+  function setNotes(on) {
+    document.body.classList.toggle('notes-open', on);
+    if (on) setOverview(false);
+    syncNotes();
+  }
+
+  function updateThumbScale() {
+    if (!document.body.classList.contains('overview')) return;
+    requestAnimationFrame(function () {
+      const width = frames[0] ? frames[0].getBoundingClientRect().width : 0;
+      if (width > 0) {
+        document.documentElement.style.setProperty('--deck-thumb-scale', String(width / 1280));
+        document.documentElement.style.setProperty('--deck-thumb-height', String(width * 9 / 16) + 'px');
+      }
+    });
+  }
+
+  function setOverview(on) {
+    document.body.classList.toggle('overview', on);
+    overviewBtn.setAttribute('aria-pressed', on ? 'true' : 'false');
+    frames.forEach(function (frame) { frame.tabIndex = on ? 0 : -1; });
+    if (on) {
+      document.body.classList.remove('notes-open');
+      helpPanel.hidden = true;
+      syncNotes();
+      updateThumbScale();
+    }
+  }
+
   function presenterHtml() {
     const labelCurrent = ${JSON.stringify(ui.currentLabel)};
     const labelNext = ${JSON.stringify(ui.nextLabel)};
@@ -1424,7 +1444,7 @@ ${slides}
       'function fmt(ms){var s=Math.max(0,Math.floor(ms/1000)),m=Math.floor(s/60);s=s%60;var h=Math.floor(m/60);m=m%60;return (h>0?(h<10?"0":"")+h+":":"")+(m<10?"0":"")+m+":"+(s<10?"0":"")+s}',
       'function clock(){var d=new Date();return ("0"+d.getHours()).slice(-2)+":"+("0"+d.getMinutes()).slice(-2)+":"+("0"+d.getSeconds()).slice(-2)}',
       'function tick(){if(!paused)elapsed=Date.now()-started;q("ptimer").textContent=fmt(elapsed);q("pclock").textContent=clock();if(window.requestAnimationFrame)requestAnimationFrame(tick);else setTimeout(tick,250)}',
-      'function fitBox(box){var rw=box.clientWidth||320,rh=box.clientHeight||180;var s=Math.min(rw/window.innerWidth,rh/window.innerHeight);var ox=(rw-window.innerWidth*s)/2,oy=(rh-window.innerHeight*s)/2;box.style.setProperty("--pv-scale",String(s));box.style.setProperty("--pv-x",ox+"px");box.style.setProperty("--pv-y",oy+"px")}',
+      'function fitBox(box){var rw=box.clientWidth||320,rh=box.clientHeight||180;var s=Math.min(rw/window.innerWidth,rh/window.innerHeight);var ox=(rw-window.innerWidth*s)/2,oy=(rh-window.innerHeight*s)/2;box.style.setProperty("--pv-scale",String(s));box.style.setProperty("--pv-x",ox+"px");box.style.setProperty("--pv-y",oy+"px")}',
       'function fit(){fitBox(q("pv-cur"));fitBox(q("pv-next"));var th=q("thumbs").children;for(var i=0;i<th.length;i++){fitBox(th[i])}}',
       'function setSlide(box,html){box.innerHTML="";var f=document.createElement("div");f.className="pv-slide";f.innerHTML=html;box.appendChild(f)}',
       'function buildThumbs(){var box=q("thumbs");box.innerHTML="";slides.forEach(function(html,i){var t=document.createElement("div");t.className="thumb";var f=document.createElement("div");f.className="pv-slide";f.innerHTML=html;t.appendChild(f);t.addEventListener("click",function(){post({__dshPpt:"cmd",kind:"go",index:i})});box.appendChild(t)});fit()}',
@@ -1458,25 +1478,25 @@ ${slides}
       + '<scr' + 'ipt>' + js + '</scr' + 'ipt></body></html>';
   }
 
-  async function toggleFullscreen() {
-    try {
-      if (document.fullscreenElement) { await document.exitFullscreen?.(); return; }
-      if (!document.documentElement.requestFullscreen || document.fullscreenEnabled === false) {
-        toast(ui.fullscreenUnavailable);
-        return;
-      }
-      await document.documentElement.requestFullscreen();
-      if (!document.fullscreenElement) toast(ui.fullscreenUnavailable);
-    } catch (_) { toast(ui.fullscreenUnavailable); }
-  }
-
-  function openPresenter() {
+  async function toggleFullscreen() {
+    try {
+      if (document.fullscreenElement) { await document.exitFullscreen?.(); return; }
+      if (!document.documentElement.requestFullscreen || document.fullscreenEnabled === false) {
+        toast(ui.fullscreenUnavailable);
+        return;
+      }
+      await document.documentElement.requestFullscreen();
+      if (!document.fullscreenElement) toast(ui.fullscreenUnavailable);
+    } catch (_) { toast(ui.fullscreenUnavailable); }
+  }
+
+  function openPresenter() {
     if (presenterOpen()) { try { presenterWin.focus(); } catch (_) { /* gone */ } return; }
     let url = '';
     try {
       url = URL.createObjectURL(new Blob([presenterHtml()], { type: 'text/html' }));
     } catch (_) { toast(ui.popupBlocked); return; }
-    presenterInitSent = false;
+    presenterInitSent = false;
     presenterWin = window.open(url, 'dsh-ppt-presenter', 'width=1180,height=760');
     if (!presenterWin) {
       try { URL.revokeObjectURL(url); } catch (_) { /* ignore */ }
@@ -1518,10 +1538,10 @@ ${slides}
     const data = event.data || {};
     if (data.__dshPpt === 'cmd' && (data.kind === 'end' || data.kind === 'closed')) { closePresenter(); return; }
     if (!presenterOpen()) return;
-    if (data.__dshPpt === 'ready') {
-      if (!presenterInitSent) { presenterInitSent = true; sendInit(); }
-      sendState();
-      return;
+    if (data.__dshPpt === 'ready') {
+      if (!presenterInitSent) { presenterInitSent = true; sendInit(); }
+      sendState();
+      return;
     }
     if (data.__dshPpt !== 'cmd') return;
     if (data.kind === 'go') {
@@ -1539,98 +1559,103 @@ ${slides}
     }
   });
 
-  document.addEventListener('keydown', (event) => {
-    const key = event.key;
-    const lower = key.toLowerCase();
+  document.addEventListener('keydown', (event) => {
+    const key = event.key;
+    const lower = key.toLowerCase();
     const targetEl = event.target;
-    const interactive = targetEl && (targetEl.tagName === 'BUTTON' || targetEl.tagName === 'INPUT' || targetEl.tagName === 'SELECT' || targetEl.tagName === 'TEXTAREA' || targetEl.isContentEditable === true);
-    if (key === ' ' && interactive) return;
-    if (key === 'Escape') {
-      if (!helpPanel.hidden) { helpPanel.hidden = true; return; }
-      if (document.body.classList.contains('overview')) { setOverview(false); return; }
-      if (notesOpen()) { setNotes(false); return; }
-      if (document.body.classList.contains('presenting') || document.body.classList.contains('blank-black') || document.body.classList.contains('blank-white')) { closePresenter(); return; }
-      if (document.fullscreenElement) { document.exitFullscreen?.(); return; }
-      return;
-    }
-    const inOverview = document.body.classList.contains('overview');
-    if (key === 'ArrowRight' || key === 'PageDown' || key === ' ' || (key === 'ArrowDown' && !inOverview)) {
-      event.preventDefault(); go(index + 1);
-    } else if (key === 'ArrowLeft' || key === 'PageUp' || (key === 'ArrowUp' && !inOverview)) {
-      event.preventDefault(); go(index - 1);
-    } else if (/^[1-9]$/.test(key) && !inOverview) {
-      const jumped = Number(key);
-      if (jumped <= total) { event.preventDefault(); go(jumped - 1); }
-    } else if (key === 'Home') {
-      event.preventDefault(); go(0);
-    } else if (key === 'End') {
-      event.preventDefault(); go(total - 1);
-    } else if (key === 'Enter' && inOverview) {
-      event.preventDefault(); setOverview(false);
-    } else if (lower === 'f') {
-      void toggleFullscreen();
-    } else if (lower === 'g') {
-      setOverview(!inOverview);
-    } else if (lower === 's') {
-      if (document.body.classList.contains('presenting')) { toast(ui.presenterHint); }
-      else { document.body.classList.toggle('notes-open'); syncNotes(); }
-    } else if (lower === 'v') {
-      if (presenterOpen()) closePresenter();
-      else openPresenter();
-    } else if (lower === 'b') {
-      setBlank(document.body.classList.contains('blank-black') ? null : 'black');
-    } else if (lower === 'w') {
-      setBlank(document.body.classList.contains('blank-white') ? null : 'white');
-    } else if (lower === 'p') {
-      window.print();
-    } else if (key === '?') {
-      helpPanel.hidden = !helpPanel.hidden;
-    }
-  });
-
-  let wheelLock = 0;
+    if (document.getElementById('review-panel').open || event.ctrlKey || event.metaKey || event.altKey) return;
+    if (key !== 'Escape' && targetEl && (['INPUT', 'SELECT', 'TEXTAREA'].includes(targetEl.tagName) || targetEl.isContentEditable === true)) return;
+    const interactive = targetEl && (targetEl.tagName === 'BUTTON' || targetEl.tagName === 'INPUT' || targetEl.tagName === 'SELECT' || targetEl.tagName === 'TEXTAREA' || targetEl.isContentEditable === true);
+    if (key === ' ' && interactive) return;
+    if (key === 'Escape') {
+      if (!helpPanel.hidden) { helpPanel.hidden = true; return; }
+      if (document.body.classList.contains('overview')) { setOverview(false); return; }
+      if (notesOpen()) { setNotes(false); return; }
+      if (document.body.classList.contains('presenting') || document.body.classList.contains('blank-black') || document.body.classList.contains('blank-white')) { closePresenter(); return; }
+      if (document.fullscreenElement) { document.exitFullscreen?.(); return; }
+      return;
+    }
+    const inOverview = document.body.classList.contains('overview');
+    if (key === 'ArrowRight' || key === 'PageDown' || key === ' ' || (key === 'ArrowDown' && !inOverview)) {
+      event.preventDefault(); go(index + 1);
+    } else if (key === 'ArrowLeft' || key === 'PageUp' || (key === 'ArrowUp' && !inOverview)) {
+      event.preventDefault(); go(index - 1);
+    } else if (/^[1-9]$/.test(key) && !inOverview) {
+      const jumped = Number(key);
+      if (jumped <= total) { event.preventDefault(); go(jumped - 1); }
+    } else if (key === 'Home') {
+      event.preventDefault(); go(0);
+    } else if (key === 'End') {
+      event.preventDefault(); go(total - 1);
+    } else if (key === 'Enter' && inOverview) {
+      event.preventDefault(); setOverview(false);
+    } else if (lower === 'f') {
+      void toggleFullscreen();
+    } else if (lower === 'g') {
+      setOverview(!inOverview);
+    } else if (lower === 's') {
+      if (document.body.classList.contains('presenting')) { toast(ui.presenterHint); }
+      else { document.body.classList.toggle('notes-open'); syncNotes(); }
+    } else if (lower === 'v') {
+      if (presenterOpen()) closePresenter();
+      else openPresenter();
+    } else if (lower === 'b') {
+      setBlank(document.body.classList.contains('blank-black') ? null : 'black');
+    } else if (lower === 'w') {
+      setBlank(document.body.classList.contains('blank-white') ? null : 'white');
+    } else if (lower === 'p') {
+      window.print();
+    } else if (key === '?') {
+      helpPanel.hidden = !helpPanel.hidden;
+    }
+  });
+
+  let wheelLock = 0;
   document.addEventListener('wheel', (event) => {
-    const now = Date.now();
-    if (now - wheelLock < 550 || document.body.classList.contains('overview') || notesOpen()) return;
-    wheelLock = now;
-    if (Math.abs(event.deltaY) > 12) go(index + (event.deltaY > 0 ? 1 : -1));
-  }, { passive: true });
-
+    if (document.getElementById('review-panel').open || event.target.closest?.('#hud,#delivery-bar,#notes-panel,#help-panel')) return;
+    const now = Date.now();
+    if (now - wheelLock < 550 || document.body.classList.contains('overview') || notesOpen()) return;
+    wheelLock = now;
+    if (Math.abs(event.deltaY) > 12) go(index + (event.deltaY > 0 ? 1 : -1));
+  }, { passive: true });
+
   let touchStartY = 0;
-  document.addEventListener('touchstart', (event) => { touchStartY = event.touches[0].clientY; }, { passive: true });
-  document.addEventListener('touchend', (event) => {
-    const delta = event.changedTouches[0].clientY - touchStartY;
-    if (Math.abs(delta) > 48 && !document.body.classList.contains('overview')) go(index + (delta < 0 ? 1 : -1));
-  }, { passive: true });
-
-  fullscreenBtn.addEventListener('click', () => { void toggleFullscreen(); });
-  notesBtn.addEventListener('click', () => {
-    if (document.body.classList.contains('presenting')) { toast(ui.presenterHint); return; }
-    setNotes(!notesOpen());
-  });
-  notesClose.addEventListener('click', () => setNotes(false));
-  presenterBtn.addEventListener('click', () => { if (presenterOpen()) closePresenter(); else openPresenter(); });
-  overviewBtn.addEventListener('click', () => setOverview(!document.body.classList.contains('overview')));
-  helpBtn.addEventListener('click', () => { helpPanel.hidden = !helpPanel.hidden; });
-  frames.forEach((frame, i) => {
-    frame.addEventListener('click', () => {
-      if (document.body.classList.contains('overview')) { go(i); setOverview(false); }
-    });
-    frame.addEventListener('keydown', (event) => {
-      if (event.key === 'Enter' && document.body.classList.contains('overview')) { go(i); setOverview(false); }
-    });
-  });
-  window.addEventListener('resize', updateThumbScale);
-  window.addEventListener('beforeunload', closePresenter);
-
+  let touchOnStage = false;
+  document.addEventListener('touchstart', (event) => { touchOnStage = !document.getElementById('review-panel').open && !!event.target.closest?.('#stage'); touchStartY = event.touches[0].clientY; }, { passive: true });
+  document.addEventListener('touchend', (event) => {
+    const delta = event.changedTouches[0].clientY - touchStartY;
+    if (touchOnStage && Math.abs(delta) > 48 && !document.body.classList.contains('overview')) go(index + (delta < 0 ? 1 : -1));
+  }, { passive: true });
+
+  fullscreenBtn.addEventListener('click', () => { void toggleFullscreen(); });
+  notesBtn.addEventListener('click', () => {
+    if (document.body.classList.contains('presenting')) { toast(ui.presenterHint); return; }
+    setNotes(!notesOpen());
+  });
+  notesClose.addEventListener('click', () => setNotes(false));
+  presenterBtn.addEventListener('click', () => { if (presenterOpen()) closePresenter(); else openPresenter(); });
+  overviewBtn.addEventListener('click', () => setOverview(!document.body.classList.contains('overview')));
+  helpBtn.addEventListener('click', () => { helpPanel.hidden = !helpPanel.hidden; });
+  frames.forEach((frame, i) => {
+    frame.addEventListener('click', () => {
+      if (document.body.classList.contains('overview')) { go(i); setOverview(false); }
+    });
+    frame.addEventListener('keydown', (event) => {
+      if (event.key === 'Enter' && document.body.classList.contains('overview')) { go(i); setOverview(false); }
+    });
+  });
+  window.addEventListener('resize', updateThumbScale);
+  window.addEventListener('beforeunload', closePresenter);
+
+  ${delivery.script}
   const start = Number.parseInt(location.hash?.replace('#slide-', ''), 10);
-  go(Number.isInteger(start) ? start - 1 : 0);
-})();
-</script>
-</body>
-</html>`
-}
-function renderHtmlSlide(slide, index, ui, langId) {
+  go(Number.isInteger(start) ? start - 1 : 0);
+})();
+</script>
+</body>
+</html>`
+}
+function renderHtmlSlide(slide, index, ui, langId, manifest = {}, theme) {
   const kicker = slide.kicker || (slide.layout === 'cover' ? ui.coverKicker : '')
   const title = slide.title || ''
   const subtitle = slide.subtitle || ''
@@ -1638,6 +1663,12 @@ function renderHtmlSlide(slide, index, ui, langId) {
   const number = String(index + 1).padStart(2, '0')
   let inner = ''
   switch (slide.layout) {
+    case 'image':
+    case 'image-left':
+    case 'image-right':
+    case 'chart':
+      inner = renderMediaHtml(slide, manifest, theme)
+      break
     case 'cover':
       inner = '<div class="kicker">' + escapeHtml(kicker) + '</div>' +
         '<h1>' + escapeHtml(title) + '</h1>' +
@@ -1693,7 +1724,9 @@ function renderHtmlSlide(slide, index, ui, langId) {
     ? ' data-notes="' + escapeHtml(slide.notes) + '"'
     : ''
   return '<section class="slide slide--' + escapeHtml(slide.layout || 'bullets') + '" data-index="' + number + '"' + notesAttr + '>' +
-    '<div class="slide-inner">' + inner + '</div></section>'
+    '<div class="slide-inner">' + inner + '</div>' +
+    (manifest.brand?.logoAssetId ? '<img class="brand-logo" src="' + escapeHtml(manifest.assets?.[manifest.brand.logoAssetId]?.data ?? '') + '" alt="' + escapeHtml(manifest.brand.name || 'Logo') + '"/>' : '') +
+    (manifest.brand?.footer ? '<div class="brand-footer">' + escapeHtml(manifest.brand.footer) + '</div>' : '') + '</section>'
 }
 
 function hexToRgba(hex, alpha) {
@@ -1717,9 +1750,28 @@ function hex(value) {
   return String(value).replace('#', '').toUpperCase()
 }
 
-function pptxFontName(value) {
-  const match = /"?([^",]+)"?/.exec(String(value ?? ''))
-  return match?.[1]?.trim() || 'Arial'
+export function pptxFontName(value) {
+  const names = String(value ?? '').split(',').map(name => name.trim().replace(/^["']|["']$/g, '')).filter(Boolean)
+  // A CSS stack may start with an optional web font. Office receives one actual
+  // family, so select a platform fallback instead of copying the first name.
+  if (names.length === 1 && !['serif', 'sans-serif', 'system-ui'].includes(names[0])) return names[0]
+  const available = process.platform === 'win32'
+    ? ['Segoe UI', 'Arial', 'Arial Black', 'Impact', 'Georgia', 'Times New Roman', 'Microsoft YaHei', 'SimSun']
+    : process.platform === 'darwin'
+      ? ['Helvetica Neue', 'Arial', 'Impact', 'Georgia', 'Times New Roman', 'Avenir Next', 'PingFang SC', 'Songti SC']
+      : ['Liberation Sans', 'Liberation Serif', 'Noto Sans', 'Noto Sans CJK SC', 'Noto Serif CJK SC']
+  return names.find(name => available.includes(name)) || (names.includes('serif')
+    ? process.platform === 'linux' ? 'Liberation Serif' : 'Georgia'
+    : process.platform === 'win32' ? 'Segoe UI' : process.platform === 'darwin' ? 'Helvetica Neue' : 'Liberation Sans')
+}
+
+export function pptxEastAsianFont(value) {
+  const font = pptxFontName(value)
+  if (/Microsoft YaHei|SimSun|SimHei|PingFang|Songti|Heiti|Noto (Sans|Serif) CJK|[\u3400-\u9fff]/i.test(font)) return font
+  const serif = /Georgia|Times New Roman|Cambria|Liberation Serif/i.test(font)
+  return process.platform === 'win32' ? serif ? 'SimSun' : 'Microsoft YaHei'
+    : process.platform === 'darwin' ? serif ? 'Songti SC' : 'PingFang SC'
+    : serif ? 'Noto Serif CJK SC' : 'Noto Sans CJK SC'
 }
 
 function paragraphXml(text, options = {}) {
@@ -1735,20 +1787,14 @@ function paragraphXml(text, options = {}) {
     spaceAfter = 0,
   } = options
   const runFont = pptxFontName(font)
-    let pPr = ''
-  if (bullet) {
-    pPr = '<a:pPr marL="285750" indent="-285750"><a:buFont typeface="Arial" panose="020B0604020202020204"/><a:buChar char="•"/></a:pPr>'
-  } else {
-    const parts = [] // align 与 spacing 二选一
-    if (align !== 'l') parts.push('algn="' + align + '"')
-    if (spaceBefore > 0) parts.push('<a:spcBef><a:spcPts val="' + (spaceBefore / 100) + '"/></a:spcBef>')
-    if (spaceAfter > 0) parts.push('<a:spcAft><a:spcPts val="' + (spaceAfter / 100) + '"/></a:spcAft>')
-    pPr = '<a:pPr' + (parts.length > 0 ? ' ' + parts.join(' ') : '') + '><a:buNone/></a:pPr>'
-  }
+  const spacing = (spaceBefore > 0 ? '<a:spcBef><a:spcPts val="' + spaceBefore + '"/></a:spcBef>' : '') +
+    (spaceAfter > 0 ? '<a:spcAft><a:spcPts val="' + spaceAfter + '"/></a:spcAft>' : '')
+  const pPr = '<a:pPr' + (bullet ? ' marL="285750" indent="-285750"' : align !== 'l' ? ' algn="' + align + '"' : '') + '>' + spacing +
+    (bullet ? '<a:buFont typeface="Arial" panose="020B0604020202020204"/><a:buChar char="•"/>' : '<a:buNone/>') + '</a:pPr>'
   return '<a:p>' + pPr +
     '<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:latin typeface="' + escapeXml(runFont) + '"/><a:ea typeface="' + escapeXml(pptxEastAsianFont(font)) + '"/></a:rPr>' +
     '<a:t>' + escapeXml(text) + '</a:t></a:r></a:p>'
 }
 
@@ -1779,14 +1825,15 @@ function tableGraphicXml(id, name, box, rows, theme, langId) {
   const font = pptxFontName(theme.fonts.body)
   const safeRows = rows.length > 0 ? rows : [['']]
   const cols = Math.max(1, safeRows[0].length)
+  const fontSize = cols <= 6 ? 1700 : 1400
   const colW = Math.floor(box.w / cols)
   const grid = Array.from({ length: cols }, () => '<a:gridCol w="' + colW + '"/>').join('')
   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="' + lang + '" sz="1400" b="' + (bold ? 1 : 0) + '" dirty="0">' +
+    '<a:r><a:rPr lang="' + lang + '" sz="' + fontSize + '" 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:latin typeface="' + escapeXml(font) + '"/><a:ea typeface="' + escapeXml(pptxEastAsianFont(theme.fonts.body)) + '"/></a:rPr>' +
     '<a:t>' + escapeXml(text) + '</a:t></a:r></a:p></a:txBody>' +
     '<a:tcPr marL="91440" marR="91440" anchor="ctr">' +
     (fill !== '' ? '<a:solidFill><a:srgbClr val="' + hex(fill) + '"/></a:solidFill>' : '<a:noFill/>') +
@@ -1824,7 +1871,17 @@ function slideShapeList(slide, index, total, theme, langId) {
   const idBase = (index + 1) * 10
   const footer = String(index + 1).padStart(2, '0') + ' / ' + String(total).padStart(2, '0')
 
-  if (slide.layout === 'cover') {
+  if (MEDIA_LAYOUTS.has(slide.layout)) {
+    const boxes = mediaBoxes(slide.layout)
+    const emu = box => Object.fromEntries(Object.entries(box).map(([key, value]) => [key, Math.round(value * 914400)]))
+    shapes.push(textShapeXml(idBase + 2, 'Title', emu(boxes.title), [para(title, { size: 3400, color: p.fg, bold: true, font })]))
+    if (boxes.body) shapes.push(textShapeXml(idBase + 3, 'Body', emu(boxes.body), [
+      ...(subtitle ? [para(subtitle, { size: 2000, color: p.fg, font: bodyFont })] : []),
+      ...bullets.map(bullet => para(bullet, { size: 2000, color: p.fg, bullet: true, font: bodyFont, spaceAfter: 600 })),
+    ]))
+    const caption = slide.chart?.caption || slide.image?.caption
+    if (caption) shapes.push(textShapeXml(idBase + 4, 'Caption', emu(boxes.caption), [para(caption, { size: 1400, color: p.muted, font: bodyFont })]))
+  } else 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 }, [
       para(title, { size: 4400, color: p.fg, bold: true, font }),
@@ -1877,8 +1934,8 @@ function slideShapeList(slide, index, total, theme, langId) {
       ]))
     }
   } else if (slide.layout === 'table') {
-    const hasTitle = title !== '' && title !== kicker
-    if (kicker !== '') {
+    const hasTitle = title !== ''
+    if (kicker !== '' && kicker !== title) {
       shapes.push(textShapeXml(idBase + 1, 'Kicker', { x: 900000, y: 420000, w: 10000000, h: 420000 }, [
         para(kicker, { size: 1400, color: p.accent, bold: true, font: theme.fonts.body }),
       ]))
@@ -2073,7 +2130,7 @@ function slideMasterXml(theme) {
   const levels = Array.from({ length: 9 }, (_, i) => {
     const sz = Math.max(1100, 2000 - i * 100)
     return '<a:lvl' + (i + 1) + 'pPr marL="' + (342900 + i * 342900) + '" indent="' + (-342900 - i * 0) + '">' +
-      '<a:defRPr sz="' + sz + '"><a:solidFill><a:srgbClr val="' + hex(p.fg) + '"/></a:solidFill><a:latin typeface="' + escapeXml(pptxFontName(theme.fonts.body)) + '"/></a:defRPr></a:lvl' + (i + 1) + 'pPr>'
+      '<a:defRPr sz="' + sz + '"><a:solidFill><a:srgbClr val="' + hex(p.fg) + '"/></a:solidFill><a:latin typeface="' + escapeXml(pptxFontName(theme.fonts.body)) + '"/><a:ea typeface="' + escapeXml(pptxEastAsianFont(theme.fonts.body)) + '"/></a:defRPr></a:lvl' + (i + 1) + 'pPr>'
   }).join('')
   return '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
     '<p:sldMaster xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" ' +
@@ -2128,8 +2185,8 @@ function themeXml(theme) {
     color('hlink', p.accent) + color('folHlink', p.accent2) +
     '</a:clrScheme>' +
     '<a:fontScheme name="dsh-ppt">' +
-    '<a:majorFont><a:latin typeface="' + escapeXml(pptxFontName(theme.fonts.heading)) + '"/><a:ea typeface=""/><a:cs typeface=""/></a:majorFont>' +
-    '<a:minorFont><a:latin typeface="' + escapeXml(pptxFontName(theme.fonts.body)) + '"/><a:ea typeface=""/><a:cs typeface=""/></a:minorFont>' +
+    '<a:majorFont><a:latin typeface="' + escapeXml(pptxFontName(theme.fonts.heading)) + '"/><a:ea typeface="' + escapeXml(pptxEastAsianFont(theme.fonts.heading)) + '"/><a:cs typeface=""/></a:majorFont>' +
+    '<a:minorFont><a:latin typeface="' + escapeXml(pptxFontName(theme.fonts.body)) + '"/><a:ea typeface="' + escapeXml(pptxEastAsianFont(theme.fonts.body)) + '"/><a:cs typeface=""/></a:minorFont>' +
     '</a:fontScheme>' +
     '<a:fmtScheme name="dsh-ppt">' +
     '<a:fillStyleLst>' +