Reduce degree of panic caused by stop-opacity

googlefonts · Jun 16, 2020 · 32c52ba · 32c52ba
1 parent 403009b
commit 32c52ba
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/nanoemoji/color_glyph.py b/src/nanoemoji/color_glyph.py
@@ -197,10 +197,10 @@ def _parse_radial_gradient(grad_el, shape_bbox, view_box, upem):
 
 def _color_stop(stop_el) -> ColorStop:
     offset = _number_or_percentage(stop_el.attrib.get("offset", "0"))
-    color = stop_el.attrib.get("stop-color", "black")
-    if "stop-opacity" in stop_el.attrib:
-        raise ValueError("<stop stop-opacity/> not supported")
-    return ColorStop(stopOffset=offset, color=Color.fromstring(color))
+    color = Color.fromstring(stop_el.attrib.get("stop-color", "black"))
+    opacity = _number_or_percentage(stop_el.attrib.get("stop-opacity", "1"))
+    color = color._replace(alpha=color.alpha * opacity)
+    return ColorStop(stopOffset=offset, color=color)
 
 
 def _common_gradient_parts(el):

diff --git a/tests/color_glyph_test.py b/tests/color_glyph_test.py
@@ -118,7 +118,7 @@ def _round_gradient_coordinates(paint, prec=6):
                 PaintLinearGradient(
                     stops=(
                         ColorStop(stopOffset=0.1, color=Color.fromstring("blue")),
-                        ColorStop(stopOffset=0.9, color=Color.fromstring("cyan")),
+                        ColorStop(stopOffset=0.9, color=Color.fromstring("cyan", 0.8)),
                     ),
                     p0=Point(200, 800),
                     p1=Point(800, 800),

diff --git a/tests/linear_gradient_rect.svg b/tests/linear_gradient_rect.svg
diff --git a/tests/linear_gradient_rect_colr_1.ttx b/tests/linear_gradient_rect_colr_1.ttx
@@ -88,7 +88,7 @@
                   <StopOffset value="0.9"/>
                   <Color>
                     <PaletteIndex value="1"/>
-                    <Transparency value="0.0"/>
+                    <Transparency value="0.2"/>
                   </Color>
                 </ColorStop>
               </ColorLine>