Merged with origin master

Author: ErikOnBike

.coveragerc

@@ -1,3 +1,3 @@
-[report]
-exclude_lines =
-    except ImportError
+[run]
+omit =
+    test/cairosvg_reference/*

.gitignore

@@ -3,9 +3,7 @@ __pycache__
 /test/output
 /dist
 /MANIFEST
-/.tox
 .coverage
-.noseids
 .cache
 /.idea
 build

.travis.yml

@@ -5,17 +5,14 @@ python:
   - 3.5
 
 install:
-  - pip install cairocffi
-  - pip install tinycss
-  - pip install cssselect
-  - pip install lxml
-  - pip install pillow
+  - pip install --upgrade -e.[test]
 
 before_script:
   - mkdir ~/.fonts
   - cp ./test/resources/*.*tf ~/.fonts
   - fc-cache -f -v
 
-script: nosetests
+script:
+  - python setup.py test
 
 sudo: false

cairosvg/__init__.py

@@ -72,7 +72,8 @@ def main():
         help='height of the parent container in pixels')
     parser.add_argument(
         '-u', '--unsafe', action='store_true',
-        help='resolve XML entities and allow very large files (WARNING: vulnerable to XXE attacks)')
+        help='resolve XML entities and allow very large files '
+             '(WARNING: vulnerable to XXE attacks and various DoS)')
     parser.add_argument('-o', '--output', default='-', help='output filename')
 
     options = parser.parse_args()

cairosvg/bounding_box.py

@@ -21,13 +21,12 @@
 
 """
 
-from math import isinf, fmod, pi, radians, sin, cos, tan, acos, atan, sqrt
+from math import acos, atan, cos, fmod, isinf, pi, radians, sin, sqrt, tan
 
+from .features import match_features
 from .helpers import PATH_LETTERS, normalize, point, size
-from .defs import parse_url
 from .parser import Tree
-from .features import match_features
-
+from .url import parse_url
 
 EMPTY_BOUNDING_BOX = float('inf'), float('inf'), 0, 0
 
@@ -136,9 +135,10 @@ def bounding_box_path(surface, node):
             # Extend bounding box with start and end coordinates
             arc_bounding_box = bounding_box_elliptical_arc(
                 previous_x, previous_y, rx, ry, rotation, large, sweep, x, y)
-            points = (arc_bounding_box[0:2],
-                      tuple(sum(value) for value in
-                            zip(arc_bounding_box[0:2], arc_bounding_box[2:])))
+            x1, y1, width, height = arc_bounding_box
+            x2 = x1 + width
+            y2 = y1 + height
+            points = (x1, y1), (x2, y2)
             bounding_box = extend_bounding_box(bounding_box, points)
             previous_x = x
             previous_y = y

cairosvg/defs.py

@@ -21,15 +21,14 @@
 
 """
 
+from .bounding_box import calculate_bounding_box, is_non_empty_bounding_box
 from .colors import color
 from .features import match_features
 from .helpers import paint, size, transform
 from .parser import Tree
 from .shapes import rect
 from .surface import cairo
 from .url import parse_url
-from .bounding_box import calculate_bounding_box, is_non_empty_bounding_box
-
 
 BLEND_OPERATORS = {
     'darken': cairo.OPERATOR_DARKEN,
@@ -210,17 +209,8 @@ def draw_gradient(surface, node, name):
             1 / width, 0, 0, 1 / height, - x / width, - y / height))
 
     # Apply transform of gradient
-    transform(surface,
-              gradient_node.get('gradientTransform'),
-              gradient_pattern)
-
-    # Set spread method for gradient outside target bounds
-    """
-    # This does not seem to do anything.
-    # Is there a test showing its functionality?
-    gradient_pattern.set_extend(EXTEND_OPERATORS.get(
-        node.get('spreadMethod', 'pad'), EXTEND_OPERATORS['pad']))
-    """
+    transform(
+        surface, gradient_node.get('gradientTransform'), gradient_pattern)
 
     # Apply gradient (<stop> by <stop>)
     offset = 0

cairosvg/helpers.py

@@ -19,13 +19,12 @@
 
 """
 
-from math import cos, sin, tan, atan2, radians
 import re
+from math import atan2, cos, radians, sin, tan
 
 from .surface import cairo
 from .url import parse_url
 
-
 UNITS = {
     'mm': 1 / 25.4,
     'cm': 1 / 2.54,
@@ -125,78 +124,77 @@ def preserve_ratio(surface, node):
         width = size(surface, node.get('markerWidth', '3'), 'x')
         height = size(surface, node.get('markerHeight', '3'), 'y')
         _, _, viewbox = node_format(surface, node)
-        viewbox_width = viewbox[2]
-        viewbox_height = viewbox[3]
+        viewbox_width, viewbox_height = viewbox[2:]
     elif node.tag in ('svg', 'image'):
         width, height, _ = node_format(surface, node)
         viewbox_width, viewbox_height = node.image_width, node.image_height
     else:
         # Safety measure
-        return 1, 1, 0, 0, None
+        return 1, 1, 0, 0
 
     translate_x = 0
     translate_y = 0
     scale_x = width / viewbox_width if viewbox_width > 0 else 1
     scale_y = height / viewbox_height if viewbox_height > 0 else 1
-    clip_box = None
-    align = node.get('preserveAspectRatio', 'xMidYMid').split(' ')[0]
+
+    aspect_ratio = node.get('preserveAspectRatio', 'xMidYMid').split()
+    align = aspect_ratio[0]
     if align == 'none':
         x_position = 'min'
         y_position = 'min'
     else:
-        mos_properties = node.get('preserveAspectRatio', '').split()
-        meet_or_slice = mos_properties[1] if len(mos_properties) > 1 else None
+        meet_or_slice = aspect_ratio[1] if len(aspect_ratio) > 1 else None
         if meet_or_slice == 'slice':
             scale_value = max(scale_x, scale_y)
         else:
             scale_value = min(scale_x, scale_y)
         scale_x = scale_y = scale_value
-
         x_position = align[1:4].lower()
         y_position = align[5:].lower()
 
     if node.tag == 'marker':
         translate_x = -size(surface, node.get('refX', '0'), 'x')
         translate_y = -size(surface, node.get('refY', '0'), 'y')
-        if x_position == 'min':
-            clip_x = viewbox[0]
-
-        if y_position == 'min':
-            clip_y = viewbox[1]
-
+    else:
+        translate_x = 0
         if x_position == 'mid':
-            clip_x = viewbox[0] + (viewbox_width - width / scale_x) / 2.
+            translate_x = (width / scale_x - viewbox_width) / 2
+        elif x_position == 'max':
+            translate_x = width / scale_x - viewbox_width
 
+        translate_y = 0
         if y_position == 'mid':
-            clip_y = viewbox[1] + (viewbox_height - height / scale_y) / 2.
+            translate_y += (height / scale_y - viewbox_height) / 2
+        elif y_position == 'max':
+            translate_y += height / scale_y - viewbox_height
 
-        if x_position == 'max':
-            clip_x = viewbox[0] + (viewbox_width - width / scale_x)
+    return scale_x, scale_y, translate_x, translate_y
 
-        if y_position == 'max':
-            clip_y = viewbox[1] + (viewbox_height - height / scale_y)
 
-        clip_box = (clip_x, clip_y, width / scale_x, height / scale_y)
-    else:
-        if x_position == 'min':
-            translate_x = 0
-
-        if y_position == 'min':
-            translate_y = 0
-
-        if x_position == 'mid':
-            translate_x = (width / scale_x - viewbox_width) / 2.
+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')
+    height = size(surface, node.get('markerHeight', '3'), 'y')
+    _, _, viewbox = node_format(surface, node)
+    viewbox_width, viewbox_height = viewbox[2:]
 
-        if y_position == 'mid':
-            translate_y = (height / scale_y - viewbox_height) / 2.
+    align = node.get('preserveAspectRatio', 'xMidYMid').split(' ')[0]
+    x_position = 'min' if align == 'none' else align[1:4].lower()
+    y_position = 'min' if align == 'none' else align[5:].lower()
 
-        if x_position == 'max':
-            translate_x = width / scale_x - viewbox_width
+    clip_x = viewbox[0]
+    if x_position == 'mid':
+        clip_x += (viewbox_width - width / scale_x) / 2.
+    elif x_position == 'max':
+        clip_x += viewbox_width - width / scale_x
 
-        if y_position == 'max':
-            translate_y = height / scale_y - viewbox_height
+    clip_y = viewbox[1]
+    if y_position == 'mid':
+        clip_y += (viewbox_height - height / scale_y) / 2.
+    elif y_position == 'max':
+        clip_y += viewbox_height - height / scale_y
 
-    return scale_x, scale_y, translate_x, translate_y, clip_box
+    return clip_x, clip_y, width / scale_x, height / scale_y
 
 
 def quadratic_points(x1, y1, x2, y2, x3, y3):
@@ -213,9 +211,8 @@ def rotate(x, y, angle):
     return x * cos(angle) - y * sin(angle), y * cos(angle) + x * sin(angle)
 
 
-def transform(surface, string, gradient = None):
-    """Update ``surface`` or ``gradient`` (if supplied)
-       according to transformation ``string``.
+def transform(surface, string, gradient=None):
+    """Transform ``surface`` or ``gradient`` if supplied using ``string``.
 
     See http://www.w3.org/TR/SVG/coords.html#TransformAttribute
 
@@ -252,7 +249,7 @@ def transform(surface, string, gradient = None):
     apply_matrix_transform(surface, matrix, gradient)
 
 
-def apply_matrix_transform(surface, matrix, gradient = None):
+def apply_matrix_transform(surface, matrix, gradient=None):
     """Apply a ``matrix`` to ``surface`` or ``gradient`` if supplied.
 
     When the matrix is not invertible, this function clips the context to an

cairosvg/image.py

@@ -24,7 +24,7 @@
 
 from PIL import Image
 
-from .helpers import node_format, size, preserve_ratio, preserved_ratio
+from .helpers import node_format, preserve_ratio, preserved_ratio, size
 from .parser import Tree
 from .surface import cairo
 from .url import parse_url, read_url
@@ -67,7 +67,7 @@ def image(surface, node):
             tree_height = tree['height'] = height
         node.image_width = tree_width or width
         node.image_height = tree_height or height
-        scale_x, scale_y, translate_x, translate_y, _ = preserve_ratio(
+        scale_x, scale_y, translate_x, translate_y = preserve_ratio(
             surface, node)
         surface.set_context_size(
             *node_format(surface, tree, reference=False),
@@ -87,7 +87,7 @@ def image(surface, node):
 
     node.image_width = image_surface.get_width()
     node.image_height = image_surface.get_height()
-    scale_x, scale_y, translate_x, translate_y, _ = preserve_ratio(
+    scale_x, scale_y, translate_x, translate_y = preserve_ratio(
         surface, node)
 
     surface.context.rectangle(x, y, width, height)