@topmindspace/tms-skills 0.1.13 → 0.1.15

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

@@ -77,8 +77,7 @@ def sowhat(sec: dict) -> str:
     t = sec.get('soWhat')
     if not t:
         return ''
-    return (f'    <div class="sowhat rv"><span class="sowhat__k">So what</span>'
-            f'<span class="sowhat__v">{cite(t)}</span></div>\n')
+    return (f'    <div class="sowhat rv"><span class="sowhat__v">{cite(t)}</span></div>\n')
 
 
 def footnote(sec: dict) -> str:
@@ -326,8 +325,7 @@ def r_comparison(i, sec):
             + panel(sec.get('left')) + '\n' + panel(sec.get('right'), True) + '\n'
             + '    </div>\n')
     if sec.get('verdict'):
-        body += (f'    <div class="sowhat rv"><span class="sowhat__k">结论</span>'
-                 f'<span class="sowhat__v">{cite(sec["verdict"])}</span></div>\n')
+        body += (f'    <div class="sowhat rv"><span class="sowhat__v">{cite(sec["verdict"])}</span></div>\n')
     sec = dict(sec)
     sec.pop('verdict', None)
     return wrap(i, 'comparison', body, sec)

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

@@ -282,8 +282,7 @@ def pg_chart(i, sec):
       </div>
 {SIDE_NOTES}
     </div>
-    <div class="sowhat rv"><span class="sowhat__k">So what</span>
-      <span class="sowhat__v">一行含义（≤60 字）。</span></div>
+    <div class="sowhat rv"><span class="sowhat__v">一行含义（≤60 字）。</span></div>
   </div>
 </section>'''
     return html, {'type': 'bar', 'chart': {'type': ct, 'labels': ['A', 'B', 'C'], 'values': [42, 61, 35],
@@ -303,8 +302,7 @@ def pg_donut(i, sec):
       </div>
 {SIDE_NOTES}
     </div>
-    <div class="sowhat rv"><span class="sowhat__k">So what</span>
-      <span class="sowhat__v">一行含义（≤60 字）。</span></div>
+    <div class="sowhat rv"><span class="sowhat__v">一行含义（≤60 字）。</span></div>
   </div>
 </section>'''
     return html, {'type': 'donut', 'chart': {'labels': ['A', 'B', 'C'], 'values': [45, 35, 20],
@@ -327,7 +325,6 @@ def pg_exhibit(i, sec):
 {SIDE_NOTES}
     </div>
     <div class="sowhat rv">
-      <span class="sowhat__k">So what</span>
       <span class="sowhat__v">一行含义或建议（≤60 字）。</span>
     </div>
   </div>
@@ -556,8 +553,7 @@ def pg_comparison(i, sec):
         <h3 class="t-h3" style="color:var(--accent)">目标</h3>
         <ul class="ul"><li><strong>要点。</strong>一句话。</li><li><strong>要点。</strong>一句话。</li></ul></div>
     </div>
-    <div class="sowhat rv"><span class="sowhat__k">结论</span>
-      <span class="sowhat__v">一行结论（≤60 字）。</span></div>
+    <div class="sowhat rv"><span class="sowhat__v">一行结论（≤60 字）。</span></div>
   </div>
 </section>'''
     return html, {'type': 'comparison',
@@ -721,8 +717,7 @@ def pg_info(i, sec):
         <text x="{w // 2}" y="{h // 2}" text-anchor="middle" class="f-txt3" font-size="13">{t} 信息图占位</text>
       </svg>
     </div>
-{src}    <div class="sowhat rv"><span class="sowhat__k">So what</span>
-      <span class="sowhat__v">一行含义（≤60 字）。</span></div>
+{src}    <div class="sowhat rv"><span class="sowhat__v">一行含义（≤60 字）。</span></div>
   </div>
 </section>'''
     model = {'type': t}
@@ -760,7 +755,6 @@ BUILDERS = {
 
 
 SOWHAT_BLOCK = '''    <div class="sowhat rv">
-      <span class="sowhat__k">So what</span>
       <span class="sowhat__v">这一页的含义或下一步建议（≤60 字）。</span>
     </div>
 '''

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

@@ -225,7 +225,7 @@ def test_annotation_band_reports_all_invaders() -> None:
     els = [
         sp(5.0, 1.2, 4.0, "PlotSeriesA"),
         sp(5.2, 1.1, 4.0, "PlotSeriesB"),
-        sp(6.05, 0.55, 12.0, "SO WHAT locked path"),
+        sp(6.05, 0.55, 12.0, "Platform locked path takeaway"),
     ]
     issues = V.annotation_band_overlap_check(els, 1, int(7.5 * EMU), int(13.333 * EMU))
     codes = [i["code"] for i in issues]
@@ -252,7 +252,7 @@ def test_annotation_band_so_what_band_top() -> None:
     els = [
         # Body ends at 6.30 — inside (soWhatY=6.05, contentBottomWithNote=6.40]
         sp(5.0, 1.3, 4.0, "LegendCrushMid"),
-        sp(6.05, 0.55, 12.0, "SO WHAT platform first"),
+        sp(6.05, 0.55, 12.0, "Platform first takeaway text"),
     ]
     issues = V.annotation_band_overlap_check(els, 1, int(7.5 * EMU), int(13.333 * EMU))
     codes = [i["code"] for i in issues]

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

@@ -439,7 +439,7 @@ def annotation_band_overlap_check(
     def _is_annotation_self(y: int, cy: int, cx: int, text: str) -> bool:
         """so-what / footnote / source row living in the annotation zone."""
         if _at_so_what_slot(y) and cy <= int(0.85 * 914400):
-            # Fill rect, accent strip, or SO WHAT text — all live in the slot
+            # Fill rect, accent strip, or 结论条正文 — all live in the slot
             if ann_pat.search(text) or _is_bar_like(cy, cx) or cx <= int(0.15 * 914400):
                 return True
         if _is_note_like(y, cy, text):
@@ -464,7 +464,7 @@ def annotation_band_overlap_check(
         note_like = _is_note_like(y, cy, txt)
         labeled = bool(ann_pat.search(txt))
         bar = _is_bar_like(cy, cx)
-        # Fill rect sits on soWhatY (±0.02); labeled SO WHAT text may sit slightly below
+        # Fill rect sits on soWhatY (±0.02); 结论条正文 may sit slightly below
         on_fill = abs(y - so_what_y) <= int(0.02 * 914400) and bar
         labeled_slot = labeled and _at_so_what_slot(y) and cy <= int(0.85 * 914400)
         if note_like:
@@ -503,7 +503,7 @@ def annotation_band_overlap_check(
                 "ANNOTATION_BAND_OVERLAP",
                 f"主内容侵入注释带（元素底边 {bottom/914400:.2f}in 越过注释带顶 "
                 f"{band_top_in:.2f}in，重叠 {overlap/914400:.2f}in）——"
-                "图例/系列请收入主图区或压缩系列数，禁止压进 so-what/来源行。",
+                "图例/系列请收入主图区或压缩系列数，禁止压进结论条/来源行。",
                 slide=slide_no,
             ))
     return out
@@ -619,9 +619,10 @@ def _infer_container_pad(shape: ET.Element, pad_map: dict[str, float], min_pad:
         return float(pad_map[kind]), kind
     if kind:
         return min_pad, kind
-    # 启发式兜底：仅对明确的 so-what / 待核实文本用对应 pad（其余 minPad）
+    # 启发式兜底：仅对明确的结论条 / 待核实文本用对应 pad（其余 minPad）
     text = text_content(shape)
-    if "SO WHAT" in text:
+    # Legacy "SO WHAT" label OR tr:soWhat already handled above; keep SO WHAT for old files
+    if "SO WHAT" in text or "结论条" in text:
         return float(pad_map.get("soWhat") or min_pad), "soWhat"
     if "待核实" in text:
         return float(pad_map.get("band") or min_pad), "band"
@@ -995,12 +996,27 @@ def inspect_slide(
             issue("LOW_TEXT_DENSITY", "多个文本框但总字符 <25；信息密度不足。", slide=slide_number)
         )
 
-    if re.search(r"EXHIBIT\s*\d", combined_text, re.IGNORECASE) and "SO WHAT" not in combined_text:
-        warnings.append(
-            issue("EXHIBIT_PAGE_MISSING_SOWHAT",
-                  "页面带 Exhibit 编号但没有 'SO WHAT' 结论条（research R2 版式）。",
-                  slide=slide_number)
-        )
+    if re.search(r"EXHIBIT\s*\d", combined_text, re.IGNORECASE):
+        has_conclusion_bar = False
+        for el in all_elements:
+            oname = _shape_object_name(el)
+            if "soWhat" in (oname or ""):
+                has_conclusion_bar = True
+                break
+            box = shape_bounds(el)
+            if box is None:
+                continue
+            _x, y, cx, cy = box
+            # Wide fill at soWhatY ≈ 6.05in (MD3 结论条衬底)
+            if abs(y / 914400 - 6.05) <= 0.08 and cx / 914400 >= 6.0 and cy / 914400 <= 0.85:
+                has_conclusion_bar = True
+                break
+        if not has_conclusion_bar and "SO WHAT" not in combined_text:
+            warnings.append(
+                issue("EXHIBIT_PAGE_MISSING_SOWHAT",
+                      "页面带 Exhibit 编号但没有结论条（research R2 版式 · MD3 衬条）。",
+                      slide=slide_number)
+            )
 
     # v9：HTML 标签源码泄漏进 PPTX 文本（模型字段未净化时原样露出）
     tag_leaks = re.findall(

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

@@ -23,7 +23,7 @@ research / architecture 仍须显式传 --layout-qa（不强制）。
   强调带约束（band--deep 反相页 ≤ 上限且不作末页） / 待核实标注（.tbd ↔ .tbd-legend/.flagbar） /
   素材图片与配图占位（零外链 + alt + 内联体积 + 版式/比例锁定类对应 + 占位可见标签 + 模型对应） /
   PPTX 预览配套（预览按钮 + 模型 + 运行时，页面无导出按钮） /
-  内容级质量（版式节奏连用上限 / so-what 实质与空洞套话 / research 标题含数字或判断词）
+  内容级质量（版式节奏连用上限 / 结论条实质与空洞套话 / research 标题含数字或判断词）
 """
 import sys
 import re
@@ -97,7 +97,7 @@ IMAGE_MAX_PER_PAGE = int(IMAGE_SPEC.get('maxPerPage') or 6)
 IMAGE_MAX_INLINE = int(IMAGE_SPEC.get('maxInlineBytes') or 1572864)
 IMAGE_MAX_TOTAL = int(IMAGE_SPEC.get('maxTotalInlineBytes') or 8388608)
 
-AGENDA_SINGLE_MAX = 8        # 超过则建议 agenda--2col
+AGENDA_SINGLE_MAX = int((((LC.get("contentQuality") or {}).get("agenda") or {}).get("singleMax")) or 8)  # 超过则须 agenda--2col
 # 页高估算参数（单源 layout-constants.pageHeightEstimate）
 _HE = LC.get('pageHeightEstimate') or {}
 SCREEN_BUDGET_PX = int(_HE.get('screenBudgetPx') or 1000)
@@ -356,7 +356,7 @@ def _check_bands(txt, chk, mode="presentation"):
 
 
 def _check_icons(txt, chk):
-    """图标使用：长报告不应全文无图标（要点卡/关键列表至少一处）。"""
+    """图标使用：长报告不应全文无图标；含 ≥2 张卡的内容页应有 .card__ico（WARN）。"""
     if len(_bands(txt)) < 6:
         return
     has_icon = ('ul--ico' in txt or 'metric__ico' in txt or
@@ -364,6 +364,24 @@ def _check_icons(txt, chk):
                 re.search(r'card__ico">\s*<svg', txt))
     chk("长报告（≥6页）要点卡/关键列表有图标", bool(has_icon),
         "全文未用图标（见 icons.md 使用准则）", level="WARN")
+    # Soft gate: points/cards pages with ≥2 .card and zero .card__ico
+    bare_card_pages = 0
+    for m in re.finditer(r'<section\b([^>]*)>([\s\S]*?)</section>', txt):
+        attrs, body = m.group(1), m.group(2)
+        pt = re.search(r'data-page-type="([^"]+)"', attrs)
+        page_type = (pt.group(1) if pt else '') or ''
+        if page_type not in ('points', 'cards', 'split', 'comparison'):
+            # Also catch sections that clearly use card grids
+            if body.count('class="card') + body.count("class='card") < 2:
+                continue
+        n_cards = len(re.findall(r'class="[^"]*\bcard\b', body))
+        if n_cards < 2:
+            continue
+        if 'card__ico' not in body:
+            bare_card_pages += 1
+    chk("要点/卡片页（≥2 卡）含 .card__ico", bare_card_pages == 0,
+        f"{bare_card_pages} 页有多卡但无图标（见 icons.md 四正当位置）" if bare_card_pages else "",
+        level="WARN")
 
 
 def _check_table_rows(txt, chk, mode="presentation"):
@@ -763,7 +781,7 @@ def _check_content_quality(txt, chk, mode, model):
         if any(f in body for f in forbidden):
             hollow.append(f'{src}:{body[:24]}')
     if texts:
-        chk(f"so-what 实质（长度 ≥{min_chars} 字且无空洞套话）", not short and not hollow,
+        chk(f"结论条实质（长度 ≥{min_chars} 字且无空洞套话）", not short and not hollow,
             "; ".join((short + hollow)[:4]) if (short or hollow) else "", level="WARN")
 
     # ③ research 行动标题须含数字或判断词
@@ -1651,8 +1669,12 @@ def main():
         n_items = txt.count('class="agenda__a"')
         chk("Agenda 条目可点击跳转 (≥4)", n_items >= 4, f"{n_items} 条")
         if n_items > AGENDA_SINGLE_MAX:
+            # 只认大纲元素 class（禁被 engine.css 的 .agenda--2col 选择器误伤）
+            has_2col = bool(re.search(
+                r'<ol\b[^>]*class="[^"]*\bagenda--2col\b', txt)) or bool(re.search(
+                r'<ol\b[^>]*class="[^"]*\bagenda\b[^"]*\bagenda--2col\b', txt))
             chk(f"Agenda >{AGENDA_SINGLE_MAX} 条时已用 agenda--2col 双列",
-                'agenda--2col' in txt, f"{n_items} 条未双列", level="WARN")
+                has_2col, f"{n_items} 条未双列（大纲很多→两排/两列，禁单列撑爆一屏）", level="WARN")
 
     # ── 主标题粗体 ──
     chk("主标题粗体 --fw-title/--fw-display",