@ww_nero/skills 3.0.1 → 3.0.2

package/assets/svg_to_pptx.py

@@ -30,6 +30,46 @@ def hex_to_rgb(hex_color):
         hex_color = ''.join([c*2 for c in hex_color])
     return RGBColor(int(hex_color[0:2], 16), int(hex_color[2:4], 16), int(hex_color[4:6], 16))
 
+def _overwrite_alpha(srgbClr, alpha_float):
+    """覆盖 srgbClr 下的透明度节点"""
+    if srgbClr is None:
+        return
+    for a in list(srgbClr.findall(qn("a:alpha"))):
+        srgbClr.remove(a)
+    alpha = OxmlElement('a:alpha')
+    alpha.set('val', str(int(alpha_float * 100000)))
+    srgbClr.append(alpha)
+
+def _clear_fill_elements(parent):
+    """移除已有填充定义，避免冲突"""
+    for tag in ('a:solidFill', 'a:gradFill', 'a:noFill'):
+        existing = parent.find(qn(tag))
+        if existing is not None:
+            parent.remove(existing)
+
+def _make_grad_stop(pos, hex_color, alpha=None):
+    gs = OxmlElement('a:gs')
+    gs.set('pos', str(pos))
+    srgbClr = OxmlElement('a:srgbClr')
+    srgbClr.set('val', hex_color.lstrip('#'))
+    if alpha is not None and alpha < 1.0:
+        _overwrite_alpha(srgbClr, alpha)
+    gs.append(srgbClr)
+    return gs
+
+def _build_linear_gradient(color1, alpha1, color2, alpha2, angle_deg=0, scaled='1', rot_with_shape='1'):
+    gradFill = OxmlElement('a:gradFill')
+    gradFill.set('rotWithShape', rot_with_shape)
+    gsLst = OxmlElement('a:gsLst')
+    gsLst.append(_make_grad_stop(0, color1, alpha1))
+    gsLst.append(_make_grad_stop(100000, color2, alpha2))
+    lin = OxmlElement('a:lin')
+    lin.set('ang', str(int(angle_deg * 60000)))
+    lin.set('scaled', scaled)
+    gradFill.append(gsLst)
+    gradFill.append(lin)
+    return gradFill
+
 def _catmull_rom_spline(points, segments_per_curve=20):
     """Catmull-Rom 样条插值，生成平滑曲线点"""
     if len(points) < 2:
@@ -64,26 +104,7 @@ def set_slide_background_gradient(slide, color1, color2):
     else:
         bg.clear()
     bgPr = OxmlElement('p:bgPr')
-    gradFill = OxmlElement('a:gradFill')
-    gradFill.set('rotWithShape', '1')
-    gsLst = OxmlElement('a:gsLst')
-
-    def add_stop(pos, hex_c):
-        gs = OxmlElement('a:gs')
-        gs.set('pos', str(pos))
-        srgbClr = OxmlElement('a:srgbClr')
-        srgbClr.set('val', hex_c.lstrip('#'))
-        gs.append(srgbClr)
-        gsLst.append(gs)
-
-    add_stop(0, color1)
-    add_stop(100000, color2)
-
-    lin = OxmlElement('a:lin')
-    lin.set('ang', '2700000')
-    lin.set('scaled', '0')
-    gradFill.append(gsLst)
-    gradFill.append(lin)
+    gradFill = _build_linear_gradient(color1, None, color2, None, angle_deg=45, scaled='0')
     bgPr.append(gradFill)
     effectLst = OxmlElement('a:effectLst')
     bgPr.append(effectLst)
@@ -97,12 +118,7 @@ def set_transparency(shape, alpha_float, is_line=True):
         if hasattr(fore_color, '_xFill'):
             elm = fore_color._xFill
             if hasattr(elm, "srgbClr"):
-                clr = elm.srgbClr
-                for a in clr.findall(qn("a:alpha")):
-                    clr.remove(a)
-                alpha = OxmlElement('a:alpha')
-                alpha.set('val', str(int(alpha_float * 100000)))
-                clr.append(alpha)
+                _overwrite_alpha(elm.srgbClr, alpha_float)
 
 def set_shape_transparency(shape, alpha_float):
     """设置形状填充透明度"""
@@ -110,53 +126,13 @@ def set_shape_transparency(shape, alpha_float):
     solidFill = spPr.find(qn('a:solidFill'))
     if solidFill is not None:
         srgbClr = solidFill.find(qn('a:srgbClr'))
-        if srgbClr is not None:
-            for a in srgbClr.findall(qn("a:alpha")):
-                srgbClr.remove(a)
-            alpha = OxmlElement('a:alpha')
-            alpha.set('val', str(int(alpha_float * 100000)))
-            srgbClr.append(alpha)
+        _overwrite_alpha(srgbClr, alpha_float)
 
 def set_shape_gradient_fill(shape, color1, alpha1, color2, alpha2, angle=0):
     """设置形状渐变填充"""
     spPr = shape._sp.spPr
-    for tag in ['a:solidFill', 'a:gradFill', 'a:noFill']:
-        existing = spPr.find(qn(tag))
-        if existing is not None:
-            spPr.remove(existing)
-
-    gradFill = OxmlElement('a:gradFill')
-    gradFill.set('rotWithShape', '1')
-    gsLst = OxmlElement('a:gsLst')
-
-    gs1 = OxmlElement('a:gs')
-    gs1.set('pos', '0')
-    srgbClr1 = OxmlElement('a:srgbClr')
-    srgbClr1.set('val', color1.lstrip('#'))
-    if alpha1 < 1.0:
-        alpha_elem1 = OxmlElement('a:alpha')
-        alpha_elem1.set('val', str(int(alpha1 * 100000)))
-        srgbClr1.append(alpha_elem1)
-    gs1.append(srgbClr1)
-    gsLst.append(gs1)
-
-    gs2 = OxmlElement('a:gs')
-    gs2.set('pos', '100000')
-    srgbClr2 = OxmlElement('a:srgbClr')
-    srgbClr2.set('val', color2.lstrip('#'))
-    if alpha2 < 1.0:
-        alpha_elem2 = OxmlElement('a:alpha')
-        alpha_elem2.set('val', str(int(alpha2 * 100000)))
-        srgbClr2.append(alpha_elem2)
-    gs2.append(srgbClr2)
-    gsLst.append(gs2)
-
-    lin = OxmlElement('a:lin')
-    lin.set('ang', str(int(angle * 60000)))
-    lin.set('scaled', '1')
-
-    gradFill.append(gsLst)
-    gradFill.append(lin)
+    _clear_fill_elements(spPr)
+    gradFill = _build_linear_gradient(color1, alpha1, color2, alpha2, angle)
     spPr.append(gradFill)
 
 def set_line_transparency(connector, alpha_float):
@@ -170,12 +146,7 @@ def set_line_transparency(connector, alpha_float):
     solidFill = ln.find(qn('a:solidFill'))
     if solidFill is not None:
         srgbClr = solidFill.find(qn('a:srgbClr'))
-        if srgbClr is not None:
-            for a in srgbClr.findall(qn("a:alpha")):
-                srgbClr.remove(a)
-            alpha = OxmlElement('a:alpha')
-            alpha.set('val', str(int(alpha_float * 100000)))
-            srgbClr.append(alpha)
+        _overwrite_alpha(srgbClr, alpha_float)
 
 def set_line_stroke_transparency(shape, alpha_float):
     """设置形状边框透明度"""
@@ -187,55 +158,19 @@ def set_line_stroke_transparency(shape, alpha_float):
     solidFill = ln.find(qn('a:solidFill'))
     if solidFill is not None:
         srgbClr = solidFill.find(qn('a:srgbClr'))
-        if srgbClr is not None:
-            for a in srgbClr.findall(qn("a:alpha")):
-                srgbClr.remove(a)
-            alpha = OxmlElement('a:alpha')
-            alpha.set('val', str(int(alpha_float * 100000)))
-            srgbClr.append(alpha)
+        _overwrite_alpha(srgbClr, alpha_float)
 
 def apply_gradient_to_text(run, color1, color2):
     """应用渐变到文本"""
     rPr = run._r.get_or_add_rPr()
-    for tag in ['a:solidFill', 'a:gradFill', 'a:noFill']:
-        existing = rPr.find(qn(tag))
-        if existing is not None:
-            rPr.remove(existing)
-
-    gradFill = OxmlElement('a:gradFill')
-    gradFill.set('rotWithShape', '1')
-
-    gsLst = OxmlElement('a:gsLst')
-
-    gs1 = OxmlElement('a:gs')
-    gs1.set('pos', '0')
-    srgb1 = OxmlElement('a:srgbClr')
-    srgb1.set('val', color1.lstrip('#'))
-    gs1.append(srgb1)
-    gsLst.append(gs1)
-
-    gs2 = OxmlElement('a:gs')
-    gs2.set('pos', '100000')
-    srgb2 = OxmlElement('a:srgbClr')
-    srgb2.set('val', color2.lstrip('#'))
-    gs2.append(srgb2)
-    gsLst.append(gs2)
-
-    lin = OxmlElement('a:lin')
-    lin.set('ang', '0')
-    lin.set('scaled', '1')
-
-    gradFill.append(gsLst)
-    gradFill.append(lin)
+    _clear_fill_elements(rPr)
+    gradFill = _build_linear_gradient(color1, 1.0, color2, 1.0, 0)
     rPr.insert(0, gradFill)
 
 def set_text_color_xml(run, hex_color):
     """通过XML直接设置文字颜色，确保不被覆盖"""
     rPr = run._r.get_or_add_rPr()
-    for tag in ['a:solidFill', 'a:gradFill', 'a:noFill']:
-        existing = rPr.find(qn(tag))
-        if existing is not None:
-            rPr.remove(existing)
+    _clear_fill_elements(rPr)
     solidFill = OxmlElement('a:solidFill')
     srgbClr = OxmlElement('a:srgbClr')
     srgbClr.set('val', hex_color.lstrip('#'))
@@ -289,7 +224,7 @@ def add_text_box(slide, text, x, y, width, height, font_size, color, bold=False,
 
     return tb
 
-def add_rectangle(slide, x, y, width, height, fill_color, opacity=1.0, rx=0, stroke_color=None, stroke_width=0, stroke_opacity=None):
+def add_rectangle(slide, x, y, width, height, fill_color, opacity=1.0, rx=0, stroke_color=None, stroke_width=0, stroke_opacity=None, has_shadow=False):
     """添加矩形"""
     shape = slide.shapes.add_shape(MSO_SHAPE.ROUNDED_RECTANGLE if rx > 0 else MSO_SHAPE.RECTANGLE,
                                    px(x), px(y), px(width), px(height))
@@ -304,15 +239,17 @@ def add_rectangle(slide, x, y, width, height, fill_color, opacity=1.0, rx=0, str
     if stroke_color and stroke_width > 0:
         shape.line.color.rgb = hex_to_rgb(stroke_color)
         shape.line.width = int(stroke_width * 9525)
-        # 设置边框透明度
         if stroke_opacity is not None and stroke_opacity < 1.0:
             set_line_stroke_transparency(shape, stroke_opacity)
     else:
         shape.line.fill.background()
 
+    if not has_shadow:
+        remove_shadow(shape)
+
     return shape
 
-def add_gradient_rectangle(slide, x, y, width, height, color1, alpha1, color2, alpha2, angle=0, rx=0):
+def add_gradient_rectangle(slide, x, y, width, height, color1, alpha1, color2, alpha2, angle=0, rx=0, has_shadow=False):
     """添加渐变矩形"""
     shape = slide.shapes.add_shape(MSO_SHAPE.ROUNDED_RECTANGLE if rx > 0 else MSO_SHAPE.RECTANGLE,
                                    px(x), px(y), px(width), px(height))
@@ -321,18 +258,27 @@ def add_gradient_rectangle(slide, x, y, width, height, color1, alpha1, color2, a
 
     set_shape_gradient_fill(shape, color1, alpha1, color2, alpha2, angle)
     shape.line.fill.background()
+
+    if not has_shadow:
+        remove_shadow(shape)
+
     return shape
 
-def remove_autoshape_shadow(shape):
-    """移除自动形状阴影效果"""
-    spPr = shape._sp.spPr
+def remove_shadow(shape):
+    """移除形状阴影效果"""
+    if hasattr(shape, '_sp'):
+        spPr = shape._sp.spPr
+    else:
+        spPr = shape._element.find(qn('p:spPr'))
+        if spPr is None:
+            return
     effectLst = spPr.find(qn('a:effectLst'))
     if effectLst is not None:
         spPr.remove(effectLst)
     effectLst = OxmlElement('a:effectLst')
     spPr.append(effectLst)
 
-def add_circle(slide, cx, cy, r, fill_color=None, stroke_color=None, stroke_width=1, opacity=1.0, stroke_opacity=None):
+def add_circle(slide, cx, cy, r, fill_color=None, stroke_color=None, stroke_width=1, opacity=1.0, stroke_opacity=None, has_shadow=False):
     """添加圆形"""
     shape = slide.shapes.add_shape(MSO_SHAPE.OVAL, px(cx-r), px(cy-r), px(r*2), px(r*2))
 
@@ -352,13 +298,12 @@ def add_circle(slide, cx, cy, r, fill_color=None, stroke_color=None, stroke_widt
     else:
         shape.line.fill.background()
 
-    # 如果只有stroke没有fill，移除阴影
-    if not fill_color and stroke_color:
-        remove_autoshape_shadow(shape)
+    if not has_shadow:
+        remove_shadow(shape)
 
     return shape
 
-def add_ellipse(slide, cx, cy, rx, ry, fill_color=None, stroke_color=None, stroke_width=1, opacity=1.0, rotation=0, stroke_opacity=None):
+def add_ellipse(slide, cx, cy, rx, ry, fill_color=None, stroke_color=None, stroke_width=1, opacity=1.0, rotation=0, stroke_opacity=None, has_shadow=False):
     """添加椭圆"""
     shape = slide.shapes.add_shape(MSO_SHAPE.OVAL, px(cx-rx), px(cy-ry), px(rx*2), px(ry*2))
 
@@ -373,7 +318,6 @@ def add_ellipse(slide, cx, cy, rx, ry, fill_color=None, stroke_color=None, strok
     if stroke_color:
         shape.line.color.rgb = hex_to_rgb(stroke_color)
         shape.line.width = int(stroke_width * 9525)
-        # 设置边框透明度
         if stroke_opacity is not None and stroke_opacity < 1.0:
             set_line_stroke_transparency(shape, stroke_opacity)
     else:
@@ -382,18 +326,10 @@ def add_ellipse(slide, cx, cy, rx, ry, fill_color=None, stroke_color=None, strok
     if rotation != 0:
         shape.rotation = rotation
 
-    return shape
+    if not has_shadow:
+        remove_shadow(shape)
 
-def remove_shape_shadow(shape):
-    """移除形状阴影效果"""
-    spPr = shape._element.find(qn('p:spPr'))
-    if spPr is None:
-        return
-    effectLst = spPr.find(qn('a:effectLst'))
-    if effectLst is not None:
-        spPr.remove(effectLst)
-    effectLst = OxmlElement('a:effectLst')
-    spPr.append(effectLst)
+    return shape
 
 def add_line(slide, x1, y1, x2, y2, color, width=1, opacity=1.0, dash=False):
     """添加线条"""
@@ -404,10 +340,10 @@ def add_line(slide, x1, y1, x2, y2, color, width=1, opacity=1.0, dash=False):
         connector.line.dash_style = 2
     if opacity < 1.0:
         set_line_transparency(connector, opacity)
-    remove_shape_shadow(connector)
+    remove_shadow(connector)
     return connector
 
-def add_triangle(slide, cx, cy, size, fill_color, opacity=1.0, rotation=0, stroke_color=None, stroke_width=0, stroke_opacity=None):
+def add_triangle(slide, cx, cy, size, fill_color, opacity=1.0, rotation=0, stroke_color=None, stroke_width=0, stroke_opacity=None, has_shadow=False):
     """添加三角形"""
     shape = slide.shapes.add_shape(MSO_SHAPE.ISOSCELES_TRIANGLE,
                                    px(cx - size/2), px(cy - size/2), px(size), px(size))
@@ -420,11 +356,14 @@ def add_triangle(slide, cx, cy, size, fill_color, opacity=1.0, rotation=0, strok
     if stroke_color and stroke_width > 0:
         shape.line.color.rgb = hex_to_rgb(stroke_color)
         shape.line.width = int(stroke_width * 9525)
-        # 设置边框透明度
         if stroke_opacity is not None and stroke_opacity < 1.0:
             set_line_stroke_transparency(shape, stroke_opacity)
     else:
         shape.line.fill.background()
+
+    if not has_shadow:
+        remove_shadow(shape)
+
     return shape
 
 def add_spline(slide, points, color, width=2, opacity=1.0, smooth=True):
@@ -448,16 +387,7 @@ def add_spline(slide, points, color, width=2, opacity=1.0, smooth=True):
         set_line_transparency(shape, opacity)
     return shape
 
-def remove_freeform_shadow(shape):
-    """移除自由形状阴影效果"""
-    spPr = shape._sp.spPr
-    effectLst = spPr.find(qn('a:effectLst'))
-    if effectLst is not None:
-        spPr.remove(effectLst)
-    effectLst = OxmlElement('a:effectLst')
-    spPr.append(effectLst)
-
-def add_freeform_path(slide, points, fill_color=None, stroke_color=None, stroke_width=1, opacity=1.0, closed=False, stroke_opacity=None):
+def add_freeform_path(slide, points, fill_color=None, stroke_color=None, stroke_width=1, opacity=1.0, closed=False, stroke_opacity=None, has_shadow=False):
     """添加自由形状路径"""
     if len(points) < 2:
         return None
@@ -485,9 +415,8 @@ def add_freeform_path(slide, points, fill_color=None, stroke_color=None, stroke_
     else:
         shape.line.fill.background()
 
-    # 对于非封闭路径（线条类型），移除阴影
-    if not closed:
-        remove_freeform_shadow(shape)
+    if not has_shadow:
+        remove_shadow(shape)
 
     return shape
 
@@ -763,4 +692,4 @@ def main():
     print(f"成功生成: {output_path}")
 
 if __name__ == "__main__":
-    main()
+    main()

package/index.js

@@ -122,7 +122,7 @@ const SNIPPETS = {
       '【渐变透明度】每个渐变停止点的透明度需在对应 srgbClr 下追加 a:alpha 元素，val 值为透明度*100000（如 0.5 透明度对应 50000）。',
       '【曲线绘制】使用 build_freeform 绘制曲线时，起点坐标在构造器中指定，后续点通过 add_line_segments 添加。若需平滑曲线，可用 Catmull-Rom 样条插值生成中间点。',
       '【线宽单位换算】线条宽度不能使用 Pt，应使用 EMU 单位：width * 9525（1px 约等于 9525 EMU）。',
-      '【移除阴影效果】对于线条、非封闭的 freeform path、以及只有 stroke 没有 fill 的 circle，需要移除默认阴影效果，方法是在 spPr 下添加空的 a:effectLst 元素。',
+      '【移除阴影效果】如果 SVG 代码中没有显式设置阴影（如 box-shadow 或 filter: drop-shadow），插入元素后需要移除默认阴影，方法是在 spPr 下添加空的 a:effectLst 元素。',
       '【Emoji 处理】Emoji 可以像普通文本一样直接插入到 PPT 中，使用 add_text_box 函数即可，无需特殊处理。'
     ]
   }
@@ -284,7 +284,7 @@ const listTools = () => ({
   ]
 });
 
-const server = new Server({ name: 'skills', version: '3.0.1' }, { capabilities: { tools: {} } });
+const server = new Server({ name: 'skills', version: '3.0.2' }, { capabilities: { tools: {} } });
 
 server.setRequestHandler(ListToolsRequestSchema, async () => listTools());
 

package/package.json

@@ -1,16 +1,16 @@
-{
-  "name": "@ww_nero/skills",
-  "version": "3.0.1",
-  "description": "MCP server that returns Python reference snippets and skill guides",
-  "main": "index.js",
-  "bin": {
-    "skills": "index.js"
-  },
-  "files": [
-    "index.js",
-    "assets"
-  ],
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.22.0"
-  }
-}
+{
+  "name": "@ww_nero/skills",
+  "version": "3.0.2",
+  "description": "MCP server that returns Python reference snippets and skill guides",
+  "main": "index.js",
+  "bin": {
+    "skills": "index.js"
+  },
+  "files": [
+    "index.js",
+    "assets"
+  ],
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.22.0"
+  }
+}