@lark-apaas/coding-steering 0.1.18-dev.ee5404f → 0.1.18-dev.fb5e270

package/steering/design-html/skills/pptx-style-extract/scripts/ooxml.py

@@ -519,8 +519,25 @@ def read_txbody(tx, ctx, kind='txBody'):
                 ins[k] = ctx.units.px(bp.get(k))
         if ins:
             b['insets_px'] = ins
-        if bp.find('a:normAutofit', NS) is not None:
+        na = bp.find('a:normAutofit', NS)
+        if na is not None:
             b['autofit'] = 'norm'
+            # normAutofit 用 fontScale / lnSpcReduction（单位 1/1000 %）把大字缩进小框——
+            # 章节大号数字就靠它让 160px 的字装进 144px 的框。只记 autofit 存在、丢掉
+            # fontScale，消费端就拿到未缩放字号 + 原始框高，字比框高，渐变裁切把溢出的
+            # 底部切成透明。缺省即 100%（无缩放）。
+            fs = na.get('fontScale')
+            if fs is not None:
+                try:
+                    b['font_scale'] = round(int(fs) / 100000.0, 4)
+                except (TypeError, ValueError):
+                    pass
+            lsr = na.get('lnSpcReduction')
+            if lsr is not None:
+                try:
+                    b['ln_spc_reduction'] = round(int(lsr) / 100000.0, 4)
+                except (TypeError, ValueError):
+                    pass
         elif bp.find('a:spAutoFit', NS) is not None:
             b['autofit'] = 'shape'
         if b:

package/steering/design-html/skills/pptx-style-extract/scripts/package.py

@@ -235,11 +235,13 @@ def parse_item_list(lines):
 
 def read_manifest(path):
     blocks = split_top_blocks(open(path, encoding='utf-8').read())
-    man, assets, raw = {}, [], {}
+    man, assets, asset_decisions, raw = {}, [], [], {}
     derived = []
     for key, inline, lines in blocks:
         if key == 'assets':
             assets = parse_item_list(lines)
+        elif key == 'asset_decisions':
+            asset_decisions = parse_item_list(lines)
         elif key == 'derived':
             derived = parse_item_list(lines)
         elif inline.startswith('['):
@@ -253,6 +255,7 @@ def read_manifest(path):
             # 不把作者的折行改成一条长行。
             raw[key] = (inline, lines)
     man['assets'] = assets
+    man['asset_decisions'] = asset_decisions
     man['derived'] = derived
     man['_raw'] = raw
     return man
@@ -291,6 +294,68 @@ def strip_kind_prefix(aid, kind):
     return aid
 
 
+def apply_asset_decisions(manifest, bound_sources=None):
+    """把临时图片判断并入正式 assets；content 只用于删除候选，不进入消费产物。"""
+    allowed = {'content', 'texture', 'logo', 'icon', 'slogan'}
+    decisions = {}
+    for item in manifest.get('asset_decisions') or []:
+        source = unquote(item.get('source_media') or '')
+        decision = unquote(item.get('decision') or '')
+        if not source or decision not in allowed:
+            raise Fail('asset_decisions 必须逐项填写 source_media 和 decision；'
+                       'decision 只能是 %s' % '|'.join(sorted(allowed)))
+        decisions[source] = decision
+    if bound_sources is not None:
+        unbound = sorted(set(decisions) - set(bound_sources))
+        if unbound:
+            raise Fail('asset_decisions 中这些图片没有对应图片槽：%s'
+                       % '、'.join(unbound))
+
+    assets = []
+    by_source = {}
+    serial = Counter()
+    used_ids = {unquote(item.get('id') or '')
+                for item in manifest.get('assets') or [] if item.get('id')}
+    for item in manifest.get('assets') or []:
+        source = unquote(item.get('source_media') or '')
+        if source and decisions.get(source) == 'content':
+            continue
+        row = dict(item)
+        decision = decisions.get(source)
+        old_kind = unquote(row.get('kind') or '')
+        if decision:
+            row['kind'] = decision
+            if decision != old_kind:
+                serial[decision] += 1
+                aid = '%s-%d' % (KIND_PREFIX[decision], serial[decision])
+                while aid in used_ids:
+                    serial[decision] += 1
+                    aid = '%s-%d' % (KIND_PREFIX[decision], serial[decision])
+                row['id'] = aid
+                for field in ('role', 'theme', 'on-bg', 'mark'):
+                    row.pop(field, None)
+        used_ids.add(unquote(row.get('id') or ''))
+        assets.append(row)
+        if source:
+            by_source[source] = row
+
+    for source, decision in decisions.items():
+        if decision == 'content' or source in by_source:
+            continue
+        serial[decision] += 1
+        prefix = KIND_PREFIX[decision]
+        aid = '%s-%d' % (prefix, serial[decision])
+        while aid in used_ids:
+            serial[decision] += 1
+            aid = '%s-%d' % (prefix, serial[decision])
+        used_ids.add(aid)
+        row = {'id': aid, 'source_media': source, 'kind': decision}
+        assets.append(row)
+        by_source[source] = row
+    manifest['assets'] = assets
+    return decisions, {source: unquote(item['id']) for source, item in by_source.items()}
+
+
 def media_row_of(extract, source_media):
     for m in extract.get('media') or []:
         if m.get('out') and os.path.basename(m['out']) == source_media:
@@ -475,6 +540,16 @@ def expand_placeholders(body, manifest, consumer, audit, extract, layouts_text):
                 f += '（原图 `%s`）' % e['full']
             rows.append('| `%s` | %s | %s |' % (aid, f, when))
         body = body.replace('{{ASSET_TABLE}}', '\n'.join(rows))
+    if '{{LOGO_RULES}}' in body:
+        rows = []
+        for aid, entry in consumer.items():
+            if entry.get('kind') != 'logo':
+                continue
+            owners = _archetypes_using(layouts_text, aid)
+            rows.append('- `%s` 只出现在这些页型上：%s；其余页型不放。位置取该页型 '
+                        '`slots` 里 `role: logo` 那一项的 `box`，原样使用该文件、保持原比例。'
+                        % (aid, '、'.join('`%s`' % owner for owner in owners) or '（无）'))
+        body = body.replace('{{LOGO_RULES}}', '\n'.join(rows))
     if '{{LAYOUT_LIST}}' in body:
         rows, sect, names = [], None, {}
         for line in (layouts_text or '').split('\n'):
@@ -903,6 +978,64 @@ def build_design(manifest, l_frontmatter, consumer, body, has_sidecar, canvas):
     return text
 
 
+def layout_forms(lines):
+    """每个页型草案里实际给了哪几种形态（flow / slots）。"""
+    out, cur = {}, None
+    for line in lines:
+        m = re.match(r'^  ([\w-]+):\s*$', line)
+        if m:
+            cur = m.group(1)
+            out[cur] = set()
+            continue
+        m = re.match(r'^    (flow|slots):\s*$', line)
+        if m and cur:
+            out[cur].add(m.group(1))
+    return out
+
+
+def layout_modes(lines):
+    """读取扁平 `layout_modes:` 判断区。"""
+    out = {}
+    for line in lines:
+        m = re.match(r'^\s{2}([\w-]+):\s*([^\s#]+)', line)
+        if m:
+            out[m.group(1)] = m.group(2).strip()
+    return out
+
+
+def text_role_boxes(lines):
+    """从 slots 里的同名标记取回文本槽坐标，供 flow 固定锚点复用。"""
+    out, pending = {}, None
+    for line in lines:
+        marker = re.match(r'^\s*#\s*text-role:\s*([\w-]+)\s*$', line)
+        if marker:
+            pending = marker.group(1)
+            continue
+        if pending:
+            box = re.search(r'\bbox:\s*(\[[^\]]+\])', line)
+            if box:
+                out[pending] = box.group(1)
+                pending = None
+    return out
+
+
+def select_layout_forms(lines, modes):
+    """按 `layout_modes` 只保留每个页型选中的 flow 或 slots。"""
+    out, layout, drop = [], None, False
+    for line in lines:
+        layout_match = re.match(r'^  ([\w-]+):\s*$', line)
+        form_match = re.match(r'^    (flow|slots):\s*$', line)
+        if layout_match:
+            layout, drop = layout_match.group(1), False
+        elif form_match:
+            drop = modes.get(layout) not in (None, form_match.group(1))
+        elif drop and re.match(r'^    \S', line):
+            drop = False
+        if not drop:
+            out.append(line)
+    return out
+
+
 def shrink_safe_area(lines):
     """text_safe 与 avoid 相交时把安全区收掉重叠的那部分。
 
@@ -955,13 +1088,46 @@ def shrink_safe_area(lines):
     return lines, None
 
 
-def build_layouts_md(layouts_blocks, canvas):
+def resolve_asset_candidate_lines(lines, decisions, asset_ids):
+    """把 source_media 临时字段转成资产引用；内容图保留通用 pic 槽。"""
+    out = []
+    content_slots = set()
+    for line in lines:
+        match = re.search(r'\bsource_media:\s*([^,}]+)', line)
+        if not match:
+            out.append(line)
+            continue
+        source = unquote(match.group(1).strip())
+        decision = decisions.get(source)
+        line = re.sub(r'\s*,?\s*source_media:\s*[^,}]+', '', line, count=1)
+        if decision == 'content':
+            line = re.sub(r'\s*,?\s*asset:\s*[^,}]+', '', line, count=1)
+            line = re.sub(r'(\brole:\s*)[\w-]+', r'\g<1>pic', line, count=1)
+            content_key = line.strip()
+            if content_key in content_slots:
+                continue
+            content_slots.add(content_key)
+            out.append(line)
+            continue
+        aid = asset_ids.get(source)
+        if not aid:
+            raise Fail('layouts.yaml 引用了未完成资产判断的 source_media: %s' % source)
+        if re.search(r'\basset:\s*[^,}]+', line):
+            line = re.sub(r'(\basset:\s*)[^,}]+', r'\g<1>%s' % aid, line, count=1)
+        else:
+            line = line.replace('}', ', asset: %s}' % aid, 1)
+        line = re.sub(r'(\brole:\s*)[\w-]+', r'\g<1>%s' % decision, line, count=1)
+        out.append(line)
+    return out
+
+
+def build_layouts_md(layouts_blocks, canvas, asset_decisions=None, asset_ids=None):
     blocks = {k: (inline, lines) for k, inline, lines in layouts_blocks}
     if 'canvas' in blocks:
         raise Fail('layouts.yaml 不要写 canvas —— 脚本从 extract.json 取')
     if 'layouts' not in blocks:
         raise Fail('layouts.yaml 缺顶层键 `layouts:`')
-    # `names:` / `roles:` / `text_roles:` / `bg_rules:` 是给 L 层集中填判断的
+    # `names:` / `roles:` / `text_roles:` / `layout_modes:` / `bg_rules:` 是给 L 层集中填判断的
     # 扁平区——在这里并回各 archetype，本身不进产物。让 L 层只改扁平键值，别去动 layouts 里的
     # slots/confidence 结构（嵌套结构手改极易破坏缩进，进而静默改变语义）。
     names, roles = {}, {}
@@ -1002,12 +1168,33 @@ def build_layouts_md(layouts_blocks, canvas):
                 raise Fail('%s: %s' % (bg, err))
             out.append('  %s:' % bg)
             out += lines
+    modes = layout_modes(blocks.get('layout_modes', ('', []))[1])
     out.append('layouts:')
     pending_text_role = None
     used_text_roles = set()
-    for line in blocks['layouts'][1]:
+    source_layout_lines = resolve_asset_candidate_lines(
+        blocks['layouts'][1], asset_decisions or {}, asset_ids or {})
+    role_boxes = text_role_boxes(source_layout_lines)
+    layout_lines = select_layout_forms(source_layout_lines, modes)
+    cur, fixed_items = None, []
+
+    def flush_fixed_items():
+        if not fixed_items:
+            return
+        out.append('        - kind: free')
+        out.append('          items:')
+        out.extend(fixed_items)
+        fixed_items.clear()
+
+    for line in layout_lines:
+        m = re.match(r'^  ([\w-]+):\s*$', line)
+        if m:
+            flush_fixed_items()
+            cur = m.group(1)
+        elif fixed_items and re.match(r'^    \S', line):
+            flush_fixed_items()
         # 判断单里的结构事实（栅格、间距序列、样张字数、命中配方）是给 L 层判断用的，
-        # 不进产物——消费端要的是结论，不是推导过程。
+        # 不进产物——消费端要的是结论，不是推导过程。layout_mode 同理，它是判断的载体。
         if line.lstrip().startswith('#'):
             marker = re.match(r'^\s*#\s*text-role:\s*([\w-]+)\s*$', line)
             if marker:
@@ -1017,21 +1204,32 @@ def build_layouts_md(layouts_blocks, canvas):
             if pending_text_role not in text_roles:
                 raise Fail('text_roles 缺少 %s 的判断' % pending_text_role)
             role = text_roles[pending_text_role]
-            slot_type = role if role in ('title', 'subtitle', 'footer') else 'body'
+            slot_type = role if role in ('title', 'subtitle', 'header', 'footer') else 'body'
             line, role_n = re.subn(r'(\{\s*role:\s*)[\w-]+',
                                    r'\g<1>%s' % role, line, count=1)
             line, type_n = re.subn(r'(\btype:\s*)[\w-]+',
                                    r'\g<1>%s' % slot_type, line, count=1)
             if role_n != 1 or type_n != 1:
                 raise Fail('text_roles.%s 没有命中一个文本槽' % pending_text_role)
+            if (modes.get(cur) == 'flow' and role in ('header', 'footer')
+                    and re.match(r'^\s{12}-\s*\{', line) and 'box:' not in line):
+                box = role_boxes.get(pending_text_role)
+                if not box:
+                    raise Fail('text_roles.%s 识别为 %s，但 slots 中没有坐标'
+                               % (pending_text_role, role))
+                line = re.sub(r',\s*type:', ', box: %s, type:' % box, line, count=1)
+                fixed_items.append(line)
+                used_text_roles.add(pending_text_role)
+                pending_text_role = None
+                continue
             used_text_roles.add(pending_text_role)
             pending_text_role = None
         out.append(line)
-        m = re.match(r'^  ([\w-]+):\s*$', line)
         if m and m.group(1) in names:
             out.append('    name: "%s"' % names.pop(m.group(1)))
         if m and m.group(1) in roles:
             out.append('    role: %s' % roles.pop(m.group(1)))
+    flush_fixed_items()
     if names:
         raise Fail('names 里这些页型在 layouts 下找不到：%s' % ', '.join(sorted(names)))
     if roles:
@@ -1045,23 +1243,22 @@ def build_layouts_md(layouts_blocks, canvas):
                                      '\n'.join(out), re.M)]
     if missing_role:
         raise Fail('这些页型没有 role（在 layouts.yaml 的 roles 段填）：%s' % ', '.join(missing_role))
-    # flow 与 slots 二选一：两份都留下，消费端不知道该听哪份坐标——design.md 正文与
-    # layouts.md 打架就是这么来的，别重演。
-    both, cur, has = [], None, {}
-    for line in blocks['layouts'][1]:
-        m = re.match(r'^  ([\w-]+):\s*$', line)
-        if m:
-            if cur and has.get('flow') and has.get('slots'):
-                both.append(cur)
-            cur, has = m.group(1), {}
-            continue
-        m = re.match(r'^    (flow|slots):\s*$', line)
-        if m:
-            has[m.group(1)] = True
-    if cur and has.get('flow') and has.get('slots'):
-        both.append(cur)
-    if both:
-        raise Fail('这些页型同时留了 flow 和 slots，二选一删掉另一个：%s' % ', '.join(both))
+    # `layout_modes.*: TODO` 由上面那道通用 TODO 扫描报（它连行内提示一起打出来），
+    # 这里只管它管不到的两种：整行被删、以及填了 flow/slots 之外的值。
+    forms = layout_forms(blocks['layouts'][1])
+    bad = []
+    for k, v in sorted(modes.items()):
+        if len(forms.get(k) or ()) < 2:
+            continue                          # 只有一份形态，无从选择
+        if v not in ('flow', 'slots'):
+            bad.append('%s 的 layout_modes 判断是 %r' % (k, v))
+        elif v not in forms[k]:
+            bad.append('%s 选了 %s 但该页型没有这一份' % (k, v))
+    for k, forms_for_layout in sorted(forms.items()):
+        if len(forms_for_layout) >= 2 and k not in modes:
+            bad.append('%s 缺 layout_modes 判断' % k)
+    if bad:
+        raise Fail('layout_modes 只能填 flow 或 slots，一个页型一个词：%s' % '；'.join(bad))
     declared = set(re.findall(r'^    background:\s*(\S+)\s*$',
                               '\n'.join(blocks['layouts'][1]), re.M))
     stray = set(bg_rules) - declared
@@ -1144,12 +1341,24 @@ def main(argv=None):
     lay_path = os.path.join(lout, 'layouts.yaml')
     layouts_blocks = (split_top_blocks(open(lay_path, encoding='utf-8').read())
                       if os.path.exists(lay_path) else None)
+    bound_sources = set()
+    if layouts_blocks is not None:
+        for _, _, lines in layouts_blocks:
+            for line in lines:
+                match = re.search(r'\bsource_media:\s*([^,}]+)', line)
+                if match:
+                    bound_sources.add(unquote(match.group(1).strip()))
+    asset_decisions, asset_ids = apply_asset_decisions(
+        manifest, bound_sources=bound_sources if manifest.get('asset_decisions') else None)
     canvas = extract['canvas']['px']
+    final_layouts = (build_layouts_md(
+        layouts_blocks, canvas, asset_decisions=asset_decisions, asset_ids=asset_ids)
+        if layouts_blocks is not None else None)
 
     os.makedirs(pack, exist_ok=True)
     consumer, audit, copied = place_assets(manifest, extract, stage1, pack)
 
-    lay_text = open(lay_path, encoding='utf-8').read() if os.path.exists(lay_path) else ''
+    lay_text = final_layouts or ''
     body = expand_placeholders(body, manifest, consumer, audit, extract, lay_text)
     design = build_design(manifest, l_fm, consumer, body,
                           has_sidecar=layouts_blocks is not None, canvas=canvas)
@@ -1157,7 +1366,7 @@ def main(argv=None):
         f.write(design)
     if layouts_blocks is not None:
         with open(os.path.join(pack, 'layouts.md'), 'w', encoding='utf-8') as f:
-            f.write(build_layouts_md(layouts_blocks, canvas))
+            f.write(final_layouts)
 
     # 审计记录写回**抽取工作目录**，不进交付包：包是消费产物，`ref/` 里的东西
     # 没有任何门禁读、消费模型也用不上，放进去只会让「别读我」和「几 MB 材料」同时下发。

package/steering/design-html/skills/pptx-style-extract/scripts/test_asset_judgment_package.py

@@ -0,0 +1,161 @@
+#!/usr/bin/env python3
+"""Integration regression tests for model-decided image roles."""
+import json
+import os
+import sys
+import tempfile
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from check_v2 import Pack, RULES  # noqa: E402
+from package import main as package_main  # noqa: E402
+
+
+class AssetJudgmentPackageTest(unittest.TestCase):
+    def test_package_strips_judgment_fields_and_preserves_content_slot(self):
+        try:
+            from PIL import Image
+        except ImportError:
+            self.skipTest('Pillow unavailable')
+
+        with tempfile.TemporaryDirectory() as root:
+            stage1 = os.path.join(root, 'stage1')
+            lout = os.path.join(stage1, 'l-out')
+            pack = os.path.join(root, 'pack')
+            media = os.path.join(stage1, 'media-out')
+            ref = os.path.join(stage1, 'ref')
+            os.makedirs(lout)
+            os.makedirs(media)
+            os.makedirs(ref)
+
+            Image.new('RGBA', (40, 20), (20, 40, 60, 255)).save(
+                os.path.join(media, 'partner-logo.png'))
+            Image.new('RGBA', (24, 24), (60, 40, 20, 255)).save(
+                os.path.join(media, 'ornament.png'))
+
+            box_rows = [
+                ('ppt/media/image1.png', 'partner-logo.png', [100, 200, 400, 200]),
+                ('ppt/media/image2.png', 'ornament.png', [40, 40, 120, 120]),
+            ]
+            extract = {
+                'source': {'filename': 'fixture.pptx'},
+                'canvas': {
+                    'px': [1920, 1080],
+                    'source': {'cx': 12192000, 'cy': 6858000, 'unit': 'EMU'},
+                },
+                'media': [
+                    {
+                        'media': source,
+                        'out': 'media-out/' + output,
+                        'source_px': [40, 20] if output == 'partner-logo.png' else [24, 24],
+                    }
+                    for source, output, _ in box_rows
+                ],
+                'images': [
+                    {
+                        'media': source,
+                        'boxes': [{
+                            'count': 1,
+                            'box': {'x': box[0], 'y': box[1], 'w': box[2], 'h': box[3]},
+                            'parts': ['ppt/slides/slide1.xml'],
+                        }],
+                    }
+                    for source, _, box in box_rows
+                ],
+                'color_freq': [],
+                'text_scale': [],
+            }
+            with open(os.path.join(stage1, 'extract.json'), 'w', encoding='utf-8') as stream:
+                json.dump(extract, stream)
+            with open(os.path.join(ref, 'shapes.json'), 'w', encoding='utf-8') as stream:
+                json.dump({
+                    'shapes': [
+                        {
+                            'part': 'ppt/slides/slide1.xml',
+                            'kind': 'pic',
+                            'name': output,
+                            'box': {'x': box[0], 'y': box[1], 'w': box[2], 'h': box[3]},
+                        }
+                        for _, output, box in box_rows
+                    ],
+                }, stream)
+
+            with open(os.path.join(lout, 'manifest.yaml'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    'version: alpha\n'
+                    'name: asset-judgment-fixture\n'
+                    'description: >\n'
+                    '  A restrained fixture with explicit image-role judgments and traced layout slots.\n'
+                    'assets:\n'
+                    '  - id: logo-primary\n'
+                    '    source_media: partner-logo.png\n'
+                    '    kind: logo\n'
+                    '    on-bg: light\n'
+                    'asset_decisions:\n'
+                    '  - source_media: partner-logo.png\n'
+                    '    decision: content\n'
+                    '  - source_media: ornament.png\n'
+                    '    decision: texture\n'
+                )
+            with open(os.path.join(lout, 'frontmatter.yaml'), 'w', encoding='utf-8') as stream:
+                stream.write('')
+            with open(os.path.join(lout, 'layouts.yaml'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    'layouts:\n'
+                    '  content:\n'
+                    '    name: "内容页"\n'
+                    '    role: content\n'
+                    '    slots:\n'
+                    '      - {role: logo, box: [100, 200, 400, 200], type: pic, '
+                    'asset: logo-primary, source_media: partner-logo.png}\n'
+                    '      - {role: asset-candidate, box: [40, 40, 120, 120], type: pic, '
+                    'source_media: ornament.png}\n'
+                    '    confidence: high\n'
+                )
+            with open(os.path.join(lout, 'body.md'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    '## Usage\n\n'
+                    'Read `layouts.md` before composing a slide.\n\n'
+                    '## Assets\n\n'
+                    '{{ASSET_TABLE}}\n\n'
+                    '## Hard Rules\n\n'
+                    '{{LOGO_RULES}}\n'
+                )
+            check_v1 = os.path.join(root, 'check_v1.py')
+            with open(check_v1, 'w', encoding='utf-8') as stream:
+                stream.write('raise SystemExit(0)\n')
+
+            rc = package_main([stage1, lout, pack, '--check-v1', check_v1])
+
+            self.assertEqual(rc, 0)
+            with open(os.path.join(pack, 'design.md'), encoding='utf-8') as stream:
+                design = stream.read()
+            with open(os.path.join(pack, 'layouts.md'), encoding='utf-8') as stream:
+                layouts = stream.read()
+            self.assertNotIn('asset_decisions', design)
+            self.assertNotIn('source_media', design)
+            self.assertNotIn('source_media', layouts)
+            self.assertNotIn('{{LOGO_RULES}}', design)
+            self.assertNotIn('logo-primary', design)
+            self.assertNotIn('logo-primary', layouts)
+            self.assertIn(
+                '- {role: pic, box: [100, 200, 400, 200], type: pic}',
+                layouts,
+            )
+            self.assertIn('texture-1:', design)
+            self.assertIn('kind: texture', design)
+            self.assertIn(
+                '- {role: texture, box: [40, 40, 120, 120], type: pic, asset: texture-1}',
+                layouts,
+            )
+            gate = Pack(pack)
+            self.assertFalse([
+                result
+                for result in (rule(gate) for rule in RULES)
+                if result.fails
+            ])
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_color_contract.py

@@ -49,7 +49,9 @@ class ColorContractTest(unittest.TestCase):
 
         self.assertIn('允许新增中性色、低彩度辅助色或局部语义色', body)
         self.assertRegex(body, r'正负.*风险.*警告.*状态.*图表序列')
-        self.assertIn('不得自行新增第二强调色', body)
+        self.assertIn('必要时可以使用 Colors 之外的颜色', body)
+        self.assertIn('不能形成与模板主色竞争的第二强调色', body)
+        self.assertIn('色相、明度和饱和度关系', body)
         self.assertIn('高饱和、高对比、大面积或跨页重复', body)
         self.assertIn('标题、关键数字、图表主序列、卡片底色或渐变', body)
 

package/steering/design-html/skills/pptx-style-extract/scripts/test_design_consumer_contract.py

@@ -56,6 +56,7 @@ class DesignConsumerContractTest(unittest.TestCase):
         self.assertIn('沿用该页型已有的标题层级与局部 `css`', body)
         self.assertIn('背景中已经可见的固定标题不再创建文本', body)
         self.assertIn('没有 `subtitle` 槽就不新增副标题', body)
+        self.assertIn('区带自带 `margin: [左, 右]` 时用它的', body)
 
 
 if __name__ == '__main__':