Added additional level-3 absolute lengths

Also re-ordered units in style a little and updated rect to have aligned
percent handling for width and height.

Author: ssddanbrown

src/Svg/Style.php

@@ -408,23 +408,52 @@ static function convertSize($size, $referenceSize = 11.0, $dpi = 96.0) {
             return floatval(substr($size, 0, $pos));
         }
 
+        if ($pos = strpos($size, "%")) {
+            return $referenceSize * substr($size, 0, $pos) / 100;
+        }
+
         if ($pos = strpos($size, "pt")) {
-            return floatval(substr($size, 0, $pos));
+            $val = floatval(substr($size, 0, $pos));
+            return ($val * $dpi) / 72;
         }
 
         if ($pos = strpos($size, "cm")) {
-            return floatval(substr($size, 0, $pos)) * $dpi;
+            $val = floatval(substr($size, 0, $pos));
+            return ($val * $dpi) / 2.54;
         }
 
-        if ($pos = strpos($size, "%")) {
-            return $referenceSize * substr($size, 0, $pos) / 100;
+        if ($pos = strpos($size, "mm")) {
+            $val = floatval(substr($size, 0, $pos));
+            return (($val * $dpi) / 2.54) / 10;
+        }
+
+        if ($pos = strpos($size, "q")) {
+            $val = floatval(substr($size, 0, $pos));
+            return (($val * $dpi) / 2.54) / 40;
+        }
+
+        if ($pos = strpos($size, "in")) {
+            $val = floatval(substr($size, 0, $pos));
+            return ($val * $dpi);
+        }
+
+        if ($pos = strpos($size, "pc")) {
+            $val = floatval(substr($size, 0, $pos));
+            return ($val * $dpi) / 6;
         }
 
         if ($pos = strpos($size, "em")) {
-            return $referenceSize * substr($size, 0, $pos);
+            $val = floatval(substr($size, 0, $pos));
+            return $referenceSize * $val;
         }
 
-        // TODO cm, mm, pc, in, etc
+        // TODO - vmin
+        // TODO - vmax
+        // TODO - vh
+        // TODO - vw
+        // TODO - rem
+        // TODO - ch
+        // TODO - ex
 
         return null;
     }

src/Svg/Tag/Rect.php

@@ -21,30 +21,21 @@ class Rect extends Shape
 
     public function start($attributes)
     {
+        $width = $this->document->getWidth();
+        $height = $this->document->getHeight();
+
         if (isset($attributes['x'])) {
-            $width = $this->document->getWidth();
             $this->x = Style::convertSize($attributes['x'], $width);
         }
         if (isset($attributes['y'])) {
-            $height = $this->document->getHeight();
             $this->y = Style::convertSize($attributes['y'], $height);
         }
 
         if (isset($attributes['width'])) {
-            if ('%' === substr($attributes['width'], -1)) {
-                $factor = substr($attributes['width'], 0, -1) / 100;
-                $this->width = $this->document->getWidth() * $factor;
-            } else {
-                $this->width = $attributes['width'];
-            }
+            $this->width = Style::convertSize($attributes['width'], $width);
         }
         if (isset($attributes['height'])) {
-            if ('%' === substr($attributes['height'], -1)) {
-                $factor = substr($attributes['height'], 0, -1) / 100;
-                $this->height = $this->document->getHeight() * $factor;
-            } else {
-                $this->height = $attributes['height'];
-            }
+            $this->height = Style::convertSize($attributes['height'], $width);
         }
 
         if (isset($attributes['rx'])) {