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

Do not combine straight line segments running in the same direction if the path has intermediate markers.

Browse source 
Fixes #145.
This commit is contained in:
Eduard Braun 2017-05-16 19:32:11 +02:00
parent 75bacbc8e6
commit b7bfb3250a
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scour/scour.py
View file

@ -2049,6 +2049,10 @@ def cleanPath(element, options):
# we do not want to collapse empty segments, as they are actually rendered. # we do not want to collapse empty segments, as they are actually rendered.
withRoundLineCaps = element.getAttribute('stroke-linecap') == 'round' withRoundLineCaps = element.getAttribute('stroke-linecap') == 'round'
# 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.
has_markers = element.hasAttribute('marker') or element.hasAttribute('marker-mid')
# 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
# the first iteration of the loop below will get x,y and startx,starty. # the first iteration of the loop below will get x,y and startx,starty.
@ -2396,14 +2400,15 @@ def cleanPath(element, options):
newPath.append((cmd, data)) newPath.append((cmd, data))
path = newPath path = newPath
# for each h or v, collapse unnecessary coordinates that run in the same direction # For each h or v, collapse unnecessary coordinates that run in the same direction
# i.e. "h-100-100" becomes "h-200" but "h300-100" does not change # i.e. "h-100-100" becomes "h-200" but "h300-100" does not change.
# If the path has intermediate markers we have to preserve intermediate nodes, though.
# 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.
for pathIndex in range(1, len(path)): for pathIndex in range(1, len(path)):
cmd, data = path[pathIndex] cmd, data = path[pathIndex]
if cmd in ['h', 'v'] and len(data) > 1: if cmd in ['h', 'v'] and len(data) > 1 and not has_markers:
coordIndex = 1 coordIndex = 1
while coordIndex < len(data): while coordIndex < len(data):
if isSameSign(data[coordIndex - 1], data[coordIndex]): if isSameSign(data[coordIndex - 1], data[coordIndex]):