@topmindspace/tms-skills 0.1.16 → 0.1.18

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

@@ -34,6 +34,7 @@ ROOT = Path(__file__).resolve().parent.parent
 TPL = ROOT / 'assets' / 'templates'
 LC = json.loads((ROOT / 'scripts' / 'layout-constants.json').read_text(encoding='utf-8'))
 PAGE_TO_PRESET = ((LC.get('layoutSystem') or {}).get('pageToPreset') or {})
+IMAGE_SPEC = LC.get('imageSpec') or {}
 
 CONTENT_RE = re.compile(
     r'(<!-- __TOPPPT_CONTENT_START__ -->)[\s\S]*?(<!-- __TOPPPT_CONTENT_END__ -->)')
@@ -102,6 +103,49 @@ def wrap(i: int, ptype: str, body: str, sec: dict, extra: str = '') -> str:
             f'  </div>\n</section>')
 
 
+# ── 语义图标库（高频取码 · 与 references/icons.md 同源；PPTX 侧由 accent 方块路标对应）──
+_SVG_OPEN = ('<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" '
+             'stroke-linecap="round" stroke-linejoin="round">')
+ICONS: dict[str, str] = {
+    '增长': _SVG_OPEN + '<path d="M22 7l-8.5 8.5-5-5L2 17"/><path d="M16 7h6v6"/></svg>',
+    '下降': _SVG_OPEN + '<path d="M22 17l-8.5-8.5-5 5L2 7"/><path d="M16 17h6v-6"/></svg>',
+    '数据': _SVG_OPEN + '<ellipse cx="12" cy="5" rx="9" ry="3"/><path d="M3 5v14c0 1.66 4.03 3 9 3s9-1.34 9-3V5"/><path d="M3 12c0 1.66 4.03 3 9 3s9-1.34 9-3"/></svg>',
+    '图表': _SVG_OPEN + '<path d="M3 3v18h18"/><rect x="7" y="12" width="3" height="6" rx="1"/><rect x="12" y="8" width="3" height="10" rx="1"/><rect x="17" y="4" width="3" height="14" rx="1"/></svg>',
+    '趋势': _SVG_OPEN + '<path d="M3 3v18h18"/><path d="M7 14l4-4 3 3 5-6"/><path d="M15 7h4v4"/></svg>',
+    '占比': _SVG_OPEN + '<path d="M21.2 15.9A10 10 0 1 1 8 2.8"/><path d="M22 12A10 10 0 0 0 12 2v10z"/></svg>',
+    '表格': _SVG_OPEN + '<rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 9h18M3 15h18M9 3v18M15 3v18"/></svg>',
+    '效率': _SVG_OPEN + '<path d="M12 15l3.5-5.5"/><path d="M20.2 15a8.5 8.5 0 1 0-16.4 0"/></svg>',
+    '成果': _SVG_OPEN + '<circle cx="12" cy="8" r="6"/><path d="M15.5 13 17 22l-5-3-5 3 1.5-9"/></svg>',
+    '安全': _SVG_OPEN + '<path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/><path d="M9 12l2 2 4-4"/></svg>',
+    '权限': _SVG_OPEN + '<rect x="3" y="11" width="18" height="10" rx="2"/><path d="M7 11V7a5 5 0 0 1 10 0v4"/></svg>',
+    '检查': _SVG_OPEN + '<circle cx="12" cy="12" r="10"/><path d="M8 12.5l2.5 2.5L16 9.5"/></svg>',
+    '风险': _SVG_OPEN + '<path d="M10.3 3.9 1.8 18a2 2 0 0 0 1.7 3h17a2 2 0 0 0 1.7-3L13.7 3.9a2 2 0 0 0-3.4 0z"/><path d="M12 9v4M12 17h.01"/></svg>',
+    '团队': _SVG_OPEN + '<path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/></svg>',
+    '流程': _SVG_OPEN + '<circle cx="18" cy="18" r="3"/><circle cx="6" cy="6" r="3"/><path d="M6 21V9a9 9 0 0 0 9 9"/></svg>',
+    '计划': _SVG_OPEN + '<rect x="3" y="4" width="18" height="18" rx="2"/><path d="M16 2v4M8 2v4M3 10h18"/></svg>',
+    '智能': _SVG_OPEN + '<rect x="4" y="4" width="16" height="16" rx="2"/><path d="M9 9h6v6H9zM9 1v3M15 1v3M9 20v3M15 20v3M1 9h3M1 15h3M20 9h3M20 15h3"/></svg>',
+    '洞察': _SVG_OPEN + '<circle cx="11" cy="11" r="8"/><path d="M21 21l-4.35-4.35"/></svg>',
+    '工具': _SVG_OPEN + '<path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z"/></svg>',
+    '清单': _SVG_OPEN + '<path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>',
+}
+_ICONS_ORDER = list(ICONS.keys())
+
+
+def pick_icon(title: str = '', idx: int = 0) -> str:
+    """按标题语义挑图标；未命中则按序轮换（保持同屏同家族、不堆砌）。"""
+    t = str(title or '')
+    for key, svg in ICONS.items():
+        if key in t:
+            return svg
+    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>'
+            f'<h3 class="t-h3">{esc(title)}</h3></div>')
+
+
 def pts_list(points) -> str:
     if not points:
         return '<ul class="ul"><li>（待填）</li></ul>'
@@ -130,12 +174,12 @@ def r_points(i, sec):
     pts = sec.get('points') or []
     half = (len(pts) + 1) // 2 or 1
     col1, col2 = pts[:half], pts[half:]
-    def card(title, items):
-        return (f'      <div class="card"><div class="card__hd"><h3 class="t-h3">{esc(title)}</h3></div>\n'
+    def card(title, items, idx=0):
+        return (f'      <div class="card">{card_head(title, idx)}\n'
                 f'        {pts_list(items)}</div>')
     body = ('    <div class="grid g-2 rv a-start">\n'
-            + card('要点一', col1 or pts[:1]) + '\n'
-            + card('要点二', col2 or [['', '（第二组要点）']]) + '\n'
+            + card('要点一', col1 or pts[:1], 0) + '\n'
+            + card('要点二', col2 or [['', '（第二组要点）']], 1) + '\n'
             + '    </div>\n')
     if sec.get('metrics'):
         body += metrics_row(sec['metrics'])
@@ -277,11 +321,11 @@ def r_cards(i, sec):
     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')
     blocks = []
-    for cd in cards:
+    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 [])
         blocks.append(
-            f'      <div class="card"><div class="card__hd"><h3 class="t-h3">{esc(title)}</h3></div>\n'
+            f'      <div class="card">{card_head(str(title), ci)}\n'
             f'        {pts_list(points)}</div>')
     body = f'    <div class="grid {cls} rv a-start">\n' + '\n'.join(blocks) + '\n    </div>\n'
     return wrap(i, 'cards', body, sec)
@@ -302,9 +346,12 @@ def r_split(i, sec):
         if t == 'image':
             im = el.get('image') or {}
             cap = im.get('caption') or ''
-            return ('      <figure class="media media--r4-3 media--ph">'
-                    '<div class="media__ph"><b>配图占位</b><span>建议 1200×900px</span></div></figure>'
-                    + (f'\n      <div class="media__cap--below">{esc(cap)}</div>' if cap else ''))
+            src = im.get('src') or ''
+            ph = bool(im.get('placeholder')) or not src
+            fit = im.get('fit') or (IMAGE_SPEC or {}).get('fitDefault') or 'cover'
+            fig = _media_figure(src, 'half', fit, '', placeholder=ph,
+                                ratio_cls=(IMAGE_SPEC or {}).get('ratioCssClass', {}).get('half') or 'media--r4-3')
+            return fig + (f'\n      <div class="media__cap--below">{esc(cap)}</div>' if cap else '')
         if t == 'points' or el.get('points') and t not in ('bar', 'line', 'donut', 'hbar'):
             return f'      <div class="stack gap-4">{pts_list(el.get("points"))}</div>'
         return (f'      <div class="fig"><div class="fig__cap">{esc(el.get("cap") or "图表")}</div>\n'
@@ -324,10 +371,14 @@ def r_comparison(i, sec):
     body = ('    <div class="grid g-half g-2 rv a-start">\n'
             + panel(sec.get('left')) + '\n' + panel(sec.get('right'), True) + '\n'
             + '    </div>\n')
-    if sec.get('verdict'):
+    has_verdict = bool(sec.get('verdict'))
+    if has_verdict:
         body += (f'    <div class="sowhat rv"><span class="sowhat__v">{cite(sec["verdict"])}</span></div>\n')
     sec = dict(sec)
     sec.pop('verdict', None)
+    # R2：verdict 与 soWhat 共用 .sowhat 槽位——verdict 已渲染时移除 soWhat，禁止同槽双条
+    if has_verdict:
+        sec.pop('soWhat', None)
     return wrap(i, 'comparison', body, sec)
 
 
@@ -342,17 +393,82 @@ def r_quote(i, sec):
     return wrap(i, 'quote', body, sec, ' band--accent band--fit')
 
 
+def _img_ph_label(layout: str, multi: bool = False) -> str:
+    """占位标签串——与 PPTX imgPlaceholderLabel 同源（imageSpec 常量拼接，cross_verify 逐页比对）。"""
+    spec = IMAGE_SPEC or {}
+    label = spec.get('placeholderLabel') or '配图占位'
+    if multi:
+        return label
+    size = (spec.get('recommendedSizePx') or {}).get(layout)
+    if not size:
+        return label
+    prefix = spec.get('placeholderHintPrefix') or '建议 '
+    suffix = spec.get('placeholderHintSuffix') or 'px'
+    return f'{label} · {prefix}{size}{suffix}'
+
+
+def _media_figure(src: str, layout: str, fit: str, caption: str = '',
+                  placeholder: bool = False, multi: bool = False, ratio_cls: str = '') -> str:
+    """单张图 / 占位框（与 PPTX addImageEl 同源：比例锁定 + fit + 占位三要素标签）。"""
+    spec = IMAGE_SPEC or {}
+    ratio_map = spec.get('ratioCssClass') or {}
+    rc = ratio_cls or ratio_map.get(layout) or 'media--r3-1'
+    fit_cls = ' media--contain' if str(fit or '').lower() == 'contain' else ''
+    if placeholder or not src:
+        ph_text = _img_ph_label(layout, multi)
+        # 与 PPTX 同串：bold=配图占位，span=建议 …px（单串合并输出，保证 A/B 文本一致）
+        parts = ph_text.split(' · ', 1)
+        b = esc(parts[0])
+        span = esc(parts[1]) if len(parts) > 1 else ''
+        inner = f'<div class="media__ph"><b>{b}</b><span>{span}</span></div>'
+        return f'<figure class="media {rc} media--ph">{inner}</figure>'
+    alt = caption or '配图'
+    img = f'<img src="{esc(src)}" alt="{esc(alt)}">'
+    cap_html = f'<figcaption class="media__cap--below">{cite(caption)}</figcaption>' if caption else ''
+    return f'<figure class="media {rc}{fit_cls}">{img}{cap_html}</figure>'
+
+
 def r_image(i, sec):
     im = sec.get('image') or {}
     layout = (im.get('layout') or 'full').lower()
-    ratio = {'half': 'r4-3', 'bleed': 'r21-9', 'grid': 'r4-3', 'compare': 'r4-3',
-             'wall': 'r1-1', 'full': 'r3-1'}.get(layout, 'r3-1')
+    fit = im.get('fit') or (IMAGE_SPEC or {}).get('fitDefault') or 'cover'
     cap = im.get('caption') or ''
-    media = (f'    <figure class="media media--{ratio} media--ph rv">'
-             f'<div class="media__ph"><b>配图占位</b><span>{esc(im.get("hint") or "建议尺寸见 imageSpec")}</span></div>'
-             f'</figure>\n')
-    if cap:
-        media += f'    <p class="media__src">{cite(cap)}</p>\n'
+    items = im.get('items') or []
+    multi_layouts = (IMAGE_SPEC or {}).get('multiLayouts') or ['grid', 'compare', 'wall']
+
+    def one(src, placeholder=False, multi=False, ratio_cls=''):
+        return _media_figure(src, layout, fit, cap if not multi else '',
+                             placeholder=placeholder, multi=multi, ratio_cls=ratio_cls)
+
+    if layout in multi_layouts and items:
+        # 多图版式：grid / compare / wall（与 PPTX imageLayoutShapes 同源）
+        cells = []
+        ratio_map = (IMAGE_SPEC or {}).get('ratioCssClass') or {}
+        for it in items[:6]:
+            if not isinstance(it, dict):
+                it = {'src': str(it)}
+            it_src = it.get('src') or ''
+            it_ph = bool(it.get('placeholder')) or not it_src
+            it_cap = it.get('caption') or ''
+            fig = one(it_src, placeholder=it_ph, multi=True,
+                      ratio_cls=ratio_map.get(layout) or 'media--r4-3')
+            if it_cap:
+                fig += f'    <p class="media__src">{cite(it_cap)}</p>\n'
+            cells.append(fig)
+        n = len(cells)
+        if layout == 'compare':
+            grid_cls = 'media-compare'
+        elif layout == 'wall':
+            grid_cls = 'media-wall'
+        else:
+            grid_cls = f'media-grid media-grid--{min(4, max(2, n))}'
+        media = f'    <div class="{grid_cls} rv">\n' + '\n'.join(cells) + '\n    </div>\n'
+    else:
+        src = im.get('src') or ''
+        ph = bool(im.get('placeholder')) or not src
+        media = one(src, placeholder=ph)
+        if cap:
+            media += f'    <p class="media__src">{cite(cap)}</p>\n'
     body = media
     if layout == 'half' and sec.get('points'):
         body = ('    <div class="grid g-side rv a-start">\n' + media +

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

@@ -199,6 +199,15 @@ function regionOf(pageType, slotId, opts) {
     return { x: MX, y: P.heroY || 2.9, w: CW * (P.heroW || 0.52), h: P.heroH || 1.6,
       dividerX: P.dividerX, metricY0: P.metricY0, metricRowH: P.metricRowH };
   }
+  /* R3：kpi 支撑指标列——落在 dividerX 右侧（默认全宽返回会压住 hero） */
+  if (type === 'kpi' && slot === 'metrics') {
+    var dxK = P.dividerX != null ? P.dividerX : 0.56;
+    return {
+      x: MX + CW * dxK + 0.35, y: P.metricY0 || 2.95,
+      w: CW * (1 - dxK) - 0.5,
+      h: Math.max(0.6, bottomDefault - (P.metricY0 || 2.95)),
+    };
+  }
   if (type === 'comparison' && (slot === 'left' || slot === 'primary' || slot === 'right')) {
     var cg = P.panelGap || 0.4, pw = (CW - cg) / 2;
     if (slot === 'right') return { x: MX + pw + cg, y: P.panelY || 2.55, w: pw, h: P.panelH || 3.4 };
@@ -231,15 +240,22 @@ function regionOf(pageType, slotId, opts) {
   }
   if (type === 'image' && slot === 'primary') {
     var iy2 = Math.max(P.y || 2.3, opts.top || 0);
-    return { x: MX, y: iy2, w: CW, h: Math.max(1.2, Math.min(P.h || 4.2, (opts.bottom != null ? opts.bottom : bottomDefault) - iy2)) };
+    /* R2：有图注时图片不得越过 contentBottomWithNote（图注落注释带，属 annotation self） */
+    var iBottom = (opts.bottom != null) ? opts.bottom
+      : (opts.caption ? (L.contentBottomWithNote || 6.4) : bottomDefault);
+    return { x: MX, y: iy2, w: CW, h: Math.max(1.2, Math.min(P.h || 4.2, iBottom - iy2)) };
   }
   if ((type === 'halftable') && (slot === 'left' || slot === 'primary')) {
     var rs = PT.research || {};
-    return { x: MX, y: topDefault, w: CW * (rs.halfTableW || 0.52), h: Math.max(1, bottomDefault - topDefault) };
+    var ht = opts.top != null ? opts.top : topDefault;
+    var hb = opts.bottom != null ? opts.bottom : bottomDefault;
+    return { x: MX, y: ht, w: CW * (rs.halfTableW || 0.52), h: Math.max(1, hb - ht) };
   }
   if ((type === 'halftable') && (slot === 'right' || slot === 'secondary')) {
     var rs2 = PT.research || {};
-    return { x: MX + CW * (rs2.halfChartX || 0.57), y: topDefault, w: CW * (rs2.halfChartW || 0.43), h: Math.max(1, bottomDefault - topDefault) };
+    var ht2 = opts.top != null ? opts.top : topDefault;
+    var hb2 = opts.bottom != null ? opts.bottom : bottomDefault;
+    return { x: MX + CW * (rs2.halfChartX || 0.57), y: ht2, w: CW * (rs2.halfChartW || 0.43), h: Math.max(1, hb2 - ht2) };
   }
   if (type === 'matrix' && slot === 'primary') {
     var rm = PT.research || {};

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

@@ -345,6 +345,77 @@ def test_engine_static() -> None:
     )
 
 
+def _sp(x: float, y: float, w: float, h: float, text: str = "T") -> ET.Element:
+    """构造带 xfrm + 文本的 p:sp 测试件。"""
+    xml = (
+        '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
+        f'<p:sp xmlns:a="{NS["a"]}" xmlns:p="{NS["p"]}">'
+        f'<p:spPr><a:xfrm><a:off x="{int(x * EMU)}" y="{int(y * EMU)}"/>'
+        f'<a:ext cx="{int(w * EMU)}" cy="{int(h * EMU)}"/></a:xfrm></p:spPr>'
+        f'<p:txBody><a:p><a:r><a:t>{text}</a:t></a:r></a:p></p:txBody>'
+        "</p:sp>"
+    )
+    return ET.fromstring(xml)
+
+
+def test_element_overlap() -> None:
+    """R6: 两个内容框明显叠印必须 fire；纯包含（卡片+内文）不 fire。"""
+    a = _sp(1.0, 2.0, 2.0, 1.0, "这是一个足够长的正文标题占位符")
+    b = _sp(2.0, 2.3, 2.0, 1.0, "另一段同样足够长的正文内容占位")  # 与 A 重叠 1.0×0.7 = 0.7 in²
+    issues = V.element_overlap_check([a, b], 1, int(13.333 * EMU), int(7.5 * EMU))
+    codes = [i["code"] for i in issues]
+    ok(
+        "6a ELEMENT_OVERLAP fires on side-by-side crush",
+        "ELEMENT_OVERLAP" in codes,
+        f"codes={codes}",
+    )
+    outer = _sp(1.0, 2.0, 4.0, 2.0, "卡片容器标题占位")
+    inner = _sp(1.2, 2.2, 1.0, 0.4, "内文")
+    issues2 = V.element_overlap_check([outer, inner], 1, int(13.333 * EMU), int(7.5 * EMU))
+    ok(
+        "6b containment (card+inner) does not fire ELEMENT_OVERLAP",
+        "ELEMENT_OVERLAP" not in [i["code"] for i in issues2],
+    )
+    # 两个短标签/数值（图表轴标签、指标值）不算叠印
+    lab = _sp(1.0, 3.0, 1.0, 0.3, "已规模化")
+    val = _sp(1.2, 3.15, 0.8, 0.3, "18%")
+    issues3 = V.element_overlap_check([lab, val], 1, int(13.333 * EMU), int(7.5 * EMU))
+    ok(
+        "6f short label+value pairs do not fire ELEMENT_OVERLAP",
+        "ELEMENT_OVERLAP" not in [i["code"] for i in issues3],
+    )
+
+
+def test_layout_fill() -> None:
+    """R6: 宽/高填充低于硬下限须 fire；结构页豁免。"""
+    def _box(x: float, y: float, w: float, h: float) -> tuple[int, int, int, int]:
+        return (int(x * EMU), int(y * EMU), int(w * EMU), int(h * EMU))
+    # 只占左侧窄条：宽填充 ~15%
+    narrow = [_box(0.6, 2.0, 1.5, 3.0)]
+    issues = V.layout_fill_check(narrow, 3, int(13.333 * EMU), int(7.5 * EMU), is_structural=False)
+    codes = [i["code"] for i in issues]
+    ok(
+        "6c LAYOUT_FILL fires on underfill content page",
+        "LAYOUT_FILL" in codes,
+        f"codes={codes}",
+    )
+    ok(
+        "6d structural page exempt from LAYOUT_FILL",
+        "LAYOUT_FILL" not in [
+            i["code"]
+            for i in V.layout_fill_check(narrow, 2, int(13.333 * EMU), int(7.5 * EMU), is_structural=True)
+        ],
+    )
+    wide = [_box(0.6, 1.5, 12.0, 5.5)]  # 宽 90% / 高 73%，落在 research 目标带 70–85 内
+    ok(
+        "6e full-width content page passes LAYOUT_FILL",
+        "LAYOUT_FILL" not in [
+            i["code"]
+            for i in V.layout_fill_check(wide, 3, int(13.333 * EMU), int(7.5 * EMU), is_structural=False)
+        ],
+    )
+
+
 def main() -> int:
     print("feedback-gates regression")
     test_shape_bounds_reads_p_xfrm()
@@ -356,6 +427,8 @@ def main() -> int:
     test_annotation_band_fires_when_note_present()
     test_annotation_band_reports_all_invaders()
     test_annotation_band_so_what_band_top()
+    test_element_overlap()
+    test_layout_fill()
     test_chrome_footer_ignores_bare_integers()
     test_chart_bottom_no_short_circuit()
     test_font_size_h2_17_allowed()

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

@@ -117,6 +117,9 @@ STRICT_FAILURE_CODES = {
     "LAYOUT_MULTI_FOCUS",
     "LAYOUT_ALIGN_DRIFT",
     "LAYOUT_LABEL_COLLIDE",
+    # R6：元素两两重叠 + 版心填充率（本次诊断盲区）
+    "ELEMENT_OVERLAP",
+    "LAYOUT_FILL",
 }
 # 深度模式专属校验码（--deep 时并入 STRICT_FAILURE_CODES；默认不跑，保持轻量）
 DEEP_STRICT_CODES = {
@@ -509,6 +512,143 @@ def annotation_band_overlap_check(
     return out
 
 
+# ── R6：元素两两重叠（本次诊断 31 处节点叠印 + 2 处整条结论叠印均漏检） ──
+# 面积阈值 0.05 in²；同页 >3 处升为硬失败。chrome/背景/注释带自身豁免。
+ELEMENT_OVERLAP_MIN_AREA_IN2 = 0.05
+ELEMENT_OVERLAP_MAX_PER_SLIDE = 3
+
+
+def _is_full_bleed_or_bg(box: tuple[int, int, int, int], width: int, height: int) -> bool:
+    """整页/大面积底衬：不参与两两重叠判定。"""
+    x, y, cx, cy = box
+    return cx * cy >= 0.85 * width * height
+
+
+def element_overlap_check(
+    elements: list[ET.Element],
+    slide_no: int,
+    width: int,
+    height: int,
+) -> list[dict[str, Any]]:
+    """元素两两重叠（ELEMENT_OVERLAP）。
+
+    收集所有可测元素的包围盒，跳过整页背景 / 页码 chrome / 注释带自身
+    （tr:soWhat / tr:footnote / tr:band），以及页头区（眉题/标题/装饰线，y < 2.0in）
+    ——页头元素上下紧邻是版式语义，不是叠印。只对正文区（y ≥ 2.0in）元素做两两相交判定。
+    同页超过 ELEMENT_OVERLAP_MAX_PER_SLIDE 处时在末条 issue 标注「密集叠印」。
+    """
+    out: list[dict[str, Any]] = []
+    boxes: list[tuple[tuple[int, int, int, int], str]] = []
+    min_area = int(ELEMENT_OVERLAP_MIN_AREA_IN2 * 914400 * 914400)
+    head_limit = int(2.0 * 914400)  # 页头区下界：眉题 0.48 / 标题 0.82 / 装饰线 1.72
+    for el in elements:
+        box = shape_bounds(el)
+        if box is None:
+            continue
+        if _is_full_bleed_or_bg(box, width, height):
+            continue
+        x, y, cx, cy = box
+        # 页头/页码 chrome 不参与正文叠印判定
+        if y + cy <= head_limit:
+            continue
+        oname = (_shape_object_name(el) or "")
+        # 注释带自身（结论条/来源/待核实条）不参与互撞——它们共用槽位由引擎互斥
+        if any(k in oname for k in ("soWhat", "footnote", "tr:band", "tr:flag")):
+            continue
+        text = text_content(el).strip()
+        label = (text[:14] + "…") if len(text) > 14 else (text or oname or "shape")
+        boxes.append((box, label))
+
+    hits = 0
+    for i in range(len(boxes)):
+        (ax, ay, aw, ah), la = boxes[i]
+        for j in range(i + 1, len(boxes)):
+            (bx, by, bw, bh), lb = boxes[j]
+            ox = min(ax + aw, bx + bw) - max(ax, bx)
+            oy = min(ay + ah, by + bh) - max(ay, by)
+            if ox <= 0 or oy <= 0:
+                continue
+            area = ox * oy
+            if area < min_area:
+                continue
+            # 纯包含（一方完全罩住另一方）多半是卡片+内文，不算叠印
+            if (ax >= bx and ay >= by and ax + aw <= bx + bw and ay + ah <= by + bh) or \
+               (bx >= ax and by >= ay and bx + bw <= ax + aw and by + bh <= ay + ah):
+                continue
+            # 短标签 + 长正文共处一卡（title+body 紧排）不算叠印：两者水平对齐且纵向仅微碰
+            short_long = (len(la) <= 12) != (len(lb) <= 12)
+            v_touch = oy < int(0.12 * 914400)  # 纵向重叠 <0.12in 视为基线紧排
+            if short_long and v_touch:
+                continue
+            # 两个都是短标签/数值（图表轴标签、指标值、图例文字）：数据展示的常规紧排，不是叠印
+            if len(la) <= 12 and len(lb) <= 12:
+                continue
+            hits += 1
+            out.append(issue(
+                "ELEMENT_OVERLAP",
+                f"元素叠印：「{la}」∩「{lb}」重叠 {area / (914400 * 914400):.2f}in²"
+                f"（≥{ELEMENT_OVERLAP_MIN_AREA_IN2}in²）——请错开坐标或合并为同一文本框。",
+                slide=slide_no,
+            ))
+    if hits > ELEMENT_OVERLAP_MAX_PER_SLIDE:
+        out.append(issue(
+            "ELEMENT_OVERLAP",
+            f"同页元素叠印 {hits} 处（>{ELEMENT_OVERLAP_MAX_PER_SLIDE}）——几何算法与内容量脱钩，需重构布局。",
+            slide=slide_no,
+        ))
+    return out
+
+
+def layout_fill_check(
+    bounds: list[tuple[int, int, int, int]],
+    slide_no: int,
+    width: int,
+    height: int,
+    is_structural: bool = False,
+) -> list[dict[str, Any]]:
+    """版心填充率（LAYOUT_FILL）：宽、高分别算，低于下限告警。
+
+    structural 页（封面/大纲/收尾/引用）豁免——它们本来就是留白页。
+    目标带取 layout-constants.json 的 layoutSystem.fillTarget（按模式），
+    这里用「包围盒占画布比」的宽高分量做保守近似。
+    """
+    out: list[dict[str, Any]] = []
+    if is_structural or not bounds:
+        return out
+    try:
+        lc_path = Path(__file__).resolve().parent / "layout-constants.json"
+        lc = json.loads(lc_path.read_text(encoding="utf-8"))
+        ft = ((lc.get("layoutSystem") or {}).get("fillTarget") or {})
+        # 默认取 research 带（最常见研究报告）
+        target = ft.get("research") or [70, 85]
+        fill_min = float(target[0]) / 100.0
+    except (OSError, json.JSONDecodeError, TypeError, ValueError):
+        fill_min = 0.55
+
+    left = min(x for x, _, _, _ in bounds)
+    top = min(y for _, y, _, _ in bounds)
+    right = max(x + cx for x, _, cx, _ in bounds)
+    bottom = max(y + cy for _, y, _, cy in bounds)
+    w_fill = max(0.0, (right - left) / max(width, 1))
+    h_fill = max(0.0, (bottom - top) / max(height, 1))
+    # 硬下限 0.55（诊断口径），目标带下限作 WARN
+    hard_min = 0.55
+    if w_fill < hard_min or h_fill < hard_min:
+        out.append(issue(
+            "LAYOUT_FILL",
+            f"版心填充不足（宽 {w_fill:.0%} / 高 {h_fill:.0%}，硬下限 {hard_min:.0%}）——"
+            "多栏请按版心推导列宽，低密度页补从件（指标/小图/对照表）。",
+            slide=slide_no,
+        ))
+    elif w_fill < fill_min or h_fill < fill_min:
+        out.append(issue(
+            "LAYOUT_FILL",
+            f"版心填充偏低（宽 {w_fill:.0%} / 高 {h_fill:.0%}，目标下限 {fill_min:.0%}）。",
+            slide=slide_no,
+        ))
+    return out
+
+
 
 def font_size_snap_check(root: ET.Element, slide_no: int) -> list[dict[str, Any]]:
     """Font sizes must sit on the declared type scale / fontShrink ladder.
@@ -913,6 +1053,9 @@ def inspect_slide(
 
     warnings.extend(annotation_band_overlap_check(
         [*shapes, *pictures, *graphic_frames], slide_number, height, width))
+    # R6：元素两两重叠（节点叠印 / 结论条叠印漏检主因）
+    warnings.extend(element_overlap_check(
+        [*shapes, *pictures, *graphic_frames], slide_number, width, height))
     warnings.extend(font_size_snap_check(root, slide_number))
 
     for table in tables:
@@ -986,6 +1129,11 @@ def inspect_slide(
             issue("EMPTY_OR_UNMEASURABLE_SLIDE", "页面没有任何可测量的原生元素。", slide=slide_number)
         )
 
+    # R6：版心填充率（宽/高分别算；封面/大纲/收尾等结构页豁免）
+    _struct_text = combined_text[:200] if combined_text else ""
+    _is_struct = bool(re.search(r"(报告大纲|AGENDA|下一步|参考资料|封面)", _struct_text)) or slide_number <= 2
+    warnings.extend(layout_fill_check(bounds, slide_number, width, height, is_structural=_is_struct))
+
     if len(all_elements) <= 1 and not pictures:
         warnings.append(
             issue("LOW_CONTENT_DENSITY", "页面元素 ≤1 个；检查信息密度。", slide=slide_number)

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

@@ -217,6 +217,20 @@ def _check_charts(txt, chk):
     chk("图表最小尺寸·建议（通宽图 viewBox 高）", not small_note,
         "; ".join(small_note) if small_note else "", level="WARN")
 
+    # R5：PPTX 还原度——low 图型在 PPTX 显著退化，仅提示不卡门禁（HTML 交付合法；
+    # PPTX 交付时在选型决策树里改 bar/line/hbar 或 dataTable=inline）
+    fidelity_map = (LC.get('charts') or {}).get('fidelityMap') or {}
+    if fidelity_map:
+        low_used = []
+        for t in chart_tags:
+            m = re.search(r'data-chart="([^"]+)"', t)
+            if m and fidelity_map.get(m.group(1)) == 'low':
+                low_used.append(m.group(1))
+        if low_used:
+            chk("图表 PPTX 还原度提示（low 图型 PPTX 会退化）", True,
+                f"低还原度: {sorted(set(low_used))}——HTML 合法；PPTX 建议改 bar/line/hbar 或 dataTable=inline",
+                level="WARN")
+
 
 CARRIERS = checks_html.CARRIERS  # 单源 scripts/checks_html.py
 
@@ -1675,6 +1689,16 @@ def main():
                 r'<ol\b[^>]*class="[^"]*\bagenda\b[^"]*\bagenda--2col\b', txt))
             chk(f"Agenda >{AGENDA_SINGLE_MAX} 条时已用 agenda--2col 双列",
                 has_2col, f"{n_items} 条未双列（大纲很多→两排/两列，禁单列撑爆一屏）", level="WARN")
+        # R4：Agenda 容量契约——条数超上限须分页/章节级大纲；单条标题限长
+        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}（超出请拆上/下篇或章节级大纲）",
+            n_items <= split_max,
+            f"{n_items} 条超上限——PPTX 已自动分页，HTML 会撑出一屏，建议改章节级大纲 6–8 条")
+        long_titles = re.findall(r'class="agenda__t"[^>]*>([^<]{%d,})' % (title_max + 1), txt)
+        chk(f"Agenda 单条标题 ≤{title_max} 字", not long_titles,
+            f"{len(long_titles)} 条超长：{long_titles[:3]}…" if long_titles else "", level="WARN")
 
     # ── 主标题粗体 ──
     chk("主标题粗体 --fw-title/--fw-display",