From 4544be8d30b113946be075b279023098a5759fbf Mon Sep 17 00:00:00 2001
From: leyghisbb <info@leyghis.de>
Date: Tue, 4 May 2021 17:23:41 +0200
Subject: [PATCH] added opacity attribute to cleanup styles

---
 extensions/fablabchemnitz/cleanup_styles.inx |  5 +++--
 extensions/fablabchemnitz/cleanup_styles.py  | 17 +++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/extensions/fablabchemnitz/cleanup_styles.inx b/extensions/fablabchemnitz/cleanup_styles.inx
index 9e2b5136..40daa535 100644
--- a/extensions/fablabchemnitz/cleanup_styles.inx
+++ b/extensions/fablabchemnitz/cleanup_styles.inx
@@ -20,8 +20,9 @@
 			</param>
 			<param name="stroke_opacity_override" type="bool" gui-text="Override stroke opacity">false</param>
 			<param name="stroke_opacity" type="float" precision="1" min="0.0" max="100.0" gui-text="Stroke opacity (%)">100.0</param>
-			<param name="reset_stroke_attributes" type="bool" gui-text="Reset stroke style attributes" gui-description="Remove stroke style attributes 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linejoin', 'stroke-linecap', 'stroke-miterlimit'">true</param>
-			<param name="reset_fill_attributes" type="bool" gui-text="Reset fill style attributes" gui-description="Sets 'fill:none;fill-opacity:1;' to style attribute">true</param>
+            <param name="reset_opacity" type="bool" gui-text="Reset opacity value in style attributes" gui-description="Reset stroke style attribute 'opacity'. Do not mix up with 'fill-opacity' and 'stroke-opacity'">true</param>
+			<param name="reset_stroke_attributes" type="bool" gui-text="Reset stroke* values in style attributes" gui-description="Remove stroke style attributes 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linejoin', 'stroke-linecap', 'stroke-miterlimit'">true</param>
+			<param name="reset_fill_attributes" type="bool" gui-text="Reset fill* value style attributes" gui-description="Sets 'fill:none;fill-opacity:1;' to style attribute">true</param>
 			<param name="apply_hairlines" type="bool" gui-text="Add additional hairline style" gui-description="Adds 'vector-effect:non-scaling-stroke;' and '-inkscape-stroke:hairline;' Hint: stroke-width is kept in background. All hairlines still have a valued width.">true</param>
 			<param name="apply_black_strokes" type="bool" gui-text="Apply black strokes where strokes missing" gui-description="Adds 'stroke:#000000;' to style attribute">true</param>
 			<param name="remove_group_styles" type="bool" gui-text="Remove styles from groups" gui-description="Remove style attributes from parent groups. So we have styles directly at the level of visivle nodes!">false</param>
diff --git a/extensions/fablabchemnitz/cleanup_styles.py b/extensions/fablabchemnitz/cleanup_styles.py
index 7ed51b9c..29b81484 100644
--- a/extensions/fablabchemnitz/cleanup_styles.py
+++ b/extensions/fablabchemnitz/cleanup_styles.py
@@ -45,11 +45,12 @@ class Cleanup(inkex.EffectExtension):
         pars.add_argument("--stroke_width_units", default="mm", help="Stroke width unit")
         pars.add_argument("--stroke_opacity_override", type=inkex.Boolean, default=False, help="Override stroke opacity")
         pars.add_argument("--stroke_opacity", type=float, default="100.0", help="Stroke opacity (%)")
-        pars.add_argument("--reset_stroke_attributes", type=inkex.Boolean, help="Remove stroke style attributes 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linejoin', 'stroke-linecap', 'stroke-miterlimit'")
-        pars.add_argument("--reset_fill_attributes", type=inkex.Boolean, help="Sets 'fill:none;fill-opacity:1;' to style attribute")
-        pars.add_argument("--apply_hairlines", type=inkex.Boolean, help="Adds 'vector-effect:non-scaling-stroke;' and '-inkscape-stroke:hairline;' Hint: stroke-width is kept in background. All hairlines still have a valued width.")
-        pars.add_argument("--apply_black_strokes", type=inkex.Boolean, help="Adds 'stroke:#000000;' to style attribute")
-        pars.add_argument("--remove_group_styles", type=inkex.Boolean, help="Remove styles from groups")
+        pars.add_argument("--reset_opacity", type=inkex.Boolean, default=True, help="Reset stroke style attribute 'opacity'. Do not mix up with 'fill-opacity' and 'stroke-opacity'")
+        pars.add_argument("--reset_stroke_attributes", type=inkex.Boolean, default=True, help="Remove stroke style attributes 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linejoin', 'stroke-linecap', 'stroke-miterlimit'")
+        pars.add_argument("--reset_fill_attributes", type=inkex.Boolean, default=True, help="Sets 'fill:none;fill-opacity:1;' to style attribute")
+        pars.add_argument("--apply_hairlines", type=inkex.Boolean, default=True, help="Adds 'vector-effect:non-scaling-stroke;' and '-inkscape-stroke:hairline;' Hint: stroke-width is kept in background. All hairlines still have a valued width.")
+        pars.add_argument("--apply_black_strokes", type=inkex.Boolean, default=True, help="Adds 'stroke:#000000;' to style attribute")
+        pars.add_argument("--remove_group_styles", type=inkex.Boolean, default=False, help="Remove styles from groups")
         
     def effect(self):
         if len(self.svg.selected) == 0:
@@ -87,7 +88,8 @@ class Cleanup(inkex.EffectExtension):
             # - merge dedicated properties, but prefer properties from composed style
             dedicatedStyleAttributesDict = {}
             popDict = []
-            popDict.extend(['stroke', 'stroke-opacity', 'stroke-width', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'fill', 'fill-opacity'])
+            # there are opacity (of group/parent), fill-opacity and stroke-opacity
+            popDict.extend(['opacity', 'stroke', 'stroke-opacity', 'stroke-width', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'fill', 'fill-opacity'])
             for popItem in popDict:
                 if node.attrib.has_key(str(popItem)):
                     dedicatedStyleAttributesDict.update({'{}'.format(popItem): node.get(popItem)})
@@ -142,6 +144,9 @@ class Cleanup(inkex.EffectExtension):
                     if prop == 'stroke-opacity' and self.options.stroke_opacity_override is True:
                         new_val = self.options.stroke_opacity / 100
                         declarations[i] = prop + ':{:1.1f}'.format(new_val)
+                    if self.options.reset_opacity is True:
+                        if prop == 'opacity':
+                            declarations[i] = ''             
                     if self.options.reset_stroke_attributes is True:
                         if prop == 'stroke-dasharray':
                             declarations[i] = ''