Merge origin/master

Author: ErikOnBike

.coveragerc

@@ -1,3 +1,5 @@
 [run]
 omit =
     test/cairosvg_reference/*
+    */virtualenv/*
+    .*

.gitignore

@@ -6,4 +6,5 @@ __pycache__
 .coverage
 .cache
 /.idea
+.eggs
 build

MANIFEST.in

@@ -1,3 +1,3 @@
 # Deployment tests are already bundled in the cairosvg module
-include COPYING NEWS.rst README.rst
-exclude test/*.py cairosvg.py
+prune test
+exclude cairosvg.py

NEWS.rst

@@ -13,6 +13,8 @@ Version 2.0, not released yet
 * Fix URL/id handling
 * Use bounding boxes for gradients
 * Split deployment and development tests
+* Add a scale option
+* Add a parent size option
 * Test with Travis
 
 

cairosvg/__init__.py

@@ -19,7 +19,7 @@
 
 """
 
-__version__ = '2.0.0rc2'  # noqa (version is used by relative imports)
+__version__ = '2.0.0rc5'  # noqa (version is used by relative imports)
 
 
 import os
@@ -70,6 +70,8 @@ def main():
     parser.add_argument(
         '-H', '--height', default=None, type=float,
         help='height of the parent container in pixels')
+    parser.add_argument(
+        '-s', '--scale', default=1, type=float, help='output scaling factor')
     parser.add_argument(
         '-u', '--unsafe', action='store_true',
         help='resolve XML entities and allow very large files '
@@ -79,7 +81,7 @@ def main():
     options = parser.parse_args()
     kwargs = {
         'parent_width': options.width, 'parent_height': options.height,
-        'dpi': options.dpi, 'unsafe': options.unsafe}
+        'dpi': options.dpi, 'scale': options.scale, 'unsafe': options.unsafe}
     kwargs['write_to'] = (
         sys.stdout.buffer if options.output == '-' else options.output)
     if options.input == '-':

cairosvg/path.py

@@ -144,20 +144,35 @@ def path(surface, node):
     last_letter = None
     string = normalize(string)
 
+    # Keep the current point because Cairo's get_current_point is not accurate
+    # enough. See https://github.com/Kozea/CairoSVG/issues/111.
+    if surface.context.has_current_point():
+        current_point = surface.context.get_current_point()
+    else:
+        surface.context.move_to(0, 0)
+        current_point = 0, 0
+
     while string:
         string = string.strip()
         if string.split(' ', 1)[0] in PATH_LETTERS:
             letter, string = (string + ' ').split(' ', 1)
             if last_letter in (None, 'z', 'Z') and letter not in 'mM':
-                node.vertices.append(surface.context.get_current_point())
+                node.vertices.append(current_point)
+                first_path_point = current_point
         elif letter == 'M':
             letter = 'L'
         elif letter == 'm':
             letter = 'l'
 
+        if last_letter in (None, 'm', 'M', 'z', 'Z'):
+            first_path_point = None
+        if letter not in (None, 'm', 'M', 'z', 'Z') and first_path_point is None:
+            first_path_point = current_point
+
         if letter in 'aA':
             # Elliptic curve
-            x1, y1 = surface.context.get_current_point()
+            surface.context.set_tolerance(0.00001)
+            x1, y1 = current_point
             rx, ry, string = point(surface, string)
             rotation, string = string.split(' ', 1)
             rotation = radians(float(rotation))
@@ -233,16 +248,18 @@ def path(surface, node):
             surface.context.scale(1, radii_ratio)
             arc(xc, yc, rx, angle1, angle2)
             surface.context.restore()
+            current_point = current_point[0] + x3, current_point[1] + y3
 
         elif letter == 'c':
             # Relative curve
-            x, y = surface.context.get_current_point()
+            x, y = current_point
             x1, y1, string = point(surface, string)
             x2, y2, string = point(surface, string)
             x3, y3, string = point(surface, string)
             node.vertices.append((
                 point_angle(x2, y2, x1, y1), point_angle(x2, y2, x3, y3)))
             surface.context.rel_curve_to(x1, y1, x2, y2, x3, y3)
+            current_point = current_point[0] + x3, current_point[1] + y3
 
             # Save absolute values for x and y, useful if next letter is s or S
             x1 += x
@@ -260,50 +277,56 @@ def path(surface, node):
             node.vertices.append((
                 point_angle(x2, y2, x1, y1), point_angle(x2, y2, x3, y3)))
             surface.context.curve_to(x1, y1, x2, y2, x3, y3)
+            current_point = x3, y3
 
         elif letter == 'h':
             # Relative horizontal line
             x, string = (string + ' ').split(' ', 1)
-            old_x, old_y = surface.context.get_current_point()
+            old_x, old_y = current_point
             angle = 0 if size(surface, x, 'x') > 0 else pi
             node.vertices.append((pi - angle, angle))
-            surface.context.rel_line_to(size(surface, x, 'x'), 0)
+            x = size(surface, x, 'x')
+            surface.context.rel_line_to(x, 0)
+            current_point = current_point[0] + x, current_point[1]
 
         elif letter == 'H':
             # Horizontal line
             x, string = (string + ' ').split(' ', 1)
-            old_x, old_y = surface.context.get_current_point()
+            old_x, old_y = current_point
             angle = 0 if size(surface, x, 'x') > old_x else pi
             node.vertices.append((pi - angle, angle))
-            surface.context.line_to(size(surface, x, 'x'), old_y)
+            x = size(surface, x, 'x')
+            surface.context.line_to(x, old_y)
+            current_point = x, current_point[1]
 
         elif letter == 'l':
             # Relative straight line
             x, y, string = point(surface, string)
             angle = point_angle(0, 0, x, y)
             node.vertices.append((pi - angle, angle))
             surface.context.rel_line_to(x, y)
+            current_point = current_point[0] + x, current_point[1] + y
 
         elif letter == 'L':
             # Straight line
             x, y, string = point(surface, string)
-            old_x, old_y = surface.context.get_current_point()
+            old_x, old_y = current_point
             angle = point_angle(old_x, old_y, x, y)
             node.vertices.append((pi - angle, angle))
             surface.context.line_to(x, y)
+            current_point = x, y
 
         elif letter == 'm':
             # Current point relative move
             x, y, string = point(surface, string)
-            if surface.context.has_current_point():
-                surface.context.rel_move_to(x, y)
-            else:
-                surface.context.move_to(x, y)
+            surface.context.rel_move_to(x, y)
+            current_point = current_point[0] + x, current_point[1] + y
 
         elif letter == 'M':
             # Current point move
             x, y, string = point(surface, string)
             surface.context.move_to(x, y)
+            current_point = x, y
 
         elif letter == 'q':
             # Relative quadratic curve
@@ -314,27 +337,30 @@ def path(surface, node):
                 x1, y1, x2, y2, x3, y3)
             surface.context.rel_curve_to(xq1, yq1, xq2, yq2, xq3, yq3)
             node.vertices.append((0, 0))
+            current_point = current_point[0] + x3, current_point[1] + y3
 
         elif letter == 'Q':
             # Quadratic curve
-            x1, y1 = surface.context.get_current_point()
+            x1, y1 = current_point
             x2, y2, string = point(surface, string)
             x3, y3, string = point(surface, string)
             xq1, yq1, xq2, yq2, xq3, yq3 = quadratic_points(
                 x1, y1, x2, y2, x3, y3)
             surface.context.curve_to(xq1, yq1, xq2, yq2, xq3, yq3)
             node.vertices.append((0, 0))
+            current_point = x3, y3
 
         elif letter == 's':
             # Relative smooth curve
-            x, y = surface.context.get_current_point()
+            x, y = current_point
             x1 = x3 - x2 if last_letter in 'csCS' else 0
             y1 = y3 - y2 if last_letter in 'csCS' else 0
             x2, y2, string = point(surface, string)
             x3, y3, string = point(surface, string)
             node.vertices.append((
                 point_angle(x2, y2, x1, y1), point_angle(x2, y2, x3, y3)))
             surface.context.rel_curve_to(x1, y1, x2, y2, x3, y3)
+            current_point = current_point[0] + x3, current_point[1] + y3
 
             # Save absolute values for x and y, useful if next letter is s or S
             x1 += x
@@ -346,14 +372,15 @@ def path(surface, node):
 
         elif letter == 'S':
             # Smooth curve
-            x, y = surface.context.get_current_point()
+            x, y = current_point
             x1 = x3 + (x3 - x2) if last_letter in 'csCS' else x
             y1 = y3 + (y3 - y2) if last_letter in 'csCS' else y
             x2, y2, string = point(surface, string)
             x3, y3, string = point(surface, string)
             node.vertices.append((
                 point_angle(x2, y2, x1, y1), point_angle(x2, y2, x3, y3)))
             surface.context.curve_to(x1, y1, x2, y2, x3, y3)
+            current_point = x3, y3
 
         elif letter == 't':
             # Relative quadratic curve end
@@ -372,10 +399,11 @@ def path(surface, node):
                 x1, y1, x2, y2, x3, y3)
             node.vertices.append((0, 0))
             surface.context.rel_curve_to(xq1, yq1, xq2, yq2, xq3, yq3)
+            current_point = current_point[0] + x3, current_point[1] + y3
 
         elif letter == 'T':
             # Quadratic curve end
-            abs_x, abs_y = surface.context.get_current_point()
+            abs_x, abs_y = current_point
             if last_letter not in 'QqTt':
                 x2, y2, x3, y3 = abs_x, abs_y, abs_x, abs_y
             elif last_letter in 'qt':
@@ -389,30 +417,36 @@ def path(surface, node):
                 x1, y1, x2, y2, x3, y3)
             node.vertices.append((0, 0))
             surface.context.curve_to(xq1, yq1, xq2, yq2, xq3, yq3)
+            current_point = x3, y3
 
         elif letter == 'v':
             # Relative vertical line
             y, string = (string + ' ').split(' ', 1)
-            old_x, old_y = surface.context.get_current_point()
+            old_x, old_y = current_point
             angle = pi / 2 if size(surface, y, 'y') > 0 else -pi / 2
             node.vertices.append((-angle, angle))
-            surface.context.rel_line_to(0, size(surface, y, 'y'))
+            y = size(surface, y, 'y')
+            surface.context.rel_line_to(0, y)
+            current_point = current_point[0], current_point[1] + y
 
         elif letter == 'V':
             # Vertical line
             y, string = (string + ' ').split(' ', 1)
-            old_x, old_y = surface.context.get_current_point()
+            old_x, old_y = current_point
             angle = pi / 2 if size(surface, y, 'y') > 0 else -pi / 2
             node.vertices.append((-angle, angle))
-            surface.context.line_to(old_x, size(surface, y, 'y'))
+            y = size(surface, y, 'y')
+            surface.context.line_to(old_x, y)
+            current_point = current_point[0], y
 
         elif letter in 'zZ':
             # End of path
             node.vertices.append(None)
             surface.context.close_path()
+            current_point = first_path_point or (0, 0)
 
         if letter not in 'zZ':
-            node.vertices.append(surface.context.get_current_point())
+            node.vertices.append(current_point)
 
         string = string.strip()
         last_letter = letter

cairosvg/surface.py

@@ -129,16 +129,17 @@ def convert(cls, bytestring=None, **kwargs):
         dpi = kwargs.pop('dpi', 96)
         parent_width = kwargs.pop('parent_width', None)
         parent_height = kwargs.pop('parent_height', None)
+        scale = kwargs.pop('scale', 1)
         write_to = kwargs.pop('write_to', None)
         kwargs['bytestring'] = bytestring
         tree = Tree(**kwargs)
         output = write_to or io.BytesIO()
-        cls(tree, output, dpi, None, parent_width, parent_height).finish()
+        cls(tree, output, dpi, None, parent_width, parent_height, scale).finish()
         if write_to is None:
             return output.getvalue()
 
     def __init__(self, tree, output, dpi, parent_surface=None,
-                 parent_width=None, parent_height=None):
+                 parent_width=None, parent_height=None, scale=1):
         """Create the surface from a filename or a file-like object.
 
         The rendered content is written to ``output`` which can be a filename,
@@ -175,6 +176,8 @@ def __init__(self, tree, output, dpi, parent_surface=None,
         self.font_size = size(self, '12pt')
         self.stroke_and_fill = True
         width, height, viewbox = node_format(self, tree)
+        width *= scale
+        height *= scale
         # Actual surface dimensions: may be rounded on raster surfaces types
         self.cairo, self.width, self.height = self._create_surface(
             width * self.device_units_per_user_units,

pytest.ini

@@ -1,3 +1,5 @@
 [pytest]
-addopts = --flake8 --isort --cov --ignore=test/cairosvg_reference
+# Broken with Travis, see https://gitlab.com/pycqa/flake8/issues/164
+# addopts = --flake8 --isort --cov --ignore=test/cairosvg_reference
+addopts = --isort --cov --ignore=test/cairosvg_reference
 norecursedirs = dist .cache .git build *.egg-info .eggs venv cairosvg_reference

setup.cfg

@@ -1,2 +1,5 @@
+[aliases]
+test = pytest
+
 [bdist_wheel]
 python-tag = py3

setup.py

@@ -15,6 +15,7 @@
 """
 
 import re
+import sys
 from os import path
 
 from setuptools import setup
@@ -23,6 +24,8 @@
 with open(init_path, 'r', encoding='utf-8') as fd:
     version = re.search("__version__ = '([^']+)'", fd.read().strip()).group(1)
 
+needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
+pytest_runner = ['pytest-runner'] if needs_pytest else []
 
 # When the version is updated, ``cairosvg.__version__`` must be modified.
 # A new section in the ``NEWS`` file must be added too.
@@ -38,9 +41,10 @@
     platforms='Any',
     packages=['cairosvg'],
     provides=['cairosvg'],
-    setup_requires=['pytest-runner'],
+    setup_requires=pytest_runner,
     install_requires=['cairocffi', 'lxml', 'cssselect', 'pillow', 'tinycss'],
-    tests_require=['pytest-cov', 'pytest-flake8', 'pytest-isort', 'pytest'],
+    tests_require=[
+        'pytest-cov', 'pytest-flake8', 'pytest-isort', 'pytest-runner'],
     extras_require={'test': (
         'pytest-runner', 'pytest-cov', 'pytest-flake8', 'pytest-isort')},
     keywords=['svg', 'convert', 'cairo', 'pdf', 'png', 'postscript'],