Skip to content

More marker fixes #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

More marker fixes #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ca68822
Attempting to fix angles; consistency between cubic and quadratic arc…
SilverCardioid Nov 29, 2020
6af8cd9
Fix marker angle calculation (arithmetic mean may be 180 degrees off …
SilverCardioid Nov 30, 2020
87232dd
Fix degenerate Beziers
SilverCardioid Dec 1, 2020
ba2759c
Fix elliptic & rotated arc angles
SilverCardioid Dec 1, 2020
52e3993
Fix angles for M and z by breaking node.vertices into subpaths
SilverCardioid Dec 2, 2020
a2a06a8
Draw two markers on top of one another for closepaths in accordance w…
SilverCardioid Dec 17, 2020
0835fc8
Markers were wrongly sized if they didn't fit the whole viewport; I'm…
SilverCardioid Dec 17, 2020
52dff3e
Sync change to Kozea/CairoSVG
SilverCardioid Dec 29, 2020
5ebdd18
m
SilverCardioid Dec 29, 2020
6395329
Update .vertices for other shapes
SilverCardioid Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions cairosvg/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,20 @@ def preserve_ratio(surface, node, width=None, height=None):
return scale_x, scale_y, translate_x, translate_y


def bezier_angles(*points):
"""Return the tangent angles of a Bezier curve of any degree."""
if len(points) < 2:
# zero-length segment
return (0, 0)
# Control points that coincide with vertices can be removed
elif points[0] == points[1]:
return bezier_angles(*points[1:])
elif points[-2] == points[-1]:
return bezier_angles(*points[:-1])
else:
return (point_angle(*points[0], *points[1]), point_angle(*points[-2], *points[-1]))


def clip_marker_box(surface, node, scale_x, scale_y):
"""Get the clip ``(x, y, width, height)`` of the marker box."""
width = size(surface, node.get('markerWidth', '3'), 'x')
Expand Down
Loading