@topmindspace/tms-skills 0.1.18 → 0.1.19

package/top-ppt-html/scripts/lib_layout_regions.js

@@ -109,7 +109,9 @@ function regionOf(pageType, slotId, opts) {
       const y = PT.chartY || 2.95;
       const bottom = (opts && opts.bottom != null) ? opts.bottom
         : ((opts && opts.withNote) ? L.contentBottomWithNote : L.contentBottom);
-      return { x: mx + (PT.chartX || 0), y, w: cw - (PT.chartW || 0), h: Math.max(1.2, bottom - y) };
+      /* chartX/chartW 是历史误用：与 donut/table/hbar/exhibit 同口径，图表盒对齐版心 (mx, cw)。
+         此前 `mx+chartX` / `cw-chartW` 造成 bar 图右移 0.6in，与标题/表格左边距不齐。 */
+      return { x: mx, y, w: cw, h: Math.max(1.2, bottom - y) };
     }
     if (slot === 'hbar') {
       const y0 = PT.hbarY0 || 2.6;

package/top-ppt-html/scripts/model-schema.json

@@ -26,9 +26,12 @@
       "research": 3,
       "architecture": 0
     },
+    "agendaMax": 7,
+    "agendaMaxWithRefs": 8,
+    "agendaHint": "agenda 条目 = 章（篇/section），3–7 条；每章可含多页（sections[] 按页建模）。禁止把逐页标题当大纲。sections[].eyebrow 的 `NN ·` 前缀 = 章键，须与某条 agenda 对应；跳转锚点 = 该章第一页。含「参考资料」条目时 +1 仍 ≤8。",
     "sectionsMin": 1,
     "sectionsRecommended": 3,
-    "agendaComfortMax": 16
+    "agendaComfortMax": 8
   },
   "commonSectionFields": [
     "eyebrow",
@@ -276,7 +279,7 @@
       ]
     },
     "cards": {
-      "label": "卡片网格页（cards 元素须为 {title, points:[[k,v]…]}，不接受元组）",
+      "label": "卡片网格页（cards 元素须为 {title, points:[[k,v]…], icon?}，不接受元组）",
       "modes": [
         "presentation",
         "research"
@@ -286,7 +289,8 @@
       ],
       "optional": [
         "columns"
-      ]
+      ],
+      "cardItemHint": "cards[] 元素：{title:str, points:[[k,v]…]|[{t,d}…]|[str…], icon?:str}。icon = 语义图标名（icon_lib.js 键：增长/下降/数据/图表/趋势/占比/表格/效率/成果/安全/权限/检查/风险/团队/流程/计划/智能/洞察/工具/清单），HTML 与 PPTX 同名真导出；缺省按标题语义自动挑选。"
     },
     "split": {
       "label": "双区组合页（left / right 各可为 要点｜图表｜表格｜图片：type = points（默认）| table | image | 图表类型名；图表/表格字段直接挂在对应侧）",

package/top-ppt-html/scripts/package_skill.py

@@ -142,6 +142,7 @@ REQUIRED = [
     'scripts/render_compare.py', 'scripts/capture_theme_overview.js', 'scripts/package_skill.py',
     'scripts/layout-constants.json', 'scripts/model-schema.json',
     'scripts/lib_layout_regions.js', 'scripts/extract_snippet.py', 'scripts/quality_gate.py',
+    'scripts/icon_lib.js', 'scripts/icon_raster.js', 'scripts/build_icon_assets.js',
     'scripts/checks_html.py', 'scripts/section-file-map.json',
     'scripts/measure_height.py', 'scripts/audit_css.py', 'scripts/negative_tests.py',
     'references/components-atoms.md', 'references/layouts-research.md',

package/top-ppt-html/scripts/render_from_model.py

@@ -140,9 +140,20 @@ def pick_icon(title: str = '', idx: int = 0) -> str:
     return ICONS[_ICONS_ORDER[idx % len(_ICONS_ORDER)]]
 
 
-def card_head(title: str, idx: int = 0) -> str:
-    """卡片头：图标路标 + 标题（与 scaffold 的 .card__hd + .card__ico 同源）。"""
-    return (f'<div class="card__hd"><div class="card__ico">{pick_icon(title, idx)}</div>'
+def pick_icon_name(title: str = '', idx: int = 0) -> str:
+    """图标名（与 icon_lib.js / PPTX 真导出同名）。"""
+    t = str(title or '')
+    for key in ICONS:
+        if key in t:
+            return key
+    return _ICONS_ORDER[idx % len(_ICONS_ORDER)]
+
+
+def card_head(title: str, idx: int = 0, icon_name: str | None = None) -> str:
+    """卡片头：图标路标 + 标题（与 scaffold 的 .card__hd + .card__ico 同源）。
+    icon_name 写入 data-icon，供 extract_model / build_pptx 真导出同名图标。"""
+    name = icon_name or pick_icon_name(title, idx)
+    return (f'<div class="card__hd"><div class="card__ico" data-icon="{esc(name)}">{pick_icon(title, idx)}</div>'
             f'<h3 class="t-h3">{esc(title)}</h3></div>')
 
 
@@ -320,14 +331,23 @@ def r_cards(i, sec):
     cards = sec.get('cards') or []
     n = int(sec.get('columns') or min(3, max(1, len(cards))))
     cls = {1: 'g-2', 2: 'g-2', 3: 'g-3', 4: 'g-4'}.get(n, 'g-3')
+    # 纯卡片栅格强制等高（g-2--equal / g-3--equal），与 CSS / layout-grammar「同行卡片 stretch」一致
+    if cls in ('g-2', 'g-3', 'g-4'):
+        cls = cls + '--equal'
     blocks = []
     for ci, cd in enumerate(cards):
-        title = cd.get('title') if isinstance(cd, dict) else (cd[0] if cd else '')
-        points = cd.get('points') if isinstance(cd, dict) else ([['', cd[1]]] if isinstance(cd, (list, tuple)) and len(cd) > 1 else [])
+        if isinstance(cd, dict):
+            title = cd.get('title')
+            points = cd.get('points') or []
+            icon_name = cd.get('icon')
+        elif isinstance(cd, (list, tuple)) and len(cd) > 1:
+            title, points, icon_name = cd[0], [['', cd[1]]], None
+        else:
+            title, points, icon_name = (cd or ''), [], None
         blocks.append(
-            f'      <div class="card">{card_head(str(title), ci)}\n'
+            f'      <div class="card">{card_head(str(title), ci, icon_name)}\n'
             f'        {pts_list(points)}</div>')
-    body = f'    <div class="grid {cls} rv a-start">\n' + '\n'.join(blocks) + '\n    </div>\n'
+    body = f'    <div class="grid {cls} rv">\n' + '\n'.join(blocks) + '\n    </div>\n'
     return wrap(i, 'cards', body, sec)
 
 
@@ -682,20 +702,64 @@ def render_body(model: dict) -> str:
 </section>''')
     agenda = model.get('agenda') or []
     secs = [s for s in (model.get('sections') or []) if isinstance(s, dict)]
-    # Agenda 与 sections 对齐：模型 agenda 缺失/条数不符时以 sections 为准（并回写模型）
-    if len(agenda) != len(secs):
-        model['agenda'] = [[f'{i:02d}', s.get('title') or '', s.get('eyebrow') or '']
-                           for i, s in enumerate(secs, 1)]
+
+    def _chapter_key(sec, idx):
+        """从 eyebrow 的 `NN ·` 前缀或 chapter 字段取章键；无则退回页码。"""
+        ch = sec.get('chapter')
+        if ch not in (None, ''):
+            return str(ch)
+        eb = (sec.get('eyebrow') or '').strip()
+        m = re.match(r'^(\d{1,2})\s*[·・\-—]', eb)
+        if m:
+            return m.group(1).zfill(2)
+        return f'{idx:02d}'
+
+    def _chapter_title(sec):
+        """章标题 = eyebrow 去掉 `NN ·` 前缀；无则退回页标题。"""
+        eb = (sec.get('eyebrow') or '').strip()
+        m = re.match(r'^\d{1,2}\s*[·・\-—]\s*(.+)$', eb)
+        if m and m.group(1).strip():
+            return m.group(1).strip()
+        return sec.get('title') or ''
+
+    # Agenda = 章节大纲（3–7 章），不是逐页标题罗列。
+    # 模型给了合法 agenda（≤8 条）就原样用；否则按 eyebrow 章前缀归并，而不是按页重建。
+    MAX_CH = 8
+    if not agenda or len(agenda) > MAX_CH or len(agenda) == len(secs) and len(secs) > MAX_CH:
+        chapters = {}
+        order = []
+        for i, s in enumerate(secs, 1):
+            key = _chapter_key(s, i)
+            if key not in chapters:
+                chapters[key] = {'num': key, 'title': _chapter_title(s), 'desc': (s.get('eyebrow') or ''),
+                                 'first': i, 'pages': 0}
+                order.append(key)
+            chapters[key]['pages'] += 1
+        model['agenda'] = [[c['num'], c['title'], c['desc']] for c in (chapters[k] for k in order)]
         agenda = model['agenda']
+        chapter_first = {c['num']: c['first'] for c in (chapters[k] for k in order)}
+    else:
+        # 模型 agenda 已是章级：锚点落到该章第一页（按 eyebrow 对齐）
+        chapter_first = {}
+        for i, s in enumerate(secs, 1):
+            key = _chapter_key(s, i)
+            chapter_first.setdefault(key, i)
+            # 同时用序号兜底
+            chapter_first.setdefault(f'{i:02d}', i)
+        for gi, ag in enumerate(agenda, 1):
+            if isinstance(ag, (list, tuple)) and ag:
+                num = str(ag[0]).zfill(2) if str(ag[0]).isdigit() else str(ag[0])
+                chapter_first.setdefault(num, gi)
+
     if agenda or not (model.get('mode') == 'architecture' and len(secs) <= 4):
         lis = []
-        for i, s in enumerate(secs, 1):
-            ag = agenda[i - 1] if i - 1 < len(agenda) else [f'{i:02d}', s.get('title') or '', s.get('eyebrow') or '']
-            num = ag[0] if isinstance(ag, (list, tuple)) and ag else f'{i:02d}'
-            title = ag[1] if isinstance(ag, (list, tuple)) and len(ag) > 1 else (s.get('title') or '')
-            desc = ag[2] if isinstance(ag, (list, tuple)) and len(ag) > 2 else (s.get('eyebrow') or '')
+        for gi, ag in enumerate(agenda, 1):
+            num = ag[0] if isinstance(ag, (list, tuple)) and ag else f'{gi:02d}'
+            title = ag[1] if isinstance(ag, (list, tuple)) and len(ag) > 1 else ''
+            desc = ag[2] if isinstance(ag, (list, tuple)) and len(ag) > 2 else ''
+            href_i = chapter_first.get(str(num).zfill(2)) or chapter_first.get(str(num)) or gi
             lis.append(
-                f'      <li class="agenda__i"><a class="agenda__a" href="#s{i}">'
+                f'      <li class="agenda__i"><a class="agenda__a" href="#s{href_i}">'
                 f'<span class="agenda__n">{esc(num)}</span>'
                 f'<span><span class="agenda__t">{esc(title)}</span>'
                 f'<div class="agenda__d">{esc(desc)}</div></span></a></li>')
@@ -731,18 +795,45 @@ def render_body(model: dict) -> str:
       <h2 class="t-h1 shead__title">{esc(closing.get("title") or "收尾")}</h2></div>
 {body}  </div>
 </section>''')
-    # 参考资料
-    refs = []
-    all_text = json.dumps(model, ensure_ascii=False)
-    for n in sorted({int(x) for x in re.findall(r'\[(\d+)\]', all_text)}):
-        refs.append(f'      <li id="ref-{n}">[{n}] 来源名称，时间；口径。</li>')
-    parts.append(f'''<section class="band band--flow" id="refs">
+    # 参考资料：只列模型给的真实来源；无真实来源整节省略（禁止占位条目）
+    refs_src = model.get('refs') or model.get('references') or []
+    real_refs = []
+    for r in refs_src:
+        if isinstance(r, dict):
+            name = (r.get('name') or r.get('title') or '').strip()
+            time_ = (r.get('time') or r.get('date') or '').strip()
+            caliber = (r.get('caliber') or r.get('note') or '').strip()
+            url = (r.get('url') or r.get('link') or '').strip()
+        elif isinstance(r, (list, tuple)) and r:
+            name = str(r[0]).strip() if r[0] else ''
+            time_ = str(r[1]).strip() if len(r) > 1 and r[1] else ''
+            caliber = str(r[2]).strip() if len(r) > 2 and r[2] else ''
+            url = str(r[3]).strip() if len(r) > 3 and r[3] else ''
+        else:
+            name = str(r or '').strip()
+            time_ = caliber = url = ''
+        # 拦占位串：宁缺毋假
+        if not name or any(p in name for p in ('来源名称', '替换为真实来源', '来源 N', '某行业报告')):
+            continue
+        if time_ and any(p in time_ for p in ('YYYY-MM', 'YYYY', '2026-01；口径')):
+            time_ = ''
+        real_refs.append((name, time_, caliber, url))
+    if real_refs:
+        lis = []
+        for n, (name, time_, caliber, url) in enumerate(real_refs, 1):
+            meta = '，'.join(x for x in (time_, caliber) if x)
+            label = esc(name)
+            if url and url.startswith(('http://', 'https://', './', '../')) and 'example.com' not in url:
+                label = f'<a class="ref-link" href="{esc(url)}" target="_blank" rel="noopener">{esc(name)}</a>'
+            lis.append(f'      <li id="ref-{n}">[{n}] {label}' + (f'，{esc(meta)}' if meta else '') + '。</li>')
+        parts.append(f'''<section class="band band--flow" id="refs">
   <div class="wrap">
     <div class="shead rv"><div class="t-eyebrow">附录</div>
       <h2 class="t-h1 shead__title">参考资料</h2></div>
-    <ol class="refs">{''.join(refs) or '<li>（无外部引用）</li>'}</ol>
+    <ol class="refs">{''.join(lis)}</ol>
   </div>
 </section>''')
+    # 无真实来源 → 不渲染 #refs 整节（也不写占位）
     return '\n\n'.join(parts)
 
 
@@ -756,6 +847,14 @@ def load_model(path: Path) -> dict:
     return json.loads(m.group(1))
 
 
+def _strip_refs_nav(html: str, body: str) -> str:
+    """无真实来源（正文不含 #refs 节）时，摘掉导航/收尾的「参考资料」入口，避免悬空锚点。"""
+    if 'id="refs"' in body:
+        return html
+    html = re.sub(r'\s*<a[^>]*href="#refs"[^>]*>[\s\S]*?</a>', '', html)
+    return html
+
+
 def main() -> int:
     ap = argparse.ArgumentParser(description='从 REPORT_MODEL 渲染 HTML 正文（模型驱动生成）')
     ap.add_argument('src', help='model.json 或含 REPORT_MODEL 的 .html')
@@ -783,6 +882,7 @@ def main() -> int:
         # 同步模型（确保与渲染源一致）
         t = MODEL_RE.sub('window.REPORT_MODEL = ' +
                          json.dumps(model, ensure_ascii=False, indent=2) + ';', t, count=1)
+        t = _strip_refs_nav(t, body)
         src.write_text(t, encoding='utf-8')
         print(f'已按模型重渲染正文：{src}（{len(body)} 字符）')
         print(f'  下一步: python scripts/validate_report.py "{src}" --strict')
@@ -801,6 +901,7 @@ def main() -> int:
     t = CONTENT_RE.sub(r'\1\n' + body.replace('\\', '\\\\') + r'\n\2', t, count=1)
     t = MODEL_RE.sub('window.REPORT_MODEL = ' +
                      json.dumps(model, ensure_ascii=False, indent=2) + ';', t, count=1)
+    t = _strip_refs_nav(t, body)
     out = Path(args.out or (src.with_suffix('.html')))
     out.write_text(t, encoding='utf-8')
     print(f'已从模型生成：{out}  sections={len(model.get("sections") or [])}')

package/top-ppt-html/scripts/scaffold_report.py

@@ -320,7 +320,7 @@ def pg_exhibit(i, sec):
         <div class="exhibit__hd"><span class="exhibit__no">Exhibit {sec.get('exhibitNo', 1)}</span>
           <span class="exhibit__t">图表标题（结论式）</span></div>
 {chart_svg(ct, i)}
-        <div class="exhibit__src">来源：来源名称，YYYY-MM；口径说明<a class="cite" href="#ref-1">[1]</a></div>
+        <div class="exhibit__src">来源：<真实来源名>，YYYY-MM；口径说明<a class="cite" href="#ref-1">[1]</a></div>
       </div>
 {SIDE_NOTES}
     </div>
@@ -333,7 +333,7 @@ def pg_exhibit(i, sec):
                   'chart': {'type': ct, 'labels': ['A', 'B', 'C'], 'values': [42, 61, 35],
                             'dataTable': 'notes'},
                   'soWhat': '一行含义或建议（≤60 字）。',
-                  'footnote': '来源：来源名称，YYYY-MM；口径说明'}
+                  'footnote': '来源：<真实来源名>，YYYY-MM；口径说明'}
 
 
 def pg_twocol(i, sec):
@@ -389,7 +389,7 @@ def pg_halftable(i, sec):
         <div class="exhibit__hd"><span class="exhibit__no">Exhibit {sec.get('exhibitNo', 1)}</span>
           <span class="exhibit__t">右栏图表标题（结论式）</span></div>
 {chart_svg(ct, i)}
-        <div class="exhibit__src">来源：来源名称，YYYY-MM；口径说明<a class="cite" href="#ref-1">[1]</a></div>
+        <div class="exhibit__src">来源：<真实来源名>，YYYY-MM；口径说明<a class="cite" href="#ref-1">[1]</a></div>
       </div>
     </div>
   </div>
@@ -705,7 +705,7 @@ def pg_info(i, sec):
            'marimekko': '双重编码（列宽 ∝ 规模，列高 = 构成占比）',
            'streamgraph': '构成演变（基线居中 · 带宽 ∝ 规模）'}[t]
     # 信息图页承载在 .fig 里（不是 .exhibit 框）→ 来源行走 .footnote，避免与 Exhibit 来源行统计混淆
-    src = ('    <div class="footnote">来源：来源名称，YYYY-MM；口径说明'
+    src = ('    <div class="footnote">来源：<真实来源名>，YYYY-MM；口径说明'
            '<a class="cite" href="#ref-1">[1]</a></div>\n')
     html = f'''<section class="band" id="s{i}">
   <div class="wrap">
@@ -824,15 +824,15 @@ def closing(mode, title, points):
 
 
 def refs(mode, items):
-    """参考资料条目与正文 `[n]` 上标一一对应（校验器检查双向对齐）。"""
-    if items:
-        body = ('    <ul class="ul ul--num rv">\n' + '\n'.join(
-            f'''        <li id="ref-{n}">{esc(s)}　<span class="t-xs" style="color:var(--text-3)">{esc(t)}</span></li>'''
-            for n, (s, t) in enumerate(items, 1)) + '\n    </ul>')
-    else:
-        body = ('    <p class="t-body rv">本报告暂无外部引用；内部材料的来源、时间与口径见各页来源行与'
-                ' <code>.footnote</code>。补入外部数据时同步加 <code>[n]</code> 上标与本节条目。</p>')
-    return f'''<!-- 参考资料 -->
+    """参考资料：只列真实来源条目；无真实来源时整节省略（禁止占位条目误导读者）。
+    items 元素 = (来源名, 时间；口径) 且来源名必须是真实机构/报告/文档名。"""
+    if not items:
+        # 宁缺毋假：scaffold 不生成假「参考资料」页；正文无 [n] 时也不需要该节
+        return ''
+    body = ('    <ul class="ul ul--num rv">\n' + '\n'.join(
+        f'''        <li id="ref-{n}">{esc(s)}　<span class="t-xs" style="color:var(--text-3)">{esc(t)}</span></li>'''
+        for n, (s, t) in enumerate(items, 1)) + '\n    </ul>')
+    return f'''<!-- 参考资料（只列真实来源；无真实来源请整节删除并去掉正文 [n] 与导航入口） -->
 <section class="band band--tint" id="refs">
   <div class="wrap">
     <div class="shead rv">
@@ -985,7 +985,25 @@ def main() -> int:
         if p.get('lead'):
             m['lead'] = p['lead']
         model_secs.append(m)
-        agenda_items.append((f's{k}', p['title'], p.get('eyebrow', '')))
+
+    # Agenda = 章节大纲（3–7 章），不是逐页标题罗列：按 eyebrow 的 `NN ·` 前缀归并
+    def _chap_key(eb, idx):
+        mm = re.match(r'^(\d{1,2})\s*[·・\-—]', (eb or '').strip())
+        return mm.group(1).zfill(2) if mm else f'{idx:02d}'
+
+    def _chap_title(eb, title):
+        mm = re.match(r'^\d{1,2}\s*[·・\-—]\s*(.+)$', (eb or '').strip())
+        return mm.group(1).strip() if mm and mm.group(1).strip() else (title or '')
+
+    chapters, ch_order = {}, []
+    for i, p in enumerate(pages, 1):
+        key = _chap_key(p.get('eyebrow', ''), i)
+        if key not in chapters:
+            chapters[key] = {'num': key, 'title': _chap_title(p.get('eyebrow', ''), p['title']),
+                             'desc': p.get('eyebrow', ''), 'first': i}
+            ch_order.append(key)
+    agenda_items = [(f's{chapters[k]["first"]}', chapters[k]['title'], chapters[k]['desc'])
+                    for k in ch_order]
 
     show_agenda = not (mode == 'architecture' and len(pages) <= 4)
     closing_points = [['动作一', '一句话说明。'], ['动作二', '一句话说明。'], ['动作三', '一句话说明。']]
@@ -997,28 +1015,33 @@ def main() -> int:
     body.append(closing(mode, '收尾主张（回应封面问题）', closing_points))
     head = '\n\n'.join(body)
 
-    # 参考资料条目由正文实际 `[n]` 上标反推（校验器检查双向对齐）
+    # 参考资料：只在有真实来源条目时生成；scaffold 不再写「来源 N（替换为真实来源名称）」占位
+    # 交付前由内容作者补 model.refs = [[来源名, 时间；口径]…]（真实机构/报告/文档名），再跑 render_from_model
     ref_ids = sorted(set(re.findall(r'class="cite" href="#(ref-\d)"', head)))
-    ref_items = [[f'来源 {i}（替换为真实来源名称）', '2026-01；口径说明'] for i in range(1, len(ref_ids) + 1)]
-    content = head + '\n\n' + refs(mode, ref_items) + '\n\n' + footer(args.title, args.subtitle, args.meta)
+    ref_items = []  # 真实来源由内容作者填入；空 = 不生成参考资料节（宁缺毋假）
+    content = head
+    if ref_items:
+        content = head + '\n\n' + refs(mode, ref_items)
+    content = content + '\n\n' + footer(args.title, args.subtitle, args.meta)
 
     assert CONTENT_RE.search(t), f'{tpl_path.name} 缺少 __TOPPPT_CONTENT__ 标记'
     t = CONTENT_RE.sub('<!-- __TOPPPT_CONTENT_START__ -->\n' + content +
                        '\n<!-- __TOPPPT_CONTENT_END__ -->', t, count=1)
 
-    # ③ 顶栏导航与 Agenda 锚点一致
-    nav_links = '\n'.join(f'      <a href="#s{i}">{esc(p["title"][:10])}</a>'
-                          for i, p in enumerate(pages[:3], 1))
+    # ③ 顶栏导航与 Agenda 锚点一致（章级，不是逐页标题）
+    nav_links = '\n'.join(
+        f'      <a href="#s{chapters[k]["first"]}">{esc(chapters[k]["title"][:10])}</a>'
+        for k in ch_order[:5])
     assert NAV_RE.search(t), '模板缺少顶栏导航'
-    t = NAV_RE.sub('<nav class="nav">\n' + nav_links + '\n      <a href="#refs">参考资料</a>\n    </nav>',
-                   t, count=1)
+    nav_extra = '\n      <a href="#refs">参考资料</a>' if ref_items else ''
+    t = NAV_RE.sub(f'<nav class="nav">\n{nav_links}{nav_extra}\n    </nav>', t, count=1)
 
     # ④ REPORT_MODEL 骨架（与正文一一对应 · 严格 JSON）
     model = {
         'mode': mode, 'style': style, 'theme': theme,
         'title': args.title, 'subtitle': args.subtitle, 'meta': args.meta,
-        'agenda': [[f'{i:02d}', p['title'], p.get('eyebrow', '')] for i, p in enumerate(pages, 1)]
-                  if show_agenda else [],
+        'agenda': [[chapters[k]['num'], chapters[k]['title'], chapters[k]['desc']]
+                   for k in ch_order] if show_agenda else [],
         'sections': model_secs,
         'closing': {'title': '收尾主张（回应封面问题）',
                     'points': [list(x) for x in closing_points]},

package/top-ppt-html/scripts/sync_runtime.py

@@ -164,7 +164,8 @@ function regionOf(pageType, slotId, opts) {
   if (type === 'bar' && slot === 'primary') {
     var by = P.chartY || 2.95;
     var bb = opts.bottom != null ? opts.bottom : bottomDefault;
-    return { x: MX + (P.chartX || 0), y: by, w: CW - (P.chartW || 0), h: Math.max(1.2, bb - by) };
+    /* chartX/chartW 历史误用已纠正：与 donut/table/hbar/exhibit 同口径，图表盒对齐版心 (MX, CW) */
+    return { x: MX, y: by, w: CW, h: Math.max(1.2, bb - by) };
   }
   if (type === 'bar' && slot === 'hbar') {
     var y0 = P.hbarY0 || 2.6;

package/top-ppt-html/scripts/validate_pptx.py

@@ -1021,6 +1021,14 @@ def inspect_slide(
     picture_area_ratios: list[float] = []
     margin_emu = int(MIN_EDGE_MARGIN_IN * 914400)
 
+    # 图标语义图（objectName `icon:` 前缀）单独计数：不进 pictures 内容图门禁
+    def _is_icon_pic(el) -> bool:
+        nv = el.find('.//p:cNvPr', NS)
+        name = (nv.get('name') if nv is not None else '') or ''
+        return name.startswith('icon:')
+    icon_pictures = [p for p in pictures if _is_icon_pic(p)]
+    content_pictures = [p for p in pictures if not _is_icon_pic(p)]
+
     for element in all_elements:
         box = shape_bounds(element)
         if box is None:
@@ -1193,7 +1201,8 @@ def inspect_slide(
         "slide": slide_number,
         "native_text_shapes": native_text_shapes,
         "native_graphic_shapes": len(shapes) + len(graphic_frames),
-        "pictures": len(pictures),
+        "pictures": len(content_pictures),
+        "icon_pictures": len(icon_pictures),
         "charts": len(charts),
         "tables": len(tables),
         "element_count": len(all_elements),
@@ -1557,6 +1566,7 @@ def empty_report(path: Path) -> dict[str, Any]:
             "native_text_shapes": 0,
             "native_graphic_shapes": 0,
             "pictures": 0,
+            "icon_pictures": 0,
             "charts": 0,
             "tables": 0,
         },
@@ -1720,7 +1730,7 @@ def validate_pptx(
                 slide_chart_texts.append(slide_chart_text(archive, slide_name))
 
             report["summary"]["slide_count"] = len(slide_names)
-            for field in ("native_text_shapes", "native_graphic_shapes", "pictures", "charts", "tables"):
+            for field in ("native_text_shapes", "native_graphic_shapes", "pictures", "icon_pictures", "charts", "tables"):
                 report["summary"][field] = sum(slide[field] for slide in report["slides"])
 
             # P1-6 chrome 一致性：页脚/页码 y 相对中位数漂移
@@ -1730,7 +1740,8 @@ def validate_pptx(
             # 仅当模型显式声明 section.image / split.right.image 时才允许对应数量的图片落地。
             # 配图占位（image.placeholder）走原生形状，不计入图片数；版式/裁切/多图数量另做硬门禁。
             declared_images = count_model_images(model) if model_path is not None else 0
-            n_pics = report["summary"]["pictures"]
+            n_pics = report["summary"]["pictures"]   # 内容图（已扣除 icon: 语义图标图）
+            n_icons = int(report["summary"].get("icon_pictures", 0) or 0)
             img_issues: list[tuple[str, str]] = []
             if model_path is not None and model is not None:
                 img_issues = model_image_issues(model, _image_spec(),

package/top-ppt-html/scripts/validate_report.py

@@ -1693,7 +1693,7 @@ def main():
         ag_cfg = (LC.get('contentQuality') or {}).get('agenda') or {}
         split_max = int(ag_cfg.get('splitMax') or 16)
         title_max = int(ag_cfg.get('titleMaxChars') or 36)
-        chk(f"Agenda 条数 ≤{split_max}（超出请拆上/下篇或章节级大纲）",
+        chk(f"Agenda 条数 ≤{split_max}（大纲=章，3–7 条；超出说明在列页，请归并回章）",
             n_items <= split_max,
             f"{n_items} 条超上限——PPTX 已自动分页，HTML 会撑出一屏，建议改章节级大纲 6–8 条")
         long_titles = re.findall(r'class="agenda__t"[^>]*>([^<]{%d,})' % (title_max + 1), txt)