marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

linecaps and markers can also be specified in style attributes, so check them, too

Browse source
This commit is contained in:
Eduard Braun 2017-05-17 19:52:57 +02:00
parent d8b6a027b8
commit fe5cd14585
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scour/scour.py
View file

@ -2053,14 +2053,23 @@ def cleanPath(element, options):
# this gets the parser object from svg_regex.py # this gets the parser object from svg_regex.py
oldPathStr = element.getAttribute('d') oldPathStr = element.getAttribute('d')
path = svg_parser.parse(oldPathStr) path = svg_parser.parse(oldPathStr)
style = _getStyle(element)
# This determines whether the stroke has round or square linecaps. If it does, we do not want to collapse empty # This determines whether the stroke has round or square linecaps. If it does, we do not want to collapse empty
# segments, as they are actually rendered (as circles or squares with diameter/dimension matching the path-width). # segments, as they are actually rendered (as circles or squares with diameter/dimension matching the path-width).
has_round_or_square_linecaps = element.getAttribute('stroke-linecap') in ['round', 'square'] has_round_or_square_linecaps = (
element.getAttribute('stroke-linecap') in ['round', 'square']
or 'stroke-linecap' in style and style['stroke-linecap'] in ['round', 'square']
)
# This determines whether the stroke has intermediate markers. If it does, we do not want to collapse # This determines whether the stroke has intermediate markers. If it does, we do not want to collapse
# straight segments running in the same direction, as markers are rendered on the intermediate nodes. # straight segments running in the same direction, as markers are rendered on the intermediate nodes.
has_markers = element.hasAttribute('marker') or element.hasAttribute('marker-mid') has_intermediate_markers = (
element.hasAttribute('marker')
or element.hasAttribute('marker-mid')
or 'marker' in style
or 'marker-mid' in style
)
# The first command must be a moveto, and whether it's relative (m) # The first command must be a moveto, and whether it's relative (m)
# or absolute (M), the first set of coordinates *is* absolute. So # or absolute (M), the first set of coordinates *is* absolute. So
@ -2414,7 +2423,7 @@ def cleanPath(element, options):
# Reuse the data structure 'path', since we're not adding or removing subcommands. # Reuse the data structure 'path', since we're not adding or removing subcommands.
# Also reuse the coordinate lists, even if we're deleting items, because these # Also reuse the coordinate lists, even if we're deleting items, because these
# deletions are relatively cheap. # deletions are relatively cheap.
if not has_markers: if not has_intermediate_markers:
for pathIndex in range(len(path)): for pathIndex in range(len(path)):
cmd, data = path[pathIndex] cmd, data = path[pathIndex]