Added support for percent-based x,y positions

Author: ssddanbrown

src/Svg/Tag/Circle.php

@@ -8,6 +8,8 @@
 
 namespace Svg\Tag;
 
+use Svg\Style;
+
 class Circle extends Shape
 {
     protected $cx = 0;
@@ -17,10 +19,12 @@ class Circle extends Shape
     public function start($attributes)
     {
         if (isset($attributes['cx'])) {
-            $this->cx = $attributes['cx'];
+            $width = $this->document->getWidth();
+            $this->cx = Style::convertSize($attributes['cx'], $width);
         }
         if (isset($attributes['cy'])) {
-            $this->cy = $attributes['cy'];
+            $height = $this->document->getHeight();
+            $this->cy = Style::convertSize($attributes['cy'], $height);
         }
         if (isset($attributes['r'])) {
             $this->r = $attributes['r'];

src/Svg/Tag/Ellipse.php

@@ -8,6 +8,8 @@
 
 namespace Svg\Tag;
 
+use Svg\Style;
+
 class Ellipse extends Shape
 {
     protected $cx = 0;
@@ -20,10 +22,12 @@ public function start($attributes)
         parent::start($attributes);
 
         if (isset($attributes['cx'])) {
-            $this->cx = $attributes['cx'];
+            $width = $this->document->getWidth();
+            $this->cx = Style::convertSize($attributes['cx'], $width);
         }
         if (isset($attributes['cy'])) {
-            $this->cy = $attributes['cy'];
+            $height = $this->document->getHeight();
+            $this->cy = Style::convertSize($attributes['cy'], $height);
         }
         if (isset($attributes['rx'])) {
             $this->rx = $attributes['rx'];

src/Svg/Tag/Image.php

@@ -8,6 +8,8 @@
 
 namespace Svg\Tag;
 
+use Svg\Style;
+
 class Image extends AbstractTag
 {
     protected $x = 0;
@@ -28,15 +30,15 @@ protected function before($attributes)
 
     public function start($attributes)
     {
-        $document = $this->document;
         $height = $this->document->getHeight();
         $this->y = $height;
 
         if (isset($attributes['x'])) {
-            $this->x = $attributes['x'];
+            $width = $this->document->getWidth();
+            $this->x = Style::convertSize($attributes['x'], $width);
         }
         if (isset($attributes['y'])) {
-            $this->y = $height - $attributes['y'];
+            $this->y = $height - Style::convertSize($attributes['y'], $height);
         }
 
         if (isset($attributes['width'])) {
@@ -50,9 +52,9 @@ public function start($attributes)
             $this->href = $attributes['xlink:href'];
         }
 
-        $document->getSurface()->transform(1, 0, 0, -1, 0, $height);
+        $this->document->getSurface()->transform(1, 0, 0, -1, 0, $height);
 
-        $document->getSurface()->drawImage($this->href, $this->x, $this->y, $this->width, $this->height);
+        $this->document->getSurface()->drawImage($this->href, $this->x, $this->y, $this->width, $this->height);
     }
 
     protected function after()

src/Svg/Tag/Line.php

@@ -8,6 +8,8 @@
 
 namespace Svg\Tag;
 
+use Svg\Style;
+
 class Line extends Shape
 {
     protected $x1 = 0;
@@ -18,17 +20,20 @@ class Line extends Shape
 
     public function start($attributes)
     {
+        $height = $this->document->getHeight();
+        $width = $this->document->getWidth();
+
         if (isset($attributes['x1'])) {
-            $this->x1 = $attributes['x1'];
+            $this->x1 = Style::convertSize($attributes['x1'], $width);
         }
         if (isset($attributes['y1'])) {
-            $this->y1 = $attributes['y1'];
+            $this->y1 = Style::convertSize($attributes['y1'], $height);
         }
         if (isset($attributes['x2'])) {
-            $this->x2 = $attributes['x2'];
+            $this->x2 = Style::convertSize($attributes['x2'], $width);
         }
         if (isset($attributes['y2'])) {
-            $this->y2 = $attributes['y2'];
+            $this->y2 = Style::convertSize($attributes['y2'], $height);
         }
 
         $surface = $this->document->getSurface();

src/Svg/Tag/Rect.php

@@ -8,6 +8,8 @@
 
 namespace Svg\Tag;
 
+use Svg\Style;
+
 class Rect extends Shape
 {
     protected $x = 0;
@@ -20,10 +22,12 @@ class Rect extends Shape
     public function start($attributes)
     {
         if (isset($attributes['x'])) {
-            $this->x = $attributes['x'];
+            $width = $this->document->getWidth();
+            $this->x = Style::convertSize($attributes['x'], $width);
         }
         if (isset($attributes['y'])) {
-            $this->y = $attributes['y'];
+            $height = $this->document->getHeight();
+            $this->y = Style::convertSize($attributes['y'], $height);
         }
 
         if (isset($attributes['width'])) {

src/Svg/Tag/Text.php

@@ -8,6 +8,8 @@
 
 namespace Svg\Tag;
 
+use Svg\Style;
+
 class Text extends Shape
 {
     protected $x = 0;
@@ -16,18 +18,18 @@ class Text extends Shape
 
     public function start($attributes)
     {
-        $document = $this->document;
         $height = $this->document->getHeight();
         $this->y = $height;
 
         if (isset($attributes['x'])) {
-            $this->x = $attributes['x'];
+            $width = $this->document->getWidth();
+            $this->x = Style::convertSize($attributes['x'], $width);
         }
         if (isset($attributes['y'])) {
-            $this->y = $height - $attributes['y'];
+            $this->y = $height - Style::convertSize($attributes['y'], $height);
         }
 
-        $document->getSurface()->transform(1, 0, 0, -1, 0, $height);
+        $this->document->getSurface()->transform(1, 0, 0, -1, 0, $height);
     }
 
     public function end()