From fb73705281289ed403b0e43300fd00a43100ccaf Mon Sep 17 00:00:00 2001
From: Henning Stahlke <github@henningstahlke.de>
Date: Wed, 6 Feb 2019 16:22:04 +0100
Subject: [PATCH] svg.nas fix transformation problems and use
 setClipByBoundingBox() from API

---
 Nasal/canvas/svg.nas | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/Nasal/canvas/svg.nas b/Nasal/canvas/svg.nas
index 81e58ad36..650b8de3d 100644
--- a/Nasal/canvas/svg.nas
+++ b/Nasal/canvas/svg.nas
@@ -92,28 +92,14 @@ var parsesvg = func(group, path, options = nil)
 
     if( cur_clip != nil )
     {
-      if(     cur_clip['x'] != nil
-          and cur_clip['y'] != nil
-          and cur_clip['width'] != nil
-          and cur_clip['height'] != nil )
-      {
-        var rect = sprintf(
-          "rect(%f, %f, %f, %f)",
-          cur_clip['y'],
-          cur_clip['x'] + cur_clip['width'],
-          cur_clip['y'] + cur_clip['height'],
-          cur_clip['x']
-        );
-
-        stack[-1].set("clip", rect);
-        stack[-1].set("clip-frame", canvas.Element.LOCAL);
+      if(cur_clip['x'] != nil and cur_clip['y'] != nil
+         and cur_clip['width'] != nil and cur_clip['height'] != nil ) {
+        stack[-1].setClipByBoundingBox(cur_clip['x'], cur_clip['y'],
+           cur_clip['x'] + cur_clip['width'], cur_clip['y'] + cur_clip['height']);
+      }
+      else {
+        printlog("warn", "Invalid or unsupported clip for element '" ~ id ~ "'");
       }
-      else
-        printlog(
-          "warn",
-          "Invalid or unsupported clip for element '" ~ id ~ "'"
-        );
-
       cur_clip = nil;
     }
   }
@@ -619,7 +605,7 @@ var parsesvg = func(group, path, options = nil)
       pushElement("image", attr["id"]);
 
       if (attr["x"] != nil and attr["y"] != nil) {
-        stack[-1].setTranslation(attr["x"], attr["y"]);
+        stack[-1].createTransform().setTranslation(attr["x"], attr["y"]);
       }
       if (attr["width"] != nil and attr["height"] != nil) {
         stack[-1].setSize(attr["width"], attr["height"]);
@@ -728,7 +714,7 @@ var parsesvg = func(group, path, options = nil)
         stack[-1].setText(tspan.text);
 
         if( x != 0 or y != 0 )
-          stack[-1].setTranslation(x, y);
+          stack[-1].createTransform().setTranslation(x, y);
 
         if( size(tspans) == 1 )
         {