diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/elements/element.py | 8 | ||||
| -rw-r--r-- | lib/svg/tags.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/elements/element.py b/lib/elements/element.py index f5f774f0..70d49278 100644 --- a/lib/elements/element.py +++ b/lib/elements/element.py @@ -9,8 +9,9 @@ from cspsubdiv import cspsubdiv from ..commands import find_commands from ..i18n import _ from ..svg import PIXELS_PER_MM, apply_transforms, convert_length, get_doc_size -from ..svg.tags import (INKSCAPE_LABEL, INKSTITCH_ATTRIBS, SVG_CIRCLE_TAG, - SVG_ELLIPSE_TAG, SVG_OBJECT_TAGS, SVG_RECT_TAG) +from ..svg.tags import (EMBROIDERABLE_TAGS, INKSCAPE_LABEL, INKSTITCH_ATTRIBS, + SVG_CIRCLE_TAG, SVG_ELLIPSE_TAG, SVG_GROUP_TAG, + SVG_OBJECT_TAGS, SVG_RECT_TAG) from ..utils import cache from .svg_objects import circle_to_path, ellipse_to_path, rect_to_path @@ -160,6 +161,9 @@ class EmbroideryElement(object): @cache def _get_style_raw(self, style_name): + if self.node.tag != SVG_GROUP_TAG and self.node.tag not in EMBROIDERABLE_TAGS: + return None + style = self.parse_style() style = style.get(style_name) or self.node.get(style_name) parent = self.node.getparent() diff --git a/lib/svg/tags.py b/lib/svg/tags.py index 3dcf3010..66014c30 100644 --- a/lib/svg/tags.py +++ b/lib/svg/tags.py @@ -18,8 +18,6 @@ SVG_SYMBOL_TAG = inkex.addNS('symbol', 'svg') SVG_USE_TAG = inkex.addNS('use', 'svg') SVG_IMAGE_TAG = inkex.addNS('image', 'svg') -EMBROIDERABLE_TAGS = (SVG_PATH_TAG, SVG_POLYLINE_TAG) - INKSCAPE_LABEL = inkex.addNS('label', 'inkscape') INKSCAPE_GROUPMODE = inkex.addNS('groupmode', 'inkscape') CONNECTION_START = inkex.addNS('connection-start', 'inkscape') |