@lark-apaas/coding-steering 0.1.18-dev.4e64c13 → 0.1.18-dev.61b3ece

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

@@ -11,6 +11,8 @@ as-is *and* re-encoded to a webp under ASSET_BUDGET_BYTES; without Pillow the
 transcode falls back to darwin `sips`, and failing that the row records
 transcode_blocked and extract.json records pillow_available: false.
 """
+import hashlib
+import io
 import json
 import os
 import re
@@ -251,6 +253,214 @@ def export_media(pkg, images, outdir, pillow_ok, export_all=False):
     return rows
 
 
+# ---------------------------------------------------- rendered backgrounds
+def _is_full_canvas_picture(shape):
+    return (shape.get('kind') == 'pic' and shape.get('media')
+            and not shape.get('hidden')
+            and (shape.get('w_pct') or 0) >= 95
+            and (shape.get('h_pct') or 0) >= 95)
+
+
+def _picture_has_appearance(shape):
+    return bool(shape.get('flipH') or shape.get('flipV') or shape.get('rot')
+                or shape.get('crop')
+                or (shape.get('opacity') is not None and shape.get('opacity') != 1.0))
+
+
+def _effective_background(parts, bg_by_part):
+    background = None
+    for part in parts:
+        if bg_by_part.get(part):
+            background = bg_by_part[part]
+    return background
+
+
+def _draw_picture(canvas, shape, pkg, image_cache=None):
+    """Replay one p:pic's crop, flip, rotation and blip opacity with Pillow."""
+    from PIL import Image, ImageEnhance, ImageOps
+
+    media = shape.get('media')
+    if media not in pkg.names:
+        return False
+    image_cache = image_cache if image_cache is not None else {}
+    box = shape.get('box_unrotated') or shape.get('box') or {}
+    if media not in image_cache:
+        try:
+            source = Image.open(io.BytesIO(pkg.zip.read(media))).convert('RGBA')
+            source.load()
+            image_cache[media] = source
+        except Exception:
+            return False
+    picture = image_cache[media].copy()
+
+    crop = shape.get('crop') or {}
+    left = max(0.0, min(float(crop.get('l', 0) or 0), 100.0))
+    top = max(0.0, min(float(crop.get('t', 0) or 0), 100.0))
+    right = max(0.0, min(float(crop.get('r', 0) or 0), 100.0))
+    bottom = max(0.0, min(float(crop.get('b', 0) or 0), 100.0))
+    bounds = (
+        int(round(picture.width * left / 100.0)),
+        int(round(picture.height * top / 100.0)),
+        int(round(picture.width * (1.0 - right / 100.0))),
+        int(round(picture.height * (1.0 - bottom / 100.0))),
+    )
+    if bounds[2] > bounds[0] and bounds[3] > bounds[1]:
+        picture = picture.crop(bounds)
+
+    width = max(1, int(round(box.get('w') or 0)))
+    height = max(1, int(round(box.get('h') or 0)))
+    resampling = getattr(Image, 'Resampling', Image)
+    picture = picture.resize((width, height), resampling.LANCZOS)
+    if shape.get('flipH'):
+        picture = ImageOps.mirror(picture)
+    if shape.get('flipV'):
+        picture = ImageOps.flip(picture)
+    opacity = shape.get('opacity')
+    if opacity is not None:
+        picture.putalpha(ImageEnhance.Brightness(picture.getchannel('A')).enhance(
+            max(0.0, min(float(opacity), 1.0))))
+
+    rotation = float(shape.get('rot') or 0)
+    if rotation:
+        picture = picture.rotate(-rotation, resample=resampling.BICUBIC, expand=True)
+    center_x = float(box.get('x') or 0) + width / 2.0
+    center_y = float(box.get('y') or 0) + height / 2.0
+    x = int(round(center_x - picture.width / 2.0))
+    y = int(round(center_y - picture.height / 2.0))
+    layer = Image.new('RGBA', canvas.size)
+    layer.alpha_composite(picture, (x, y))
+    canvas.alpha_composite(layer)
+    return True
+
+
+def _draw_background(canvas, background, pkg, image_cache=None):
+    """Draw the effective p:bg underneath picture layers."""
+    from PIL import Image
+    from render_pages import _grad_image, _grad_stops, _rgba, background_css
+
+    css = background_css(background)
+    canvas.paste(_rgba(css, (255, 255, 255, 255)),
+                 (0, 0, canvas.width, canvas.height))
+    gradient = _grad_stops(css or '')
+    if gradient:
+        canvas.alpha_composite(
+            _grad_image(Image, canvas.width, canvas.height, gradient[0], gradient[1]))
+    if background and background.get('type') == 'image' and background.get('media'):
+        _draw_picture(canvas, {
+            'media': background['media'],
+            'box_unrotated': {'x': 0, 'y': 0, 'w': canvas.width, 'h': canvas.height},
+            'crop': background.get('crop') or {},
+        }, pkg, image_cache)
+
+
+def _save_background_webp(canvas, path):
+    """Prefer lossless output; fall back to a quality ladder when oversized."""
+    canvas.convert('RGB').save(path, 'WEBP', lossless=True, method=0)
+    if os.path.getsize(path) <= ASSET_BUDGET_BYTES:
+        return
+    rgb = canvas.convert('RGB')
+    for quality in (95, 90, 85, 75):
+        rgb.save(path, 'WEBP', quality=quality, method=6)
+        if os.path.getsize(path) <= ASSET_BUDGET_BYTES:
+            return
+
+
+def compose_backgrounds(pkg, graph, shapes, bg_by_part, units, outdir, pillow_ok):
+    """Flatten non-trivial full-canvas picture stacks into one web-safe asset."""
+    if not pillow_ok:
+        return {}, [], []
+    try:
+        from PIL import Image
+    except Exception:
+        return {}, [], []
+
+    by_part = defaultdict(list)
+    for shape in shapes:
+        by_part[shape['part']].append(shape)
+
+    chains = {}
+    for layout in pkg.layouts:
+        master = graph['master_of_layout'].get(layout)
+        show_master = pkg.xml(layout).get('showMasterSp', '1') != '0'
+        chains[layout] = [part for part in ((master if show_master else None), layout) if part]
+    for slide in pkg.slides:
+        layout = graph['layout_of_slide'].get(slide)
+        master = graph['master_of_layout'].get(layout)
+        show_master = pkg.xml(slide).get('showMasterSp', '1') != '0'
+        if layout:
+            show_master = show_master and pkg.xml(layout).get('showMasterSp', '1') != '0'
+        chains[slide] = [part for part in (
+            (master if show_master else None), layout, slide) if part]
+
+    media_dir = os.path.join(outdir, 'media-out')
+    os.makedirs(media_dir, exist_ok=True)
+    part_map, rows_by_media, images_by_media, rendered_specs = {}, {}, {}, {}
+    image_cache = {}
+    for target, chain in chains.items():
+        layers = [shape for part in chain for shape in by_part.get(part, [])
+                  if _is_full_canvas_picture(shape)]
+        if not layers or (len(layers) == 1 and not _picture_has_appearance(layers[0])):
+            continue
+        source_layers = [{
+            'part': shape['part'], 'media': shape['media'],
+            'crop': shape.get('crop'), 'flipH': bool(shape.get('flipH')),
+            'flipV': bool(shape.get('flipV')), 'rot': shape.get('rot') or 0,
+            'opacity': shape.get('opacity', 1.0),
+        } for shape in layers]
+        spec = json.dumps({
+            'background': _effective_background(chain, bg_by_part),
+            'layers': [{k: v for k, v in layer.items() if k != 'part'}
+                       for layer in source_layers],
+        }, ensure_ascii=False, sort_keys=True)
+        media = rendered_specs.get(spec)
+        if media is None:
+            canvas = Image.new('RGBA', (units.w, units.h))
+            _draw_background(
+                canvas, _effective_background(chain, bg_by_part), pkg, image_cache)
+            drawn = [shape for shape in layers
+                     if _draw_picture(canvas, shape, pkg, image_cache)]
+            if len(drawn) != len(layers):
+                continue
+            digest = hashlib.sha256(canvas.tobytes()).hexdigest()[:16]
+            media = 'generated/background/bg-composite-%s.webp' % digest
+            out = 'media-out/' + os.path.basename(media)
+            path = os.path.join(outdir, out)
+            if not os.path.exists(path):
+                _save_background_webp(canvas, path)
+            rendered_specs[spec] = media
+        else:
+            out = rows_by_media[media]['out']
+            path = os.path.join(outdir, out)
+        part_map[target] = media
+        row = rows_by_media.setdefault(media, {
+            'media': media, 'ext': 'webp', 'bytes': os.path.getsize(path),
+            'used_n': 0, 'reasons': ['background_composite'], 'candidate': True,
+            'exported': True, 'out': out, 'out_bytes': os.path.getsize(path),
+            'transcoded': False, 'generated': True, 'composited_from': source_layers,
+            'part_refs': [],
+        })
+        row['used_n'] += 1
+        row['part_refs'].append(target)
+        image = images_by_media.setdefault(media, {
+            'media': media, 'n': 0, 'boxes': [], 'exact_boxes': [],
+            'fullscreen': True, 'fullscreen_n': 0, 'fullscreen_top_cluster_n': 0,
+            'repeat_fixed': [], 'max_w_pct': 100.0, 'bleed': False,
+            'crop_variants': [], 'stitch_candidate': False,
+            'svg_companion': None, 'variant_group': [],
+        })
+        image['n'] += 1
+        image['fullscreen_n'] += 1
+        image['fullscreen_top_cluster_n'] += 1
+        image['boxes'].append({
+            'box': {'x': 0, 'y': 0, 'w': units.w, 'h': units.h},
+            'box_emu': {'x': 0, 'y': 0, 'cx': units.cx, 'cy': units.cy},
+            'count': 1, 'exact_count': 1, 'exact_variants': 1,
+            'w_pct': 100.0, 'h_pct': 100.0, 'parts': [target],
+            'layers': ['composite'],
+        })
+    return part_map, list(rows_by_media.values()), list(images_by_media.values())
+
+
 # ---------------------------------------------------------------- form hint
 # PowerPoint 出厂版式名（中英两套）。设计师起的名字是「这一页干什么用」，
 # 出厂名只是「这个占位符组合叫什么」——后者不算模板声明了页型。
@@ -635,11 +845,16 @@ def extract(pptx, outdir, export_all=False):
     t = mark('derived_censuses', t)
 
     media_rows = export_media(pkg, images, outdir, pillow_ok, export_all)  # S9
+    background_composites, composite_media, composite_images = compose_backgrounds(
+        pkg, graph, shapes, bg_by_part, units, outdir, pillow_ok)
+    media_rows += composite_media
+    images += composite_images
     t = mark('S9_media_export', t)
 
     # S5b + S14 run after S9 because the palette only covers exported assets.
-    fps = media_fingerprints(pkg, [i['media'] for i in images], pillow_ok)
-    clusters, cluster_evidence = content_clusters(images, fps)
+    source_images = [i for i in images if i['media'] in pkg.names]
+    fps = media_fingerprints(pkg, [i['media'] for i in source_images], pillow_ok)
+    clusters, cluster_evidence = content_clusters(source_images, fps)
     exported = {m['media'] for m in media_rows if m.get('exported')}
     image_palette(images, fps, exported)
     t = mark('S5b_S14_content_palette', t)
@@ -711,6 +926,7 @@ def extract(pptx, outdir, export_all=False):
             'Pillow unavailable: byte-identical media only, no perceptual merging'),
         'palette_available': pillow_ok,
         'media': media_rows,
+        'background_composites': background_composites,
         # S4 shape-facts dominate this file (roughly half its bytes) and stage 2 reads
         # them only when a derived statistic needs backing evidence, so they live in
         # a sidecar and extract.json keeps just the pointer plus the derived censuses.
@@ -721,6 +937,7 @@ def extract(pptx, outdir, export_all=False):
             'slides': len(pkg.slides), 'layouts': len(pkg.layouts),
             'masters': len(pkg.masters), 'themes': len(pkg.themes),
             'media': len(pkg.media),
+            'background_composites': len(composite_media),
             'shapes_total': len(shapes),
             'shapes_kept': len(kept_shapes),
             'shapes_dropped_off_canvas': len(dropped_shapes),
@@ -730,8 +947,10 @@ def extract(pptx, outdir, export_all=False):
                                         if r.get('placement') == 'inherited'),
             'content_clusters': len(clusters),
             'content_clusters_multi_media': sum(1 for c in clusters if c['member_n'] > 1),
-            'media_exported': sum(1 for m in media_rows if m.get('exported')),
-            'media_transcoded': sum(1 for m in media_rows if m.get('transcoded')),
+            'media_exported': sum(1 for m in media_rows
+                                  if m.get('exported') and not m.get('generated')),
+            'media_transcoded': sum(1 for m in media_rows
+                                    if m.get('transcoded') and not m.get('generated')),
             'media_transcode_blocked': sum(1 for m in media_rows
                                            if m.get('transcode_blocked')),
             'media_over_budget': sum(1 for m in media_rows if m.get('over_budget')),
@@ -800,9 +1019,10 @@ def extract(pptx, outdir, export_all=False):
     print('  shapes %d kept / %d dropped off-canvas / %d bleed / %d clamped'
           % (payload['counts']['shapes_kept'], payload['counts']['shapes_dropped_off_canvas'],
              payload['counts']['shapes_bleed'], payload['counts']['shapes_clamped']))
-    print('  colors %d  fonts %d  images %d  media exported %d/%d  guides %d'
+    print('  colors %d  fonts %d  images %d  media exported %d/%d + %d composites  guides %d'
           % (len(color_freq), len(fonts), len(images),
-             payload['counts']['media_exported'], len(pkg.media), len(guides)))
+             payload['counts']['media_exported'], len(pkg.media),
+             len(composite_media), len(guides)))
     print('  ref/source/ 原文 %d 个部件（判断不了时可直接翻）' % src_n)
     print('  extract.json %.1f KB  total %.2fs'
           % (os.path.getsize(out_json) / 1024.0, perf['total']))

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

@@ -98,7 +98,8 @@ L 层判断单 schema（<l-out-dir> 四个文件，这段就是填写说明书
         role: cover
         background: bg-cover
         slots:
-          - {role: title, box: [<x>, <y>, <w>, <h>], type: title}
+          - {role: title, box: [<x>, <y>, <w>, <h>], type: title,
+             css: "<由源模板转译出的 CSS 声明串>"}
         confidence: high
 
   可选 `body:` 块标量 —— 追加到 layouts.md frontmatter 之后作为说明正文。
@@ -274,6 +275,10 @@ def truthy(v):
     return str(v).strip().lower() in ('1', 'true', 'yes', 'on')
 
 
+# 浏览器能解码的图片格式。落进包的资产必须在此列，否则消费端引用到就是一张空白图。
+WEB_SAFE_EXT = {'png', 'jpg', 'jpeg', 'webp', 'gif', 'svg', 'avif'}
+
+
 def asset_ext(name):
     return name.rsplit('.', 1)[-1].lower() if '.' in name else ''
 
@@ -353,12 +358,25 @@ def place_assets(manifest, extract, stage1, pack):
                 entry['path'] = 'assets/%ss/%s.%s' % (kind, base, cext)
                 if truthy(a.get('use_full')):
                     oext = asset_ext(row['out'])
-                    fdst = os.path.join(sub, '%s@full.%s' % (base, oext))
-                    shutil.copy2(orig_path, fdst)
-                    copied.append(fdst)
-                    entry['full'] = 'assets/%ss/%s@full.%s' % (kind, base, oext)
+                    if oext.lower() in WEB_SAFE_EXT:
+                        fdst = os.path.join(sub, '%s@full.%s' % (base, oext))
+                        shutil.copy2(orig_path, fdst)
+                        copied.append(fdst)
+                        entry['full'] = 'assets/%ss/%s@full.%s' % (kind, base, oext)
+                    else:
+                        # 原图是浏览器不解码的格式（tiff/bmp 之类）。落进包并在 design.md
+                        # 里声明成可用资源，消费端引用它就是一张空白图——实测踩过一次，
+                        # 封面与结束页因此空白。压缩版已经带着全部像素，full 不给。
+                        print('  ⚠ %s 的原图是 .%s，浏览器不解码，只给压缩版' % (aid, oext))
             else:
                 oext = asset_ext(row['out'])
+                if oext.lower() not in WEB_SAFE_EXT:
+                    # 转码两条路（Pillow / sips）都没成，原图又是浏览器不解码的格式。
+                    # 照落进去就是把一张永远显示不出来的图当资产下发——实测封面因此空白。
+                    raise Fail('%s: 原图是 .%s，浏览器不解码，而转码没有产物'
+                               '（extract.json 里看 transcode_blocked 的原因）。'
+                               '装上 Pillow 重跑抽取，或把这条资产从 manifest 删掉'
+                               '并在 gaps 写明。' % (aid, oext))
                 dst = os.path.join(sub, '%s.%s' % (base, oext))
                 shutil.copy2(orig_path, dst)
                 copied.append(dst)
@@ -490,7 +508,7 @@ def render_assets_block(consumer):
 
 # ------------------------------------------------- 数值可追溯机检（抄错即 FAIL）
 HEX_RE = re.compile(r'#([0-9A-Fa-f]{6})\b')
-FONTSIZE_RE = re.compile(r'\bfontSize:\s*([\d.]+)px')
+FONTSIZE_RE = re.compile(r'\b(?:fontSize|font-size):\s*([\d.]+)px')
 BOX_RE = re.compile(r'\bbox:\s*\[\s*(-?[\d.]+)\s*,\s*(-?[\d.]+)\s*,'
                     r'\s*(-?[\d.]+)\s*,\s*(-?[\d.]+)\s*\]')
 KEYLINE_RE = re.compile(r'^(\s*)-?\s*([A-Za-z_][\w-]*):\s*(.*)$')
@@ -885,6 +903,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 相交时把安全区收掉重叠的那部分。
 
@@ -943,8 +1019,8 @@ def build_layouts_md(layouts_blocks, canvas):
         raise Fail('layouts.yaml 不要写 canvas —— 脚本从 extract.json 取')
     if 'layouts' not in blocks:
         raise Fail('layouts.yaml 缺顶层键 `layouts:`')
-    # `names:` / `bg_rules:` 是给 L 层集中填判断的两块扁平区——在这里并回各
-    # archetype，本身不进产物。让 L 层只改扁平键值，别去动 layouts 里的
+    # `names:` / `roles:` / `text_roles:` / `layout_modes:` / `bg_rules:` 是给 L 层集中填判断的
+    # 扁平区——在这里并回各 archetype，本身不进产物。让 L 层只改扁平键值，别去动 layouts 里的
     # slots/confidence 结构（嵌套结构手改极易破坏缩进，进而静默改变语义）。
     names, roles = {}, {}
     for key, sink in (('names', names), ('roles', roles)):
@@ -952,6 +1028,17 @@ def build_layouts_md(layouts_blocks, canvas):
             m = re.match(r'^\s{2}([\w-]+):\s*(.+?)\s*$', line)
             if m:
                 sink[m.group(1)] = unquote(m.group(2))
+    text_roles = {}
+    allowed_text_roles = {'title', 'subtitle', 'header', 'footer', 'body'}
+    for line in blocks.get('text_roles', ('', []))[1]:
+        m = re.match(r'^\s{2}([\w-]+):\s*([A-Za-z-]+)(?:\s+#.*)?$', line)
+        if not m:
+            continue
+        role_id, role = m.groups()
+        if role not in allowed_text_roles:
+            raise Fail('text_roles.%s 取值 %s 非法；应为 %s'
+                       % (role_id, role, '|'.join(sorted(allowed_text_roles))))
+        text_roles[role_id] = role
     bg_rules, cur = {}, None
     for line in blocks.get('bg_rules', ('', []))[1]:
         # 键后面允许行内注释（草案会标「用它的页型：…」）
@@ -973,44 +1060,96 @@ 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:')
-    for line in blocks['layouts'][1]:
+    pending_text_role = None
+    used_text_roles = set()
+    source_layout_lines = blocks['layouts'][1]
+    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:
+                pending_text_role = marker.group(1)
             continue
+        if pending_text_role:
+            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', '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:
         raise Fail('roles 里这些页型在 layouts 下找不到：%s' % ', '.join(sorted(roles)))
+    unused_text_roles = set(text_roles) - used_text_roles
+    if unused_text_roles:
+        raise Fail('text_roles 里这些判断没有命中文本槽：%s'
+                   % ', '.join(sorted(unused_text_roles)))
     missing_role = [k for k in re.findall(r'^  ([\w-]+):\s*$', '\n'.join(blocks['layouts'][1]), re.M)
                     if not re.search(r'^  %s:\s*$(?:\n(?!  \S).*)*?\n    role:' % re.escape(k),
                                      '\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

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

@@ -393,6 +393,9 @@ def walk_tree(el, ctx, out, path=(), xf=(1.0, 1.0, 0.0, 0.0), depth=0):
             blip = sp.find('p:blipFill/a:blip', NS)
             if blip is not None:
                 rec['media'] = ctx.media_of(blip.get(R_EMBED)) or ctx.media_of(blip.get(R_LINK))
+                alpha = blip.find('a:alphaModFix', NS)
+                if alpha is not None and alpha.get('amt') is not None:
+                    rec['opacity'] = round(int(alpha.get('amt')) / 100000.0, 6)
                 svg = blip.find('a:extLst//asvg:svgBlip', NS)
                 if svg is not None:
                     rec['media_svg'] = ctx.media_of(svg.get(R_EMBED))

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

@@ -244,14 +244,10 @@ def _recipe_css(fill, line, radii, effects):
             dash = (line or {}).get('dash')
             style = 'dashed' if dash and 'dash' in dash else 'solid'
             out.append('border: %dpx %s %s' % (w, style, lc))
-    if radii:
+    if radii and all(r >= 1 for r in radii):
         lo, hi = min(radii), max(radii)
         if abs(hi - lo) <= 0.5:
             out.append('border-radius: %gpx' % round(lo, 1))
-        else:
-            out.append('border-radius: %gpx\x00/* 源内 %g~%gpx 共 %d 档，归一档位由 L11 定 */'
-                       % (round(sum(radii) / len(radii), 1), round(lo, 1), round(hi, 1),
-                          len(set(round(r, 1) for r in radii))))
     for e in effects or []:
         if e.get('type') == 'outerShdw':
             col = _css_color(e.get('color')) or 'rgba(0,0,0,0.25)'
@@ -267,7 +263,7 @@ def _recipe_css(fill, line, radii, effects):
 def _sig(fill, line, effects):
     """分组键 = 填充 + 描边 + 效果。**不含圆角**——OOXML 圆角是 min(w,h) 的百分比，
     同一配方在不同尺寸的卡上绝对 px 必然不同，把它计入键会把一个配方拆成多组；
-    归一到哪一档是判断，脚本只报区间。"""
+    只有组内每个形状都明确共享同一绝对半径时才输出组级圆角，否则留给逐形状 CSS。"""
     f = 'none'
     if isinstance(fill, dict):
         if fill.get('type') == 'solid':
@@ -305,8 +301,7 @@ def cmd_recipes(a, outdir):
         g = groups.setdefault(k, {'n': 0, 'parts': Counter(), 'sizes': [], 'radii': [],
                                   'fill': fill, 'line': line, 'fx': fx})
         g['n'] += 1
-        if radius:
-            g['radii'].append(radius)
+        g['radii'].append(radius or 0)
         g['parts'][short(s['part'])] += 1
         b = s.get('box') or {}
         if b.get('w'):