1.0 RC1.2 Added clip-rect attribute. You could apply clipping to your elements in...
[raphael] / raphael.js
index 7a874da..32c9091 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Raphael 0.8.2 - JavaScript Vector Library
+ * Raphael 1.0 RC1.2 - JavaScript Vector Library
  *
  * Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com)
  * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
@@ -18,20 +18,23 @@ window.Raphael = (function () {
             return create.apply(R, arguments);
         },
         paper = {},
-        availableAttrs = {cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '10px "Arial"', "font-family": '"Arial"', "font-size": "10", "font-style": "normal", "font-weight": 400, gradient: 0, height: 0, href: "http://raphaeljs.com/", opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", src: "", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, target: "_blank", "text-anchor": "middle", title: "Raphael", translation: "0 0", width: 0, x: 0, y: 0},
+        availableAttrs = {"clip-rect": "0 0 0 0", cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '10px "Arial"', "font-family": '"Arial"', "font-size": "10", "font-style": "normal", "font-weight": 400, gradient: 0, height: 0, href: "http://raphaeljs.com/", opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", src: "", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, target: "_blank", "text-anchor": "middle", title: "Raphael", translation: "0 0", width: 0, x: 0, y: 0},
         availableAnimAttrs = {cx: "number", cy: "number", fill: "colour", "fill-opacity": "number", "font-size": "number", height: "number", opacity: "number", path: "path", r: "number", rotation: "csv", rx: "number", ry: "number", scale: "csv", stroke: "colour", "stroke-opacity": "number", "stroke-width": "number", translation: "csv", width: "number", x: "number", y: "number"},
         events = ["click", "dblclick", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup"];
-    R.version = "0.8.2";
+    R.version = "1.0 RC1.2";
     R.type = (window.SVGAngle || document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML");
     R.svg = !(R.vml = R.type == "VML");
     R.idGenerator = 0;
     R.fn = {};
+    R.isArray = function (arr) {
+        return Object.prototype.toString.call(arr) == "[object Array]";
+    };
     R.setWindow = function (newwin) {
         win = newwin;
         doc = win.document;
     };
     // colour utilities
-    R.hsb2rgb = function (hue, saturation, brightness) {
+    R.hsb2rgb = cacher(function (hue, saturation, brightness) {
         if (typeof hue == "object" && "h" in hue && "s" in hue && "b" in hue) {
             brightness = hue.b;
             saturation = hue.s;
@@ -59,23 +62,23 @@ window.Raphael = (function () {
         red *= 255;
         green *= 255;
         blue *= 255;
-        var rgb = {r: red, g: green, b: blue};
-        var r = Math.round(red).toString(16);
+        var rgb = {r: red, g: green, b: blue},
+            r = Math.round(red).toString(16),
+            g = Math.round(green).toString(16),
+            b = Math.round(blue).toString(16);
         if (r.length == 1) {
             r = "0" + r;
         }
-        var g = Math.round(green).toString(16);
         if (g.length == 1) {
             g = "0" + g;
         }
-        var b = Math.round(blue).toString(16);
         if (b.length == 1) {
             b = "0" + b;
         }
         rgb.hex = "#" + r + g + b;
         return rgb;
-    };
-    R.rgb2hsb = function (red, green, blue) {
+    }, R);
+    R.rgb2hsb = cacher(function (red, green, blue) {
         if (typeof red == "object" && "r" in red && "g" in red && "b" in red) {
             blue = red.b;
             green = red.g;
@@ -118,12 +121,39 @@ window.Raphael = (function () {
             }
         }
         return {h: hue, s: saturation, b: brightness};
+    }, R);
+    R._path2string = function () {
+        var res = "",
+            item;
+        for (var i = 0, ii = this.length; i < ii; i++) {
+            for (var j = 0, jj = this[i].length; j < jj; j++) {
+                res += this[i][j];
+                j && j != jj - 1 && (res += ",");
+            }
+            i != ii - 1 && (res += "\n");
+        }
+        return res.replace(/,(?=-)/g, "");
     };
-    var getRGBcache = {}, getRGBcount = [];
-    R.getRGB = function (colour) {
-        if (colour in getRGBcache) {
-            return getRGBcache[colour];
+    function cacher(f, scope, postprocessor) {
+        function newf() {
+            var arg = Array.prototype.splice.call(arguments, 0, arguments.length),
+                args = arg.join("\u25ba");
+            newf.cache = newf.cache || {};
+            newf.count = newf.count || [];
+            if (args in newf.cache) {
+                return postprocessor ? postprocessor(newf.cache[args]) : newf.cache[args];
+            }
+            if (newf.count.length > 1000) {
+                delete newf.cache[newf.count.unshift()];
+            }
+            newf.count.push(args);
+            newf.cache[args] = f.apply(scope, arg);
+            return postprocessor ? postprocessor(newf.cache[args]) : newf.cache[args];
         }
+        return newf;
+    }
+
+    R.getRGB = cacher(function (colour) {
         var htmlcolors = {aliceblue: "#f0f8ff", amethyst: "#96c", antiquewhite: "#faebd7", aqua: "#0ff", aquamarine: "#7fffd4", azure: "#f0ffff", beige: "#f5f5dc", bisque: "#ffe4c4", black: "#000", blanchedalmond: "#ffebcd", blue: "#00f", blueviolet: "#8a2be2", brown: "#a52a2a", burlywood: "#deb887", cadetblue: "#5f9ea0", chartreuse: "#7fff00", chocolate: "#d2691e", coral: "#ff7f50", cornflowerblue: "#6495ed", cornsilk: "#fff8dc", crimson: "#dc143c", cyan: "#0ff", darkblue: "#00008b", darkcyan: "#008b8b", darkgoldenrod: "#b8860b", darkgray: "#a9a9a9", darkgreen: "#006400", darkkhaki: "#bdb76b", darkmagenta: "#8b008b", darkolivegreen: "#556b2f", darkorange: "#ff8c00", darkorchid: "#9932cc", darkred: "#8b0000", darksalmon: "#e9967a", darkseagreen: "#8fbc8f", darkslateblue: "#483d8b", darkslategray: "#2f4f4f", darkturquoise: "#00ced1", darkviolet: "#9400d3", deeppink: "#ff1493", deepskyblue: "#00bfff", dimgray: "#696969", dodgerblue: "#1e90ff", firebrick: "#b22222", floralwhite: "#fffaf0", forestgreen: "#228b22", fuchsia: "#f0f", gainsboro: "#dcdcdc", ghostwhite: "#f8f8ff", gold: "#ffd700", goldenrod: "#daa520", gray: "#808080", green: "#008000", greenyellow: "#adff2f", honeydew: "#f0fff0", hotpink: "#ff69b4", indianred: "#cd5c5c", indigo: "#4b0082", ivory: "#fffff0", khaki: "#f0e68c", lavender: "#e6e6fa", lavenderblush: "#fff0f5", lawngreen: "#7cfc00", lemonchiffon: "#fffacd", lightblue: "#add8e6", lightcoral: "#f08080", lightcyan: "#e0ffff", lightgoldenrodyellow: "#fafad2", lightgreen: "#90ee90", lightgrey: "#d3d3d3", lightpink: "#ffb6c1", lightsalmon: "#ffa07a", lightsalmon: "#ffa07a", lightseagreen: "#20b2aa", lightskyblue: "#87cefa", lightslategray: "#789", lightsteelblue: "#b0c4de", lightyellow: "#ffffe0", lime: "#0f0", limegreen: "#32cd32", linen: "#faf0e6", magenta: "#f0f", maroon: "#800000", mediumaquamarine: "#66cdaa", mediumblue: "#0000cd", mediumorchid: "#ba55d3", mediumpurple: "#9370db", mediumseagreen: "#3cb371", mediumslateblue: "#7b68ee", mediumslateblue: "#7b68ee", mediumspringgreen: "#00fa9a", mediumturquoise: "#48d1cc", mediumvioletred: "#c71585", midnightblue: "#191970", mintcream: "#f5fffa", mistyrose: "#ffe4e1", moccasin: "#ffe4b5", navajowhite: "#ffdead", navy: "#000080", oldlace: "#fdf5e6", olive: "#808000", olivedrab: "#6b8e23", orange: "#ffa500", orangered: "#ff4500", orchid: "#da70d6", palegoldenrod: "#eee8aa", palegreen: "#98fb98", paleturquoise: "#afeeee", palevioletred: "#db7093", papayawhip: "#ffefd5", peachpuff: "#ffdab9", peru: "#cd853f", pink: "#ffc0cb", plum: "#dda0dd", powderblue: "#b0e0e6", purple: "#800080", red: "#f00", rosybrown: "#bc8f8f", royalblue: "#4169e1", saddlebrown: "#8b4513", salmon: "#fa8072", sandybrown: "#f4a460", seagreen: "#2e8b57", seashell: "#fff5ee", sienna: "#a0522d", silver: "#c0c0c0", skyblue: "#87ceeb", slateblue: "#6a5acd", slategray: "#708090", snow: "#fffafa", springgreen: "#00ff7f", steelblue: "#4682b4", tan: "#d2b48c", teal: "#008080", thistle: "#d8bfd8", tomato: "#ff6347", turquoise: "#40e0d0", violet: "#ee82ee", wheat: "#f5deb3", white: "#fff", whitesmoke: "#f5f5f5", yellow: "#ff0", yellowgreen: "#9acd32"},
         res;
         if ((colour + "").toLowerCase() in htmlcolors) {
@@ -135,8 +165,10 @@ window.Raphael = (function () {
         if (colour == "none") {
             return {r: -1, g: -1, b: -1, hex: "none"};
         }
-        var red, green, blue,
-            rgb = (colour + "").match(/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|rgb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\)|hsb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hsb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i);
+        var red,
+            green,
+            blue,
+            rgb = (colour + "").match(/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|rgb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\)|hs[bl]\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hs[bl]\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i);
         if (rgb) {
             if (rgb[2]) {
                 blue = parseInt(rgb[2].substring(5), 16);
@@ -174,25 +206,20 @@ window.Raphael = (function () {
                 blue = parseFloat(rgb[2]) * 2.55;
                 return R.hsb2rgb(red, green, blue);
             }
-            var rgb = {r: red, g: green, b: blue};
-            var r = Math.round(red).toString(16);
+            var rgb = {r: red, g: green, b: blue},
+                r = Math.round(red).toString(16),
+                g = Math.round(green).toString(16),
+                b = Math.round(blue).toString(16);
             (r.length == 1) && (r = "0" + r);
-            var g = Math.round(green).toString(16);
             (g.length == 1) && (g = "0" + g);
-            var b = Math.round(blue).toString(16);
             (b.length == 1) && (b = "0" + b);
             rgb.hex = "#" + r + g + b;
             res = rgb;
         } else {
             res = {r: -1, g: -1, b: -1, hex: "none"};
         }
-        if (getRGBcount.length > 20) {
-            delete getRGBcache[getRGBcount.unshift()];
-        }
-        getRGBcount.push(colour);
-        getRGBcache[colour] = res;
         return res;
-    };
+    }, R);
     R.getColor = function (value) {
         var start = this.getColor.start = this.getColor.start || {h: 0, s: 1, b: value || .75},
             rgb = this.hsb2rgb(start.h, start.s, start.b);
@@ -210,26 +237,19 @@ window.Raphael = (function () {
         delete this.start;
     };
     // path utilities
-    var pathcache = {}, pathcount = [];
-    R.parsePathString = function (pathString) {
-        if (pathString in pathcache) {
-            return pathcache[pathString];
+    R.parsePathString = cacher(function (pathString) {
+        if (!pathString) {
+            return null;
         }
         var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, q: 4, s: 4, t: 2, v: 1, z: 0},
-            data = [],
-            toString = function () {
-                var res = "";
-                for (var i = 0, ii = this.length; i < ii; i++) {
-                    res += this[i][0] + this[i].join(",").substring(2);
-                }
-                return res;
-            };
-        if (pathString.toString.toString() == toString.toString()) {
-            data = pathString;
+            data = [];
+        if (R.isArray(pathString) && R.isArray(pathString[0])) { // rough assumption
+            data = pathClone(pathString);
         }
         if (!data.length) {
-            pathString.replace(/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig, function (a, b, c) {
-                var params = [], name = b.toLowerCase();
+            (pathString + "").replace(/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig, function (a, b, c) {
+                var params = [],
+                    name = b.toLowerCase();
                 c.replace(/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig, function (a, b) {
                     b && params.push(+b);
                 });
@@ -240,68 +260,69 @@ window.Raphael = (function () {
                     };
                 }
             });
-            data.toString = toString;
         }
-        if (pathcount.length > 20) {
-            delete pathcache[pathcount.unshift()];
-        }
-        pathcount.push(pathString);
-        pathcache[pathString] = data;
+        data.toString = R._path2string;
         return data;
-    };
-    var pathDimensions = function (path) {
-        var pathArray = path;
-        if (typeof path == "string") {
-            pathArray = R.parsePathString(path);
+    });
+    var pathDimensions = cacher(function (path) {
+        if (!path) {
+            return {x: 0, y: 0, width: 0, height: 0};
         }
-        pathArray = pathToAbsolute(pathArray);
-        var x = [], y = [], length = 0;
-        for (var i = 0, ii = pathArray.length; i < ii; i++) {
-            var pa = pathArray[i];
-            switch (pa[0]) {
-                case "Z":
-                    break;
-                case "A":
-                    x.push(pa[pa.length - 2]);
-                    y.push(pa[pa.length - 1]);
-                    break;
-                default:
-                    for (var j = 1, jj = pa.length; j < jj; j++) {
-                        (j % 2 ? x : y).push(pa[j]);
-                    }
+        path = path2curve(path);
+        var x = 0, 
+            y = 0,
+            X = [],
+            Y = [];
+        for (var i = 0, ii = path.length; i < ii; i++) {
+            if (path[i][0] == "M") {
+                x = path[i][1];
+                y = path[i][2];
+                X.push(x);
+                Y.push(y);
+            } else {
+                var dim = curveDim(x, y, path[i][1], path[i][2], path[i][3], path[i][4], path[i][5], path[i][6]);
+                X = X.concat(dim.min.x, dim.max.x);
+                Y = Y.concat(dim.min.y, dim.max.y);
             }
         }
-        var minx = Math.min.apply(Math, x),
-            miny = Math.min.apply(Math, y);
-        if (!x.length) {
-            return {
-                x: 0,
-                y: 0,
-                width: 0,
-                height: 0,
-                X: 0,
-                Y: 0
-            };
-        } else {
-            return {
-                x: minx,
-                y: miny,
-                width: Math.max.apply(Math, x) - minx,
-                height: Math.max.apply(Math, y) - miny,
-                X: x,
-                Y: y
-            };
-        }
-    },
-        pathToRelative = function (pathArray) {
+        var xmin = Math.min.apply(0, X),
+            ymin = Math.min.apply(0, Y);
+        return {
+            x: xmin,
+            y: ymin,
+            width: Math.max.apply(0, X) - xmin,
+            height: Math.max.apply(0, Y) - ymin
+        };
+    }),
+        pathClone = function (pathArray) {
             var res = [];
-            if (typeof pathArray == "string") {
+            if (!R.isArray(pathArray) || !R.isArray(pathArray && pathArray[0])) { // rough assumption
+                pathArray = R.parsePathString(pathArray);
+            }
+            for (var i = 0, ii = pathArray.length; i < ii; i++) {
+                res[i] = [];
+                for (var j = 0, jj = pathArray[i].length; j < jj; j++) {
+                    res[i][j] = pathArray[i][j];
+                }
+            }
+            res.toString = R._path2string;
+            return res;
+        },
+        pathToRelative = cacher(function (pathArray) {
+            if (!R.isArray(pathArray) || !R.isArray(pathArray && pathArray[0])) { // rough assumption
                 pathArray = R.parsePathString(pathArray);
             }
-            var x = 0, y = 0, start = 0;
+            var res = [],
+                x = 0,
+                y = 0,
+                mx = 0,
+                my = 0,
+                start = 0;
             if (pathArray[0][0] == "M") {
                 x = pathArray[0][1];
                 y = pathArray[0][2];
+                mx = x;
+                my = y;
                 start++;
                 res.push(["M", x, y]);
             }
@@ -314,15 +335,18 @@ window.Raphael = (function () {
                         case "a":
                             r[1] = pa[1];
                             r[2] = pa[2];
-                            r[3] = 0;
+                            r[3] = pa[3];
                             r[4] = pa[4];
                             r[5] = pa[5];
                             r[6] = +(pa[6] - x).toFixed(3);
                             r[7] = +(pa[7] - y).toFixed(3);
                             break;
                         case "v":
-                            r[1] = (pa[1] - y).toFixed(3);
+                            r[1] = +(pa[1] - y).toFixed(3);
                             break;
+                        case "m":
+                            mx = pa[1];
+                            my = pa[2];
                         default:
                             for (var j = 1, jj = pa.length; j < jj; j++) {
                                 r[j] = +(pa[j] - ((j % 2) ? x : y)).toFixed(3);
@@ -330,38 +354,49 @@ window.Raphael = (function () {
                     }
                 } else {
                     r = res[i] = [];
+                    if (pa[0] == "m") {
+                        mx = pa[1] + x;
+                        my = pa[2] + y;
+                    }
                     for (var k = 0, kk = pa.length; k < kk; k++) {
                         res[i][k] = pa[k];
                     }
                 }
+                var len = res[i].length;
                 switch (res[i][0]) {
                     case "z":
+                        x = mx;
+                        y = my;
                         break;
                     case "h":
-                        x += res[i][res[i].length - 1];
+                        x += +res[i][len - 1];
                         break;
                     case "v":
-                        y += res[i][res[i].length - 1];
+                        y += +res[i][len - 1];
                         break;
                     default:
-                        x += res[i][res[i].length - 2];
-                        y += res[i][res[i].length - 1];
+                        x += +res[i][len - 2];
+                        y += +res[i][len - 1];
                 }
             }
-            res.toString = pathArray.toString;
+            res.toString = R._path2string;
             return res;
-        },
-        pathToAbsolute = function (pathArray) {
-            var res = [];
-            if (typeof pathArray == "string") {
+        }, 0, pathClone),
+        pathToAbsolute = cacher(function (pathArray) {
+            if (!R.isArray(pathArray) || !R.isArray(pathArray && pathArray[0])) { // rough assumption
                 pathArray = R.parsePathString(pathArray);
             }
-            var x = 0,
+            var res = [],
+                x = 0,
                 y = 0,
+                mx = 0,
+                my = 0,
                 start = 0;
             if (pathArray[0][0] == "M") {
                 x = +pathArray[0][1];
                 y = +pathArray[0][2];
+                mx = x;
+                my = y;
                 start++;
                 res[0] = ["M", x, y];
             }
@@ -374,11 +409,11 @@ window.Raphael = (function () {
                         case "A":
                             r[1] = pa[1];
                             r[2] = pa[2];
-                            r[3] = 0;
+                            r[3] = pa[3];
                             r[4] = pa[4];
                             r[5] = pa[5];
-                            r[6] = +(pa[6] + x).toFixed(3);
-                            r[7] = +(pa[7] + y).toFixed(3);
+                            r[6] = +(pa[6] + x);
+                            r[7] = +(pa[7] + y);
                             break;
                         case "V":
                             r[1] = +pa[1] + y;
@@ -386,19 +421,23 @@ window.Raphael = (function () {
                         case "H":
                             r[1] = +pa[1] + x;
                             break;
+                        case "M":
+                            mx = +pa[1] + x;
+                            my = +pa[2] + y;
                         default:
                             for (var j = 1, jj = pa.length; j < jj; j++) {
                                 r[j] = +pa[j] + ((j % 2) ? x : y);
                             }
                     }
                 } else {
-                    r = res[i] = [];
                     for (var k = 0, kk = pa.length; k < kk; k++) {
                         res[i][k] = pa[k];
                     }
                 }
                 switch (r[0]) {
                     case "Z":
+                        x = mx;
+                        y = my;
                         break;
                     case "H":
                         x = r[1];
@@ -411,196 +450,323 @@ window.Raphael = (function () {
                         y = res[i][res[i].length - 1];
                 }
             }
-            res.toString = pathArray.toString;
+            res.toString = R._path2string;
             return res;
+        }, null, pathClone),
+        l2c = function (x1, y1, x2, y2) {
+            return [x1, y1, x2, y2, x2, y2];
+        },
+        q2c = function (x1, y1, ax, ay, x2, y2) {
+            return [
+                    2 / 3 * x1 + 1 / 3 * ax,
+                    2 / 3 * y1 + 1 / 3 * ay,
+                    2 / 3 * x1 + 1 / 3 * x2,
+                    2 / 3 * y1 + 1 / 3 * y2,
+                    x2,
+                    y2
+                ];
         },
-        pecache = {}, pecount = [],
-        pathEqualiser = function (path1, path2) {
-            if ((path1 + path2) in pecache) {
-                return pecache[path1 + path2];
+        a2c = function (x1, y1, rx, ry, angle, large_arc_flag, sweep_flag, x2, y2, recursive) {
+            // for more information of where this math came from visit:
+            // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
+            var _120 = Math.PI * 120 / 180,
+                rad = Math.PI / 180 * (+angle || 0),
+                res = [],
+                xy,
+                rotate = cacher(function (x, y, rad) {
+                    var X = x * Math.cos(rad) - y * Math.sin(rad),
+                        Y = x * Math.sin(rad) + y * Math.cos(rad);
+                    return {x: X, y: Y};
+                });
+            if (!recursive) {
+                xy = rotate(x1, y1, -rad);
+                x1 = xy.x;
+                y1 = xy.y;
+                xy = rotate(x2, y2, -rad);
+                x2 = xy.x;
+                y2 = xy.y;
+                var cos = Math.cos(Math.PI / 180 * angle),
+                    sin = Math.sin(Math.PI / 180 * angle),
+                    x = (x1 - x2) / 2,
+                    y = (y1 - y2) / 2;
+                rx = Math.max(rx, Math.abs(x));
+                ry = Math.max(ry, Math.abs(y));
+                var rx2 = rx * rx,
+                    ry2 = ry * ry,
+                    k = (large_arc_flag == sweep_flag ? -1 : 1) *
+                        Math.sqrt(Math.abs((rx2 * ry2 - rx2 * y * y - ry2 * x * x) / (rx2 * y * y + ry2 * x * x))),
+                    cx = k * rx * y / ry + (x1 + x2) / 2,
+                    cy = k * -ry * x / rx + (y1 + y2) / 2,
+                    f1 = Math.asin((y1 - cy) / ry),
+                    f2 = Math.asin((y2 - cy) / ry);
+
+                f1 = x1 < cx ? Math.PI - f1 : f1;
+                f2 = x2 < cx ? Math.PI - f2 : f2;
+                f1 < 0 && (f1 = Math.PI * 2 + f1);
+                f2 < 0 && (f2 = Math.PI * 2 + f2);
+                if (sweep_flag && f1 > f2) {
+                    f1 = f1 - Math.PI * 2;
+                }
+                if (!sweep_flag && f2 > f1) {
+                    f2 = f2 - Math.PI * 2;
+                }
+            } else {
+                f1 = recursive[0];
+                f2 = recursive[1];
+                cx = recursive[2];
+                cy = recursive[3];
+            }
+            var df = f2 - f1;
+            if (Math.abs(df) > _120) {
+                var f2old = f2,
+                    x2old = x2,
+                    y2old = y2;
+                f2 = f1 + _120 * (sweep_flag && f2 > f1 ? 1 : -1);
+                x2 = cx + rx * Math.cos(f2);
+                y2 = cy + ry * Math.sin(f2);
+                res = a2c(x2, y2, rx, ry, angle, 0, sweep_flag, x2old, y2old, [f2, f2old, cx, cy]);
+            }
+            var c1 = Math.cos(f1),
+                s1 = Math.sin(f1),
+                c2 = Math.cos(f2),
+                s2 = Math.sin(f2),
+                df = f2 - f1,
+                t = Math.tan(df / 4),
+                hx = 4 / 3 * rx * t,
+                hy = 4 / 3 * ry * t,
+                m1 = [x1, y1],
+                m2 = [x1 + hx * s1, y1 - hy * c1],
+                m3 = [x2 + hx * s2, y2 - hy * c2],
+                m4 = [x2, y2];
+            m2[0] = 2 * m1[0] - m2[0];
+            m2[1] = 2 * m1[1] - m2[1];
+            if (recursive) {
+                return [m2, m3, m4].concat(res);
+            } else {
+                res = [m2, m3, m4].concat(res).join(",").split(",");
+                var newres = [];
+                for (var i = 0, ii = res.length; i < ii; i++) {
+                    newres[i] = i % 2 ? rotate(res[i - 1], res[i], rad).y : rotate(res[i], res[i + 1], rad).x;
+                }
+                return newres;
             }
-            var data = [pathToAbsolute(R.parsePathString(path1)), pathToAbsolute(R.parsePathString(path2))],
-                attrs = [{x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0}, {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0}],
+        },
+        findDotAtSegment = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
+            var x = Math.pow(1 - t, 3) * p1x + Math.pow(1 - t, 2) * 3 * t * c1x + (1 - t) * 3 * t * t * c2x + Math.pow(t, 3) * p2x,
+                y = Math.pow(1 - t, 3) * p1y + Math.pow(1 - t, 2) * 3 * t * c1y + (1 - t) * 3 * t * t * c2y + Math.pow(t, 3) * p2y,
+                mx = p1x + 2 * t * (c1x - p1x) + t * t * (c2x - 2 * c1x + p1x),
+                my = p1y + 2 * t * (c1y - p1y) + t * t * (c2y - 2 * c1y + p1y),
+                nx = c1x + 2 * t * (c2x - c1x) + t * t * (p2x - 2 * c2x + c1x),
+                ny = c1y + 2 * t * (c2y - c1y) + t * t * (p2y - 2 * c2y + c1y),
+                ax = (1 - t) * p1x + t * c1x,
+                ay = (1 - t) * p1y + t * c1y,
+                cx = (1 - t) * c2x + t * p2x,
+                cy = (1 - t) * c2y + t * p2y;
+            return {x: x, y: y, m: {x: mx, y: my}, n: {x: nx, y: ny}, start: {x: ax, y: ay}, end: {x: cx, y: cy}};
+        }),
+        curveDim = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
+            var a = (c2x - 2 * c1x + p1x) - (p2x - 2 * c2x + c1x),
+                b = 2 * (c1x - p1x) - 2 * (c2x - c1x),
+                c = p1x - c1x,
+                t1 = (-b + Math.sqrt(b * b - 4 * a * c)) / 2 / a,
+                t2 = (-b - Math.sqrt(b * b - 4 * a * c)) / 2 / a,
+                y = [p1y, p2y],
+                x = [p1x, p2x],
+                dot1 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1 > 0 && t1 < 1 ? t1 : 0),
+                dot2 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2 > 0 && t2 < 1 ? t2 : 0);
+            x = x.concat(dot1.x, dot2.x);
+            y = y.concat(dot1.y, dot2.y);
+            a = (c2y - 2 * c1y + p1y) - (p2y - 2 * c2y + c1y);
+            b = 2 * (c1y - p1y) - 2 * (c2y - c1y);
+            c = p1y - c1y;
+            t1 = (-b + Math.sqrt(b * b - 4 * a * c)) / 2 / a;
+            t2 = (-b - Math.sqrt(b * b - 4 * a * c)) / 2 / a;
+            dot1 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1 > 0 && t1 < 1 ? t1 : 0);
+            dot2 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2 > 0 && t2 < 1 ? t2 : 0);
+            x = x.concat(dot1.x, dot2.x);
+            y = y.concat(dot1.y, dot2.y);
+            return {
+                min: {x: Math.min.apply(Math, x), y: Math.min.apply(Math, y)},
+                max: {x: Math.max.apply(Math, x), y: Math.max.apply(Math, y)}
+            };
+        }),
+        path2curve = cacher(function (path, path2) {
+            var p = pathToAbsolute(path),
+                p2 = path2 && pathToAbsolute(path2),
+                attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0},
+                attrs2 = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0},
                 processPath = function (path, d) {
                     if (!path) {
-                        return ["U"];
+                        return ["C", d.x, d.y, d.x, d.y, d.x, d.y];
                     }
                     switch (path[0]) {
                         case "M":
                             d.X = path[1];
                             d.Y = path[2];
                             break;
+                        case "A":
+                            path = ["C"].concat(a2c(d.x, d.y, path[1], path[2], path[3], path[4], path[5], path[6], path[7]));
+                            break;
                         case "S":
-                            var nx = d.x + (d.x - (d.bx || d.x));
-                            var ny = d.y + (d.y - (d.by || d.y));
+                            var nx = d.x + (d.x - (d.bx || d.x)),
+                                ny = d.y + (d.y - (d.by || d.y));
                             path = ["C", nx, ny, path[1], path[2], path[3], path[4]];
                             break;
                         case "T":
-                            var nx = d.x + (d.x - (d.bx || d.x));
-                            var ny = d.y + (d.y - (d.by || d.y));
-                            path = ["Q", nx, ny, path[1], path[2]];
+                            var nx = d.x + (d.x - (d.bx || d.x)),
+                                ny = d.y + (d.y - (d.by || d.y));
+                            path = ["C"].concat(q2c(d.x, d.y, nx, ny, path[1], path[2]));
+                            break;
+                        case "Q":
+                            path = ["C"].concat(q2c(d.x, d.y, path[1], path[2], path[3], path[4]));
+                            break;
+                        case "L":
+                            path = ["C"].concat(l2c(d.x, d.y, path[1], path[2]));
                             break;
                         case "H":
-                            path = ["L", path[1], d.y];
+                            path = ["C"].concat(l2c(d.x, d.y, path[1], d.y));
                             break;
                         case "V":
-                            path = ["L", d.x, path[1]];
+                            path = ["C"].concat(l2c(d.x, d.y, d.x, path[1]));
                             break;
                         case "Z":
-                            path = ["L", d.X, d.Y];
+                            path = ["C"].concat(l2c(d.x, d.y, d.X, d.Y));
                             break;
                     }
                     return path;
                 },
-                edgeCases = function (a, b, i) {
-                    if (data[a][i][0] == "M" && data[b][i][0] != "M") {
-                        data[b].splice(i, 0, ["M", attrs[b].x, attrs[b].y]);
-                        attrs[a].bx = data[a][i][data[a][i].length - 4] || 0;
-                        attrs[a].by = data[a][i][data[a][i].length - 3] || 0;
-                        attrs[a].x = data[a][i][data[a][i].length - 2];
-                        attrs[a].y = data[a][i][data[a][i].length - 1];
-                        return true;
-                    } else if (data[a][i][0] == "L" && data[b][i][0] == "C") {
-                        data[a][i] = ["C", attrs[a].x, attrs[a].y, data[a][i][1], data[a][i][2], data[a][i][1], data[a][i][2]];
-                    } else if (data[a][i][0] == "L" && data[b][i][0] == "Q") {
-                        data[a][i] = ["Q", data[a][i][1], data[a][i][2], data[a][i][1], data[a][i][2]];
-                    } else if (data[a][i][0] == "Q" && data[b][i][0] == "C") {
-                        var x = data[b][i][data[b][i].length - 2];
-                        var y = data[b][i][data[b][i].length - 1];
-                        data[b].splice(i + 1, 0, ["Q", x, y, x, y]);
-                        data[a].splice(i, 0, ["C", attrs[a].x, attrs[a].y, attrs[a].x, attrs[a].y, attrs[a].x, attrs[a].y]);
-                        i++;
-                        attrs[b].bx = data[b][i][data[b][i].length - 4] || 0;
-                        attrs[b].by = data[b][i][data[b][i].length - 3] || 0;
-                        attrs[b].x = data[b][i][data[b][i].length - 2];
-                        attrs[b].y = data[b][i][data[b][i].length - 1];
-                        return true;
-                    } else if (data[a][i][0] == "A" && data[b][i][0] == "C") {
-                        var x = data[b][i][data[b][i].length - 2];
-                        var y = data[b][i][data[b][i].length - 1];
-                        data[b].splice(i + 1, 0, ["A", 0, 0, data[a][i][3], data[a][i][4], data[a][i][5], x, y]);
-                        data[a].splice(i, 0, ["C", attrs[a].x, attrs[a].y, attrs[a].x, attrs[a].y, attrs[a].x, attrs[a].y]);
-                        i++;
-                        attrs[b].bx = data[b][i][data[b][i].length - 4] || 0;
-                        attrs[b].by = data[b][i][data[b][i].length - 3] || 0;
-                        attrs[b].x = data[b][i][data[b][i].length - 2];
-                        attrs[b].y = data[b][i][data[b][i].length - 1];
-                        return true;
-                    } else if (data[a][i][0] == "U") {
-                        data[a][i][0] = data[b][i][0];
-                        for (var j = 1, jj = data[b][i].length; j < jj; j++) {
-                            data[a][i][j] = (j % 2) ? attrs[a].x : attrs[a].y;
+                fixArc = function (pp, i) {
+                    if (pp[i].length > 7) {
+                        pp[i].shift();
+                        var pi = pp[i];
+                        while (pi.length) {
+                            pp.splice(i++, 0, ["C"].concat(pi.splice(0, 6)));
                         }
+                        pp.splice(i, 1);
+                        ii = Math.max(p.length, p2 && p2.length || 0);
+                    }
+                },
+                fixM = function (path1, path2, a1, a2, i) {
+                    if (path1 && path2 && path1[i][0] == "M" && path2[i][0] != "M") {
+                        path2.splice(i, 0, ["M", a2.x, a2.y]);
+                        a1.bx = 0;
+                        a1.by = 0;
+                        a1.x = path1[i][1];
+                        a1.y = path1[i][2];
+                        ii = Math.max(p.length, p2 && p2.length || 0);
                     }
-                    return false;
                 };
-            for (var i = 0; i < Math.max(data[0].length, data[1].length); i++) {
-                data[0][i] = processPath(data[0][i], attrs[0]);
-                data[1][i] = processPath(data[1][i], attrs[1]);
-                if (data[0][i][0] != data[1][i][0] && (edgeCases(0, 1, i) || edgeCases(1, 0, i))) {
-                    continue;
-                }
-                attrs[0].bx = data[0][i][data[0][i].length - 4] || 0;
-                attrs[0].by = data[0][i][data[0][i].length - 3] || 0;
-                attrs[0].x = data[0][i][data[0][i].length - 2];
-                attrs[0].y = data[0][i][data[0][i].length - 1];
-                attrs[1].bx = data[1][i][data[1][i].length - 4] || 0;
-                attrs[1].by = data[1][i][data[1][i].length - 3] || 0;
-                attrs[1].x = data[1][i][data[1][i].length - 2];
-                attrs[1].y = data[1][i][data[1][i].length - 1];
-            }
-            if (pecount.length > 20) {
-                delete pecache[pecount.unshift()];
-            }
-            pecount.push(path1 + path2);
-            pecache[path1 + path2] = data;
-            return data;
-        },
-        toGradient = function (gradient) {
-        if (typeof gradient == "string") {
-            gradient = gradient.split(/\s*\-\s*/);
-            var angle = gradient.shift();
-            if (angle.toLowerCase() == "v") {
-                angle = 90;
-            } else if (angle.toLowerCase() == "h") {
-                angle = 0;
-            } else {
-                angle = parseFloat(angle);
-            }
-            angle = -angle;
-            var grobj = {angle: angle, type: "linear", dots: [], vector: [0, 0, Math.cos(angle * Math.PI / 180).toFixed(3), Math.sin(angle * Math.PI / 180).toFixed(3)]};
-            var max = 1 / (Math.max(Math.abs(grobj.vector[2]), Math.abs(grobj.vector[3])) || 1);
-            grobj.vector[2] *= max;
-            grobj.vector[3] *= max;
-            if (grobj.vector[2] < 0) {
-                grobj.vector[0] = -grobj.vector[2];
-                grobj.vector[2] = 0;
-            }
-            if (grobj.vector[3] < 0) {
-                grobj.vector[1] = -grobj.vector[3];
-                grobj.vector[3] = 0;
-            }
-            grobj.vector[0] = grobj.vector[0].toFixed(3);
-            grobj.vector[1] = grobj.vector[1].toFixed(3);
-            grobj.vector[2] = grobj.vector[2].toFixed(3);
-            grobj.vector[3] = grobj.vector[3].toFixed(3);
-            for (var i = 0, ii = gradient.length; i < ii; i++) {
-                var dot = {};
-                var par = gradient[i].match(/^([^:]*):?([\d\.]*)/);
-                dot.color = R.getRGB(par[1]).hex;
-                par[2] && (dot.offset = par[2] + "%");
-                grobj.dots.push(dot);
-            }
-            for (var i = 1, ii = grobj.dots.length - 1; i < ii; i++) {
-                if (!grobj.dots[i].offset) {
-                    var start = parseFloat(grobj.dots[i - 1].offset || 0),
-                        end = false;
-                    for (var j = i + 1; j < ii; j++) {
-                        if (grobj.dots[j].offset) {
-                            end = grobj.dots[j].offset;
-                            break;
+            for (var i = 0, ii = Math.max(p.length, p2 && p2.length || 0); i < ii; i++) {
+                p[i] = processPath(p[i], attrs);
+                fixArc(p, i);
+                p2 && (p2[i] = processPath(p2[i], attrs2));
+                p2 && fixArc(p2, i);
+                fixM(p, p2, attrs, attrs2, i);
+                fixM(p2, p, attrs2, attrs, i);
+                var seg = p[i],
+                    seg2 = p2 && p2[i],
+                    seglen = seg.length,
+                    seg2len = p2 && seg2.length;
+                attrs.bx = seg[seglen - 4] || 0;
+                attrs.by = seg[seglen - 3] || 0;
+                attrs.x = seg[seglen - 2];
+                attrs.y = seg[seglen - 1];
+                attrs2.bx = p2 && (seg2[seg2len - 4] || 0);
+                attrs2.by = p2 && (seg2[seg2len - 3] || 0);
+                attrs2.x = p2 && seg2[seg2len - 2];
+                attrs2.y = p2 && seg2[seg2len - 1];
+            }
+            return p2 ? [p, p2] : p;
+        }, null, pathClone),
+        toGradient = cacher(function (gradient) {
+            if (typeof gradient == "string") {
+                gradient = gradient.split(/\s*\-\s*/);
+                var angle = gradient.shift();
+                if (angle.toLowerCase() == "v") {
+                    angle = 90;
+                } else if (angle.toLowerCase() == "h") {
+                    angle = 0;
+                } else {
+                    angle = parseFloat(angle);
+                }
+                angle = -angle;
+                var grobj = {angle: angle, type: "linear", dots: [], vector: [0, 0, Math.cos(angle * Math.PI / 180).toFixed(3), Math.sin(angle * Math.PI / 180).toFixed(3)]},
+                    max = 1 / (Math.max(Math.abs(grobj.vector[2]), Math.abs(grobj.vector[3])) || 1);
+                grobj.vector[2] *= max;
+                grobj.vector[3] *= max;
+                if (grobj.vector[2] < 0) {
+                    grobj.vector[0] = -grobj.vector[2];
+                    grobj.vector[2] = 0;
+                }
+                if (grobj.vector[3] < 0) {
+                    grobj.vector[1] = -grobj.vector[3];
+                    grobj.vector[3] = 0;
+                }
+                grobj.vector[0] = grobj.vector[0];
+                grobj.vector[1] = grobj.vector[1];
+                grobj.vector[2] = grobj.vector[2];
+                grobj.vector[3] = grobj.vector[3];
+                for (var i = 0, ii = gradient.length; i < ii; i++) {
+                    var dot = {},
+                        par = gradient[i].match(/^([^:]*):?([\d\.]*)/);
+                    dot.color = R.getRGB(par[1]).hex;
+                    par[2] && (dot.offset = par[2] + "%");
+                    grobj.dots.push(dot);
+                }
+                for (var i = 1, ii = grobj.dots.length - 1; i < ii; i++) {
+                    if (!grobj.dots[i].offset) {
+                        var start = parseFloat(grobj.dots[i - 1].offset || 0),
+                            end = false;
+                        for (var j = i + 1; j < ii; j++) {
+                            if (grobj.dots[j].offset) {
+                                end = grobj.dots[j].offset;
+                                break;
+                            }
+                        }
+                        if (!end) {
+                            end = 100;
+                            j = ii;
+                        }
+                        end = parseFloat(end);
+                        var d = (end - start) / (j - i + 1);
+                        for (; i < j; i++) {
+                            start += d;
+                            grobj.dots[i].offset = start + "%";
                         }
-                    }
-                    if (!end) {
-                        end = 100;
-                        j = ii;
-                    }
-                    end = parseFloat(end);
-                    var d = (end - start) / (j - i + 1);
-                    for (; i < j; i++) {
-                        start += d;
-                        grobj.dots[i].offset = start + "%";
                     }
                 }
+                return grobj;
+            } else {
+                return gradient;
             }
-            return grobj;
-        } else {
-            return gradient;
-        }
-    },
+        }),
         getContainer = function () {
-        var container, x, y, width, height;
-        if (typeof arguments[0] == "string" || typeof arguments[0] == "object") {
-            if (typeof arguments[0] == "string") {
-                container = doc.getElementById(arguments[0]);
-            } else {
-                container = arguments[0];
-            }
-            if (container.tagName) {
-                if (arguments[1] == null) {
-                    return {
-                        container: container,
-                        width: container.style.pixelWidth || container.offsetWidth,
-                        height: container.style.pixelHeight || container.offsetHeight
-                    };
+            var container,
+                x,
+                y,
+                width,
+                height;
+            if (typeof arguments[0] == "string" || typeof arguments[0] == "object") {
+                if (typeof arguments[0] == "string") {
+                    container = doc.getElementById(arguments[0]);
                 } else {
-                    return {container: container, width: arguments[1], height: arguments[2]};
+                    container = arguments[0];
+                }
+                if (container.tagName) {
+                    if (arguments[1] == null) {
+                        return {
+                            container: container,
+                            width: container.style.pixelWidth || container.offsetWidth,
+                            height: container.style.pixelHeight || container.offsetHeight
+                        };
+                    } else {
+                        return {container: container, width: arguments[1], height: arguments[2]};
+                    }
                 }
+            } else if (typeof arguments[0] == "number" && arguments.length > 3) {
+                return {container: 1, x: arguments[0], y: arguments[1], width: arguments[2], height: arguments[3]};
             }
-        } else if (typeof arguments[0] == "number" && arguments.length > 3) {
-            return {container: 1, x: arguments[0], y: arguments[1], width: arguments[2], height: arguments[3]};
-        }
-    },
+        },
         plugins = function (con, add) {
             var that = this;
             for (var prop in add) if (add.hasOwnProperty(prop) && !(prop in con)) {
@@ -623,207 +789,49 @@ window.Raphael = (function () {
 
     // SVG
     if (R.svg) {
-        R.toString = function () {
-            return  "Your browser supports SVG.\nYou are running Rapha\u00ebl " + this.version;
+        var round = function (num) {
+            return +num + (Math.floor(num) == num) * .5;
         };
-        var thePath = function (params, pathString, SVG) {
-            var el = doc.createElementNS(SVG.svgns, "path");
-            if (SVG.canvas) {
-                SVG.canvas.appendChild(el);
-            }
-            var p = new Element(el, SVG);
-            p.isAbsolute = true;
-            p.type = "path";
-            p.last = {x: 0, y: 0, bx: 0, by: 0};
-            p.absolutely = function () {
-                this.isAbsolute = true;
-                return this;
-            };
-            p.relatively = function () {
-                this.isAbsolute = false;
-                return this;
-            };
-            p.moveTo = function (x, y) {
-                var d = this.isAbsolute?"M":"m";
-                d += parseFloat(x).toFixed(3) + " " + parseFloat(y).toFixed(3) + " ";
-                var oldD = this[0].getAttribute("d") || "";
-                (oldD == "M0,0") && (oldD = "");
-                this[0].setAttribute("d", oldD + d);
-                this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x);
-                this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y);
-                this.attrs.path = oldD + d;
-                return this;
-            };
-            p.lineTo = function (x, y) {
-                this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x);
-                this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y);
-                var d = this.isAbsolute?"L":"l";
-                d += parseFloat(x).toFixed(3) + " " + parseFloat(y).toFixed(3) + " ";
-                var oldD = this[0].getAttribute("d") || "";
-                this[0].setAttribute("d", oldD + d);
-                this.attrs.path = oldD + d;
-                return this;
-            };
-            p.arcTo = function (rx, ry, large_arc_flag, sweep_flag, x, y) {
-                var d = this.isAbsolute ? "A" : "a";
-                d += [parseFloat(rx).toFixed(3), parseFloat(ry).toFixed(3), 0, large_arc_flag, sweep_flag, parseFloat(x).toFixed(3), parseFloat(y).toFixed(3)].join(" ");
-                var oldD = this[0].getAttribute("d") || "";
-                this[0].setAttribute("d", oldD + d);
-                this.last.x = parseFloat(x);
-                this.last.y = parseFloat(y);
-                this.attrs.path = oldD + d;
-                return this;
-            };
-            p.cplineTo = function (x1, y1, w1) {
-                if (!w1) {
-                    return this.lineTo(x1, y1);
-                } else {
-                    var p = {};
-                    var x = parseFloat(x1);
-                    var y = parseFloat(y1);
-                    var w = parseFloat(w1);
-                    var d = this.isAbsolute?"C":"c";
-                    var attr = [+this.last.x + w, +this.last.y, x - w, y, x, y];
-                    for (var i = 0, ii = attr.length; i < ii; i++) {
-                        d += attr[i].toFixed(3) + " ";
+        var roundPath = function (path) {
+            for (var i = 0, ii = path.length; i < ii; i++) {
+                if (path[i][0].toLowerCase() != "a") {
+                    for (var j = 1, jj = path[i].length; j < jj; j++) {
+                        path[i][j] = round(path[i][j]);
                     }
-                    this.last.x = (this.isAbsolute ? 0 : this.last.x) + attr[4];
-                    this.last.y = (this.isAbsolute ? 0 : this.last.y) + attr[5];
-                    this.last.bx = attr[2];
-                    this.last.by = attr[3];
-                    var oldD = this[0].getAttribute("d") || "";
-                    this[0].setAttribute("d", oldD + d);
-                    this.attrs.path = oldD + d;
-                    return this;
-                }
-            };
-            p.curveTo = function () {
-                var p = {},
-                    command = [0, 1, 2, 3, "s", 5, "c"];
-
-                var d = command[arguments.length];
-                if (this.isAbsolute) {
-                    d = d.toUpperCase();
-                }
-                for (var i = 0, ii = arguments.length; i < ii; i++) {
-                    d += parseFloat(arguments[i]).toFixed(3) + " ";
-                }
-                this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[arguments.length - 2]);
-                this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[arguments.length - 1]);
-                this.last.bx = parseFloat(arguments[arguments.length - 4]);
-                this.last.by = parseFloat(arguments[arguments.length - 3]);
-                var oldD = this.node.getAttribute("d") || "";
-                this.node.setAttribute("d", oldD + d);
-                this.attrs.path = oldD + d;
-                return this;
-            };
-            p.qcurveTo = function () {
-                var p = {},
-                    command = [0, 1, "t", 3, "q"];
-
-                var d = command[arguments.length];
-                if (this.isAbsolute) {
-                    d = d.toUpperCase();
-                }
-                for (var i = 0, ii = arguments.length; i < ii; i++) {
-                    d += parseFloat(arguments[i]).toFixed(3) + " ";
-                }
-                this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[arguments.length - 2]);
-                this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[arguments.length - 1]);
-                if (arguments.length != 2) {
-                    this.last.qx = parseFloat(arguments[arguments.length - 4]);
-                    this.last.qy = parseFloat(arguments[arguments.length - 3]);
-                }
-                var oldD = this.node.getAttribute("d") || "";
-                this.node.setAttribute("d", oldD + d);
-                this.attrs.path = oldD + d;
-                return this;
-            };
-            p.addRoundedCorner = function (r, dir) {
-                var R = .5522 * r, rollback = this.isAbsolute, o = this;
-                if (rollback) {
-                    this.relatively();
-                    rollback = function () {
-                        o.absolutely();
-                    };
                 } else {
-                    rollback = function () {};
+                    path[i][6] = round(path[i][6]);
+                    path[i][7] = round(path[i][7]);
                 }
-                var actions = {
-                    l: function () {
-                        return {
-                            u: function () {
-                                o.curveTo(-R, 0, -r, -(r - R), -r, -r);
-                            },
-                            d: function () {
-                                o.curveTo(-R, 0, -r, r - R, -r, r);
-                            }
-                        };
-                    },
-                    r: function () {
-                        return {
-                            u: function () {
-                                o.curveTo(R, 0, r, -(r - R), r, -r);
-                            },
-                            d: function () {
-                                o.curveTo(R, 0, r, r - R, r, r);
-                            }
-                        };
-                    },
-                    u: function () {
-                        return {
-                            r: function () {
-                                o.curveTo(0, -R, -(R - r), -r, r, -r);
-                            },
-                            l: function () {
-                                o.curveTo(0, -R, R - r, -r, -r, -r);
-                            }
-                        };
-                    },
-                    d: function () {
-                        return {
-                            r: function () {
-                                o.curveTo(0, R, -(R - r), r, r, r);
-                            },
-                            l: function () {
-                                o.curveTo(0, R, R - r, r, -r, r);
-                            }
-                        };
-                    }
-                };
-                actions[dir[0]]()[dir[1]]();
-                rollback();
-                return o;
-            };
-            p.andClose = function () {
-                var oldD = this[0].getAttribute("d") || "";
-                this[0].setAttribute("d", oldD + "Z ");
-                this.attrs.path = oldD + "Z ";
-                return this;
-            };
-            if (pathString) {
-                p.attrs.path = "" + pathString;
-                p.absolutely();
-                paper.pathfinder(p, p.attrs.path);
             }
-            if (params) {
-                !params.gradient && (params.fill = params.fill || "none");
-                params.stroke = params.stroke || "#000";
-            } else {
-                params = {fill: "none", stroke: "#000"};
+            return path;
+        };
+        var $ = function (el, attr) {
+            for (var key in attr) if (attr.hasOwnProperty(key)) {
+                el.setAttribute(key, attr[key]);
             }
-            setFillAndStroke(p, params);
+        };
+        R.toString = function () {
+            return  "Your browser supports SVG.\nYou are running Rapha\u00ebl " + this.version;
+        };
+        var thePath = function (pathString, SVG) {
+            var el = doc.createElementNS(SVG.svgns, "path");
+            SVG.canvas && SVG.canvas.appendChild(el);
+            var p = new Element(el, SVG);
+            p.type = "path";
+            setFillAndStroke(p, {fill: "none", stroke: "#000", path: pathString});
             return p;
         };
         var addGradientFill = function (o, gradient, SVG) {
             gradient = toGradient(gradient);
             var el = doc.createElementNS(SVG.svgns, (gradient.type || "linear") + "Gradient");
-            el.id = "raphael-gradient-" + R.idGenerator++;
+            el.id = "r" + (R.idGenerator++).toString(36);
             if (gradient.vector && gradient.vector.length) {
-                el.setAttribute("x1", gradient.vector[0]);
-                el.setAttribute("y1", gradient.vector[1]);
-                el.setAttribute("x2", gradient.vector[2]);
-                el.setAttribute("y2", gradient.vector[3]);
+                $(el, {
+                    x1: gradient.vector[0],
+                    y1: gradient.vector[1],
+                    x2: gradient.vector[2],
+                    y2: gradient.vector[3]
+                });
             }
             SVG.defs.appendChild(el);
             var isopacity = true;
@@ -832,55 +840,61 @@ window.Raphael = (function () {
                 if (gradient.dots[i].offset) {
                     isopacity = false;
                 }
-                stop.setAttribute("offset", gradient.dots[i].offset ? gradient.dots[i].offset : (i == 0) ? "0%" : "100%");
-                stop.setAttribute("stop-color", R.getRGB(gradient.dots[i].color).hex || "#fff");
+                $(stop, {
+                    offset: gradient.dots[i].offset ? gradient.dots[i].offset : (i == 0) ? "0%" : "100%",
+                    "stop-color": R.getRGB(gradient.dots[i].color).hex || "#fff"
+                });
                 // ignoring opacity for internal points, because VML doesn't support it
                 el.appendChild(stop);
             };
             if (isopacity && typeof gradient.dots[ii - 1].opacity != "undefined") {
-                stop.setAttribute("stop-opacity", gradient.dots[ii - 1].opacity);
+                $(stop, {"stop-opacity": gradient.dots[ii - 1].opacity});
             }
-            o.setAttribute("fill", "url(#" + el.id + ")");
+            $(o, {
+                fill: "url(#" + el.id + ")",
+                opacity: 1,
+                "fill-opacity": 1
+            });
             o.style.fill = "";
             o.style.opacity = 1;
             o.style.fillOpacity = 1;
-            o.setAttribute("opacity", 1);
-            o.setAttribute("fill-opacity", 1);
         };
         var updatePosition = function (o) {
-            if (o.pattern) {
-                var bbox = o.getBBox();
-                o.pattern.setAttribute("patternTransform", "translate(".concat(bbox.x, ",", bbox.y, ")"));
-            }
+            var bbox = o.getBBox();
+            $(o.pattern, {patternTransform: R.format("translate({0},{1})", bbox.x, bbox.y)});
         };
         var setFillAndStroke = function (o, params) {
             var dasharray = {
-                "-": [3, 1],
-                ".": [1, 1],
-                "-.": [3, 1, 1, 1],
-                "-..": [3, 1, 1, 1, 1, 1],
-                ". ": [1, 3],
-                "- ": [4, 3],
-                "--": [8, 3],
-                "- .": [4, 3, 1, 3],
-                "--.": [8, 3, 1, 3],
-                "--..": [8, 3, 1, 3, 1, 3]
-            },
-            node = o.node,
-            attrs = o.attrs;
-            addDashes = function (o, value) {
-                value = dasharray[value.toString().toLowerCase()];
-                if (value) {
-                    var width = o.attrs["stroke-width"] || "1",
-                        butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
-                        dashes = [];
-                    for (var i = 0, ii = value.length; i < ii; i++) {
-                        dashes.push(value[i] * width + ((i % 2) ? 1 : -1) * butt);
+                    "": [0],
+                    "none": [0],
+                    "-": [3, 1],
+                    ".": [1, 1],
+                    "-.": [3, 1, 1, 1],
+                    "-..": [3, 1, 1, 1, 1, 1],
+                    ". ": [1, 3],
+                    "- ": [4, 3],
+                    "--": [8, 3],
+                    "- .": [4, 3, 1, 3],
+                    "--.": [8, 3, 1, 3],
+                    "--..": [8, 3, 1, 3, 1, 3]
+                },
+                node = o.node,
+                attrs = o.attrs,
+                rot = o.attr("rotation"),
+                addDashes = function (o, value) {
+                    value = dasharray[(value + "").toLowerCase()];
+                    if (value) {
+                        var width = o.attrs["stroke-width"] || "1",
+                            butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
+                            dashes = [];
+                        for (var i = 0, ii = value.length; i < ii; i++) {
+                            dashes.push(value[i] * width + ((i % 2) ? 1 : -1) * butt);
+                        }
+                        value = dashes.join(",");
+                        node.setAttribute("stroke-dasharray", value);
                     }
-                    value = dashes.join(",");
-                    node.setAttribute("stroke-dasharray", value);
-                }
-            };
+                };
+            parseInt(rot, 10) && o.rotate(0, true);
             for (var att in params) {
                 if (!(att in availableAttrs)) {
                     continue;
@@ -901,10 +915,35 @@ window.Raphael = (function () {
                         }
                         pn.setAttributeNS(o.paper.xlink, att, value);
                       break;
+                    case "clip-rect":
+                        var rect = value.split(separator);
+                        if (rect.length == 4) {
+                            o.clip && o.clip.parentNode.parentNode.removeChild(clip.parentNode);
+                            var el = doc.createElementNS(o.paper.svgns, "clipPath"),
+                                rc = doc.createElementNS(o.paper.svgns, "rect");
+                            el.id = "r" + (R.idGenerator++).toString(36);
+                            $(rc, {
+                                x: rect[0],
+                                y: rect[1],
+                                width: rect[2],
+                                height: rect[3]
+                            });
+                            el.appendChild(rc);
+                            o.paper.defs.appendChild(el);
+                            $(node, {"clip-path": "url(#" + el.id + ")"});
+                            o.clip = rc;
+                        }
+                        if (!value) {
+                            var clip = doc.getElementById(node.getAttribute("clip-path").replace(/(^url\(#|\)$)/g, ""));
+                            clip && clip.parentNode.removeChild(clip);
+                            $(node, {"clip-path": ""});
+                            delete o.clip;
+                        }
+                    break;
                     case "path":
-                        if (o.type == "path") {
-                            node.setAttribute("d", "M0,0");
-                            paper.pathfinder(o, value);
+                        if (value && o.type == "path") {
+                            attrs.path = roundPath(pathToAbsolute(value));
+                            $(node, {d: attrs.path});
                         }
                     case "width":
                         node.setAttribute(att, value);
@@ -921,7 +960,7 @@ window.Raphael = (function () {
                     case "rx":
                     case "cx":
                         node.setAttribute(att, value);
-                        updatePosition(o);
+                        o.pattern && updatePosition(o);
                         break;
                     case "height":
                         node.setAttribute(att, value);
@@ -938,12 +977,11 @@ window.Raphael = (function () {
                     case "ry":
                     case "cy":
                         node.setAttribute(att, value);
-                        updatePosition(o);
+                        o.pattern && updatePosition(o);
                         break;
                     case "r":
                         if (o.type == "rect") {
-                            node.setAttribute("rx", value);
-                            node.setAttribute("ry", value);
+                            $(node, {rx: value, ry: value});
                         } else {
                             node.setAttribute(att, value);
                         }
@@ -965,6 +1003,7 @@ window.Raphael = (function () {
                         addDashes(o, value);
                         break;
                     case "rotation":
+                        rot = value;
                         o.rotate(value, true);
                         break;
                     case "translation":
@@ -976,16 +1015,13 @@ window.Raphael = (function () {
                         o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, +xy[2] || null, +xy[3] || null);
                         break;
                     case "fill":
-                        var isURL = (value + "").match(/^url\(([^\)]+)\)$/i);
+                        var isURL = (value + "").match(/^url\(['"]?([^\)]+)['"]?\)$/i);
                         if (isURL) {
-                            var el = doc.createElementNS(o.paper.svgns, "pattern");
-                            var ig = doc.createElementNS(o.paper.svgns, "image");
-                            el.id = "raphael-pattern-" + R.idGenerator++;
-                            el.setAttribute("x", 0);
-                            el.setAttribute("y", 0);
-                            el.setAttribute("patternUnits", "userSpaceOnUse");
-                            ig.setAttribute("x", 0);
-                            ig.setAttribute("y", 0);
+                            var el = doc.createElementNS(o.paper.svgns, "pattern"),
+                                ig = doc.createElementNS(o.paper.svgns, "image");
+                            el.id = "r" + (R.idGenerator++).toString(36);
+                            $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse"});
+                            $(ig, {x: 0, y:0});
                             ig.setAttributeNS(o.paper.xlink, "href", isURL[1]);
                             el.appendChild(ig);
 
@@ -994,10 +1030,8 @@ window.Raphael = (function () {
                             img.style.top = "-9999em";
                             img.style.left = "-9999em";
                             img.onload = function () {
-                                el.setAttribute("width", this.offsetWidth);
-                                el.setAttribute("height", this.offsetHeight);
-                                ig.setAttribute("width", this.offsetWidth);
-                                ig.setAttribute("height", this.offsetHeight);
+                                $(el, {width: this.offsetWidth, height: this.offsetHeight});
+                                $(ig, {width: this.offsetWidth, height: this.offsetHeight});
                                 doc.body.removeChild(this);
                                 paper.safari();
                             };
@@ -1005,9 +1039,9 @@ window.Raphael = (function () {
                             img.src = isURL[1];
                             o.paper.defs.appendChild(el);
                             node.style.fill = "url(#" + el.id + ")";
-                            node.setAttribute("fill", "url(#" + el.id + ")");
+                            $(node, {fill: "url(#" + el.id + ")"});
                             o.pattern = el;
-                            updatePosition(o);
+                            o.pattern && updatePosition(o);
                             break;
                         }
                         delete params.gradient;
@@ -1015,12 +1049,12 @@ window.Raphael = (function () {
                         if (typeof attrs.opacity != "undefined" && typeof params.opacity == "undefined" ) {
                             node.style.opacity = attrs.opacity;
                             // Need following line for Firefox
-                            node.setAttribute("opacity", attrs.opacity);
+                            $(node, {opacity: attrs.opacity});
                         }
                         if (typeof attrs["fill-opacity"] != "undefined" && typeof params["fill-opacity"] == "undefined" ) {
-                            node.style.fillOpacity = o.attrs["fill-opacity"];
+                            node.style.fillOpacity = attrs["fill-opacity"];
                             // Need following line for Firefox
-                            node.setAttribute("fill-opacity", attrs["fill-opacity"]);
+                            $(node, {"fill-opacity": attrs["fill-opacity"]});
                         }
                     case "stroke":
                         node.style[att] = R.getRGB(value).hex;
@@ -1040,7 +1074,8 @@ window.Raphael = (function () {
                             }
                             break;
                         }
-                    default :
+                    default:
+                        att == "font-size" && (value = parseInt(value, 10) + "px");
                         var cssrule = att.replace(/(\-.)/g, function (w) {
                             return w.substring(1).toUpperCase();
                         });
@@ -1052,6 +1087,7 @@ window.Raphael = (function () {
             }
             
             tuneText(o, params);
+            parseInt(rot, 10) && o.rotate(rot, true);
         };
         var leading = 1.2;
         var tuneText = function (el, params) {
@@ -1069,22 +1105,20 @@ window.Raphael = (function () {
                 var texts = (params.text + "").split("\n");
                 for (var i = 0, ii = texts.length; i < ii; i++) {
                     var tspan = doc.createElementNS(el.paper.svgns, "tspan");
-                    i && tspan.setAttribute("dy", fontSize * leading);
-                    i && tspan.setAttribute("x", a.x);
+                    i && $(tspan, {dy: fontSize * leading, x: a.x});
                     tspan.appendChild(doc.createTextNode(texts[i]));
                     node.appendChild(tspan);
                 }
             } else {
                 var texts = node.getElementsByTagName("tspan");
                 for (var i = 0, ii = texts.length; i < ii; i++) {
-                    i && texts[i].setAttribute("dy", fontSize * leading);
-                    i && texts[i].setAttribute("x", a.x);
+                    i && $(texts[i], {dy: fontSize * leading, x: a.x});
                 }
             }
-            node.setAttribute("y", a.y);
+            $(node, {y: a.y});
             var bb = el.getBBox(),
                 dif = a.y - (bb.y + bb.height / 2);
-            dif && node.setAttribute("y", a.y + dif);
+            dif && $(node, {y: a.y + dif});
         };
         var Element = function (node, svg) {
             var X = 0,
@@ -1097,17 +1131,20 @@ window.Raphael = (function () {
             this._ = {
                 tx: 0,
                 ty: 0,
-                rt: {deg: 0, x: 0, y: 0},
+                rt: {deg: 0, cx: 0, cy: 0},
                 sx: 1,
                 sy: 1
             };
         };
         Element.prototype.rotate = function (deg, cx, cy) {
             if (deg == null) {
+                if (this._.rt.cx) {
+                    return [this._.rt.deg, this._.rt.cx, this._.rt.cy].join(" ");
+                }
                 return this._.rt.deg;
             }
             var bbox = this.getBBox();
-            deg = deg.toString().split(separator);
+            deg = (deg + "").split(separator);
             if (deg.length - 1) {
                 cx = parseFloat(deg[1]);
                 cy = parseFloat(deg[2]);
@@ -1118,17 +1155,19 @@ window.Raphael = (function () {
             } else {
                 this._.rt.deg += deg;
             }
-            if (cy == null) {
-                cx = null;
-            }
+            (cy == null) && (cx = null);
+            this._.rt.cx = cx;
+            this._.rt.cy = cy;
             cx = cx == null ? bbox.x + bbox.width / 2 : cx;
             cy = cy == null ? bbox.y + bbox.height / 2 : cy;
             if (this._.rt.deg) {
-                this.transformations[0] = ("rotate(" + this._.rt.deg + " " + cx + " " + cy + ")");
+                this.transformations[0] = R.format("rotate({0} {1} {2})", this._.rt.deg, cx, cy);
+                this.clip && $(this.clip, {transform: R.format("rotate({0} {1} {2})", -this._.rt.deg, cx, cy)});
             } else {
                 this.transformations[0] = "";
+                this.clip && $(this.clip, {transform: ""});
             }
-            this.node.setAttribute("transform", this.transformations.join(" "));
+            $(this.node, {transform: this.transformations.join(" ")});
             return this;
         };
         Element.prototype.hide = function () {
@@ -1143,7 +1182,21 @@ window.Raphael = (function () {
             this.node.parentNode.removeChild(this.node);
         };
         Element.prototype.getBBox = function () {
-            var bbox = this.node.getBBox();
+            if (this.type == "path") {
+                return pathDimensions(this.attrs.path);
+            }
+            if (this.node.style.display == "none") {
+                this.show();
+                var hide = true;
+            }
+            var bbox = {};
+            try {
+                bbox = this.node.getBBox();
+            } catch(e) {
+                // Firefox 3.0.x plays badly here
+            } finally {
+                bbox = bbox || {};
+            }
             if (this.type == "text") {
                 bbox = {x: bbox.x, y: Infinity, width: bbox.width, height: 0};
                 for (var i = 0, ii = this.node.getNumberOfChars(); i < ii; i++) {
@@ -1152,6 +1205,7 @@ window.Raphael = (function () {
                     (bb.y + bb.height - bbox.y > bbox.height) && (bbox.height = bb.y + bb.height - bbox.y);
                 }
             }
+            hide && this.hide();
             return bbox;
         };
         Element.prototype.attr = function () {
@@ -1159,9 +1213,15 @@ window.Raphael = (function () {
                 if (arguments[0] == "translation") {
                     return this.translate();
                 }
+                if (arguments[0] == "rotation") {
+                    return this.rotate();
+                }
+                if (arguments[0] == "scale") {
+                    return this.scale();
+                }
                 return this.attrs[arguments[0]];
             }
-            if (arguments.length == 1 && arguments[0] instanceof win.Array) {
+            if (arguments.length == 1 && R.isArray(arguments[0])) {
                 var values = {};
                 for (var j in arguments[0]) {
                     values[arguments[0][j]] = this.attrs[arguments[0][j]];
@@ -1196,111 +1256,61 @@ window.Raphael = (function () {
             return this;
         };
         Element.prototype.insertBefore = function (element) {
-            element.node.parentNode.insertBefore(this.node, element.node);
+            var node = element.node;
+            node.parentNode.insertBefore(this.node, node);
             return this;
         };
         var theCircle = function (svg, x, y, r) {
+            x = round(x);
+            y = round(y);
             var el = doc.createElementNS(svg.svgns, "circle");
-            el.setAttribute("cx", x);
-            el.setAttribute("cy", y);
-            el.setAttribute("r", r);
-            el.setAttribute("fill", "none");
-            el.setAttribute("stroke", "#000");
-            if (svg.canvas) {
-                svg.canvas.appendChild(el);
-            }
+            svg.canvas && svg.canvas.appendChild(el);
             var res = new Element(el, svg);
-            res.attrs = res.attrs || {};
-            res.attrs.cx = x;
-            res.attrs.cy = y;
-            res.attrs.r = r;
-            res.attrs.stroke = "#000";
+            res.attrs = {cx: x, cy: y, r: r, fill: "none", stroke: "#000"};
             res.type = "circle";
+            $(el, res.attrs);
             return res;
         };
         var theRect = function (svg, x, y, w, h, r) {
+            x = round(x);
+            y = round(y);
             var el = doc.createElementNS(svg.svgns, "rect");
-            el.setAttribute("x", x);
-            el.setAttribute("y", y);
-            el.setAttribute("width", w);
-            el.setAttribute("height", h);
-            if (r) {
-                el.setAttribute("rx", r);
-                el.setAttribute("ry", r);
-            }
-            el.setAttribute("fill", "none");
-            el.setAttribute("stroke", "#000");
-            if (svg.canvas) {
-                svg.canvas.appendChild(el);
-            }
+            svg.canvas && svg.canvas.appendChild(el);
             var res = new Element(el, svg);
-            res.attrs = res.attrs || {};
-            res.attrs.x = x;
-            res.attrs.y = y;
-            res.attrs.width = w;
-            res.attrs.height = h;
-            res.attrs.stroke = "#000";
-            if (r) {
-                res.attrs.rx = res.attrs.ry = r;
-            }
+            res.attrs = {x: x, y: y, width: w, height: h, r: r || 0, rx: r || 0, ry: r || 0, fill: "none", stroke: "#000"};
             res.type = "rect";
+            $(el, res.attrs);
             return res;
         };
         var theEllipse = function (svg, x, y, rx, ry) {
+            x = round(x);
+            y = round(y);
             var el = doc.createElementNS(svg.svgns, "ellipse");
-            el.setAttribute("cx", x);
-            el.setAttribute("cy", y);
-            el.setAttribute("rx", rx);
-            el.setAttribute("ry", ry);
-            el.setAttribute("fill", "none");
-            el.setAttribute("stroke", "#000");
-            if (svg.canvas) {
-                svg.canvas.appendChild(el);
-            }
+            svg.canvas && svg.canvas.appendChild(el);
             var res = new Element(el, svg);
-            res.attrs = res.attrs || {};
-            res.attrs.cx = x;
-            res.attrs.cy = y;
-            res.attrs.rx = rx;
-            res.attrs.ry = ry;
-            res.attrs.stroke = "#000";
+            res.attrs = {cx: x, cy: y, rx: rx, ry: ry, fill: "none", stroke: "#000"};
             res.type = "ellipse";
+            $(el, res.attrs);
             return res;
         };
         var theImage = function (svg, src, x, y, w, h) {
             var el = doc.createElementNS(svg.svgns, "image");
-            el.setAttribute("x", x);
-            el.setAttribute("y", y);
-            el.setAttribute("width", w);
-            el.setAttribute("height", h);
-            el.setAttribute("preserveAspectRatio", "none");
+            $(el, {x: x, y: y, width: w, height: h, preserveAspectRatio: "none"});
             el.setAttributeNS(svg.xlink, "href", src);
-            if (svg.canvas) {
-                svg.canvas.appendChild(el);
-            }
+            svg.canvas && svg.canvas.appendChild(el);
             var res = new Element(el, svg);
-            res.attrs = res.attrs || {};
-            res.attrs.x = x;
-            res.attrs.y = y;
-            res.attrs.width = w;
-            res.attrs.height = h;
+            res.attrs = {x: x, y: y, width: w, height: h, src: src};
             res.type = "image";
             return res;
         };
         var theText = function (svg, x, y, text) {
             var el = doc.createElementNS(svg.svgns, "text");
-            el.setAttribute("x", x);
-            el.setAttribute("y", y);
-            el.setAttribute("text-anchor", "middle");
-            if (svg.canvas) {
-                svg.canvas.appendChild(el);
-            }
+            $(el, {x: x, y: y, "text-anchor": "middle"});
+            svg.canvas && svg.canvas.appendChild(el);
             var res = new Element(el, svg);
-            res.attrs = res.attrs || {};
-            res.attrs.x = x;
-            res.attrs.y = y;
+            res.attrs = {x: x, y: y, "text-anchor": "middle", text: text, font: availableAttrs.font, stroke: "none", fill: "#000"};
             res.type = "text";
-            setFillAndStroke(res, {font: availableAttrs.font, stroke: "none", fill: "#000", text: text});
+            setFillAndStroke(res, res.attrs);
             return res;
         };
         var setSize = function (width, height) {
@@ -1311,8 +1321,8 @@ window.Raphael = (function () {
             return this;
         };
         var create = function () {
-            var con = getContainer.apply(null, arguments);
-            var container = con.container,
+            var con = getContainer.apply(null, arguments),
+                container = con.container,
                 x = con.x,
                 y = con.y,
                 width = con.width,
@@ -1358,7 +1368,7 @@ window.Raphael = (function () {
             return container;
         };
         paper.remove = function () {
-            this.canvas.parentNode.removeChild(this.canvas);
+            this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
         };
         paper.svgns = "http://www.w3.org/2000/svg";
         paper.xlink = "http://www.w3.org/1999/xlink";
@@ -1372,23 +1382,33 @@ window.Raphael = (function () {
 
     // VML
     if (R.vml) {
+        var path2vml = function (path) {
+            var pa = path2curve(path);
+            for (var i = 0, ii = pa.length; i < ii; i++) {
+                pa[i][0] = (pa[i][0] + "").toLowerCase();
+                pa[i][0] == "z" && (pa[i][0] = "x");
+                for (var j = 1, jj = pa[i].length; j < jj; j++) {
+                    pa[i][j] = Math.round(pa[i][j]);
+                }
+            }
+            return (pa + "");
+        };
         R.toString = function () {
-            return  "Your browser doesn\u2019t support SVG.\nYou are running Rapha\u00ebl " + this.version;
+            return  "Your browser doesn\u2019t support SVG. Assuming it is Internet Explorer and falling down to VML.\nYou are running Rapha\u00ebl " + this.version;
         };
-        thePath = function (params, pathString, VML) {
+        var thePath = function (pathString, VML) {
             var g = createNode("group"), gl = g.style;
             gl.position = "absolute";
             gl.left = 0;
             gl.top = 0;
             gl.width = VML.width + "px";
             gl.height = VML.height + "px";
+            g.coordsize = VML.coordsize;
+            g.coordorigin = VML.coordorigin;
             var el = createNode("shape"), ol = el.style;
             ol.width = VML.width + "px";
             ol.height = VML.height + "px";
             el.path = "";
-            if (params["class"]) {
-                el.className = "rvml " + params["class"];
-            }
             el.coordsize = this.coordsize;
             el.coordorigin = this.coordorigin;
             g.appendChild(el);
@@ -1396,268 +1416,104 @@ window.Raphael = (function () {
             p.isAbsolute = true;
             p.type = "path";
             p.path = [];
-            p.last = {x: 0, y: 0, bx: 0, by: 0, isAbsolute: true};
+            // p.last = {x: 0, y: 0, bx: 0, by: 0, isAbsolute: true};
             p.Path = "";
-            p.absolutely = function () {
-                this.isAbsolute = true;
-                return this;
-            };
-            p.relatively = function () {
-                this.isAbsolute = false;
-                return this;
-            };
-            p.moveTo = function (x, y) {
-                var d = this.isAbsolute?"m":"t";
-                d += Math.round(parseFloat(x)) + " " + Math.round(parseFloat(y));
-                this.node.path = this.Path += d;
-                this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x);
-                this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y);
-                this.last.isAbsolute = this.isAbsolute;
-                this.attrs.path += (this.isAbsolute ? "M" : "m") + [x, y];
-                return this;
-            };
-            p.lineTo = function (x, y) {
-                var d = this.isAbsolute?"l":"r";
-                d += Math.round(parseFloat(x)) + " " + Math.round(parseFloat(y));
-                this[0].path = this.Path += d;
-                this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x);
-                this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y);
-                this.last.isAbsolute = this.isAbsolute;
-                this.attrs.path += (this.isAbsolute ? "L" : "l") + [x, y];
-                return this;
-            };
-            p.arcTo = function (rx, ry, large_arc_flag, sweep_flag, x2, y2) {
-                // for more information of where this math came from visit:
-                // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
-                x2 = (this.isAbsolute ? 0 : this.last.x) + x2;
-                y2 = (this.isAbsolute ? 0 : this.last.y) + y2;
-                var x1 = this.last.x,
-                    y1 = this.last.y,
-                    x = (x1 - x2) / 2,
-                    y = (y1 - y2) / 2,
-                    k = (large_arc_flag == sweep_flag ? -1 : 1) *
-                        Math.sqrt(Math.abs(rx * rx * ry * ry - rx * rx * y * y - ry * ry * x * x) / (rx * rx * y * y + ry * ry * x * x)),
-                    cx = k * rx * y / ry + (x1 + x2) / 2,
-                    cy = k * -ry * x / rx + (y1 + y2) / 2,
-                    d = sweep_flag ? (this.isAbsolute ? "wa" : "wr") : (this.isAbsolute ? "at" : "ar"),
-                    left = Math.round(cx - rx),
-                    top = Math.round(cy - ry);
-                d += [left, top, Math.round(left + rx * 2), Math.round(top + ry * 2), Math.round(x1), Math.round(y1), Math.round(parseFloat(x2)), Math.round(parseFloat(y2))].join(", ");
-                this.node.path = this.Path += d;
-                this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x2);
-                this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y2);
-                this.last.isAbsolute = this.isAbsolute;
-                this.attrs.path += (this.isAbsolute ? "A" : "a") + [rx, ry, 0, large_arc_flag, sweep_flag, x2, y2];
-                return this;
-            };
-            p.cplineTo = function (x1, y1, w1) {
-                if (!w1) {
-                    return this.lineTo(x1, y1);
-                } else {
-                    var x = Math.round(Math.round(parseFloat(x1) * 100) / 100),
-                        y = Math.round(Math.round(parseFloat(y1) * 100) / 100),
-                        w = Math.round(Math.round(parseFloat(w1) * 100) / 100),
-                        d = this.isAbsolute ? "c" : "v",
-                        attr = [Math.round(this.last.x) + w, Math.round(this.last.y), x - w, y, x, y],
-                        svgattr = [this.last.x + w1, this.last.y, x1 - w1, y1, x1, y1];
-                    d += attr.join(" ") + " ";
-                    this.last.x = (this.isAbsolute ? 0 : this.last.x) + attr[4];
-                    this.last.y = (this.isAbsolute ? 0 : this.last.y) + attr[5];
-                    this.last.bx = attr[2];
-                    this.last.by = attr[3];
-                    this.node.path = this.Path += d;
-                    this.attrs.path += (this.isAbsolute ? "C" : "c") + svgattr;
-                    return this;
-                }
-            };
-            p.curveTo = function () {
-                var d = this.isAbsolute ? "c" : "v";
-                if (arguments.length == 6) {
-                    this.last.bx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2]);
-                    this.last.by = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3]);
-                    this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[4]);
-                    this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[5]);
-                    d += [Math.round(parseFloat(arguments[0])),
-                         Math.round(parseFloat(arguments[1])),
-                         Math.round(parseFloat(arguments[2])),
-                         Math.round(parseFloat(arguments[3])),
-                         Math.round(parseFloat(arguments[4])),
-                         Math.round(parseFloat(arguments[5]))].join(" ") + " ";
-                    this.last.isAbsolute = this.isAbsolute;
-                    this.attrs.path += (this.isAbsolute ? "C" : "c") + Array.prototype.splice.call(arguments, 0, arguments.length);
-                }
-                if (arguments.length == 4) {
-                    var bx = this.last.x * 2 - this.last.bx;
-                    var by = this.last.y * 2 - this.last.by;
-                    this.last.bx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[0]);
-                    this.last.by = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[1]);
-                    this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2]);
-                    this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3]);
-                    d += [Math.round(bx), Math.round(by),
-                         Math.round(parseFloat(arguments[0])),
-                         Math.round(parseFloat(arguments[1])),
-                         Math.round(parseFloat(arguments[2])),
-                         Math.round(parseFloat(arguments[3]))].join(" ") + " ";
-                     this.attrs.path += (this.isAbsolute ? "S" : "s") + Array.prototype.splice.call(arguments, 0, arguments.length);
-                }
-                this.node.path = this.Path += d;
-                return this;
-            };
-            p.qcurveTo = function () {
-                var d = "qb";
-                if (arguments.length == 4) {
-                    this.last.qx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[0]);
-                    this.last.qy = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[1]);
-                    this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2]);
-                    this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3]);
-                    d += [Math.round(this.last.qx),
-                         Math.round(this.last.qy),
-                         Math.round(this.last.x),
-                         Math.round(this.last.y)].join(" ") + " ";
-                    this.last.isAbsolute = this.isAbsolute;
-                    this.attrs.path += (this.isAbsolute ? "Q" : "q") + Array.prototype.splice.call(arguments, 0, arguments.length);
-                }
-                if (arguments.length == 2) {
-                    this.last.qx = this.last.x * 2 - this.last.qx;
-                    this.last.qy = this.last.y * 2 - this.last.qy;
-                    this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2]);
-                    this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3]);
-                    d += [Math.round(this.last.qx),
-                         Math.round(this.last.qy),
-                         Math.round(this.last.x),
-                         Math.round(this.last.y)].join(" ") + " ";
-                     this.attrs.path += (this.isAbsolute ? "T" : "t") + Array.prototype.splice.call(arguments, 0, arguments.length);
-                }
-                this.node.path = this.Path += d;
-                this.path.push({type: "qcurve", arg: [].slice.call(arguments, 0), pos: this.isAbsolute});
-                return this;
-            };
-            p.addRoundedCorner = function (r, dir) {
-                var R = .5522 * r, rollback = this.isAbsolute, o = this;
-                if (rollback) {
-                    this.relatively();
-                    rollback = function () {
-                        o.absolutely();
-                    };
-                } else {
-                    rollback = function () {};
-                }
-                var actions = {
-                    l: function () {
-                        return {
-                            u: function () {
-                                o.curveTo(-R, 0, -r, -(r - R), -r, -r);
-                            },
-                            d: function () {
-                                o.curveTo(-R, 0, -r, r - R, -r, r);
-                            }
-                        };
-                    },
-                    r: function () {
-                        return {
-                            u: function () {
-                                o.curveTo(R, 0, r, -(r - R), r, -r);
-                            },
-                            d: function () {
-                                o.curveTo(R, 0, r, r - R, r, r);
-                            }
-                        };
-                    },
-                    u: function () {
-                        return {
-                            r: function () {
-                                o.curveTo(0, -R, -(R - r), -r, r, -r);
-                            },
-                            l: function () {
-                                o.curveTo(0, -R, R - r, -r, -r, -r);
-                            }
-                        };
-                    },
-                    d: function () {
-                        return {
-                            r: function () {
-                                o.curveTo(0, R, -(R - r), r, r, r);
-                            },
-                            l: function () {
-                                o.curveTo(0, R, R - r, r, -r, r);
-                            }
-                        };
-                    }
-                };
-                actions[dir.charAt(0)]()[dir.charAt(1)]();
-                rollback();
-                return o;
-            };
-            p.andClose = function () {
-                this.node.path = (this.Path += "x");
-                this.attrs.path += "z";
-                return this;
-            };
             if (pathString) {
-                p.absolutely();
-                p.attrs.path = "";
-                paper.pathfinder(p, "" + pathString);
-            }
-            if (params) {
-                params.fill = params.fill || "none";
-                params.stroke = params.stroke || "#000";
-            } else {
-                params = {fill: "none", stroke: "#000"};
-            }
-            setFillAndStroke(p, params);
-            if (params.gradient) {
-                addGradientFill(p, params.gradient);
+                p.attrs.path = R.parsePathString(pathString);
+                p.node.path = path2vml(p.attrs.path);
             }
+            setFillAndStroke(p, {fill: "none", stroke: "#000"});
+            p.setBox();
             VML.canvas.appendChild(g);
             return p;
         };
         var setFillAndStroke = function (o, params) {
+            o.attrs = o.attrs || {};
             var node = o.node,
+                a = o.attrs,
                 s = node.style,
+                xy,
                 res = o;
-            o.attrs = o.attrs || {};
             for (var par in params) {
-                o.attrs[par] = params[par];
+                a[par] = params[par];
             }
             params.href && (node.href = params.href);
             params.title && (node.title = params.title);
             params.target && (node.target = params.target);
             if (params.path && o.type == "path") {
-                o.Path = "";
-                o.path = [];
-                paper.pathfinder(o, params.path);
+                a.path = R.parsePathString(params.path);
+                node.path = path2vml(a.path);
             }
             if (params.rotation != null) {
                 o.rotate(params.rotation, true);
             }
             if (params.translation) {
-                var xy = (params.translation + "").split(separator);
+                xy = (params.translation + "").split(separator);
                 o.translate(xy[0], xy[1]);
             }
             if (params.scale) {
-                var xy = (params.scale + "").split(separator);
+                xy = (params.scale + "").split(separator);
                 o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, +xy[2] || null, +xy[3] || null);
             }
+            if ("clip-rect" in params) {
+                var rect = (params["clip-rect"] + "").split(separator);
+                if (rect.length == 4) {
+                    rect[2] += rect[0];
+                    rect[3] += rect[1];
+                    var div = node.clipRect || doc.createElement("div"),
+                        dstyle = div.style,
+                        group = node.parentNode;
+                    dstyle.clip = R.format("rect({0}px {2}px {3}px {1}px)", rect);
+                    if (!node.clipRect) {
+                        dstyle.position = "absolute";
+                        dstyle.top = 0;
+                        dstyle.left = 0;
+                        dstyle.width = o.paper.width + "px";
+                        dstyle.height = o.paper.height + "px";
+                        group.parentNode.insertBefore(div, group);
+                        div.appendChild(group);
+                        node.clipRect = div;
+                    }
+                }
+                if (!params["clip-rect"]) {
+                    node.clipRect && (node.clipRect.style.clip = "");
+                }
+            }
             if (o.type == "image" && params.src) {
                 node.src = params.src;
             }
             if (o.type == "image" && params.opacity) {
                 node.filterOpacity = " progid:DXImageTransform.Microsoft.Alpha(opacity=" + (params.opacity * 100) + ")";
-                node.style.filter = (node.filterMatrix || "") + (node.filterOpacity || "");
+                s.filter = (node.filterMatrix || "") + (node.filterOpacity || "");
             }
             params.font && (s.font = params.font);
-            params["font-family"] && (s.fontFamily = params["font-family"]);
+            params["font-family"] && (s.fontFamily = '"' + params["font-family"].split(",")[0].replace(/^['"]+|['"]+$/g, "") + '"');
             params["font-size"] && (s.fontSize = params["font-size"]);
             params["font-weight"] && (s.fontWeight = params["font-weight"]);
             params["font-style"] && (s.fontStyle = params["font-style"]);
-            if (typeof params.opacity != "undefined" || typeof params["stroke-width"] != "undefined" || typeof params.fill != "undefined" || typeof params.stroke != "undefined" || params["stroke-width"] || params["stroke-opacity"] || params["fill-opacity"] || params["stroke-dasharray"] || params["stroke-miterlimit"] || params["stroke-linejoin"] || params["stroke-linecap"]) {
-                o = o.shape || node;
-                var fill = (o.getElementsByTagName("fill") && o.getElementsByTagName("fill")[0]) || createNode("fill");
+            if (params.opacity != null || 
+                params["stroke-width"] != null ||
+                params.fill != null ||
+                params.stroke != null ||
+                params["stroke-width"] != null ||
+                params["stroke-opacity"] != null ||
+                params["fill-opacity"] != null ||
+                params["stroke-dasharray"] != null ||
+                params["stroke-miterlimit"] != null ||
+                params["stroke-linejoin"] != null ||
+                params["stroke-linecap"] != null) {
+                node = o.shape || node;
+                var fill = (node.getElementsByTagName("fill") && node.getElementsByTagName("fill")[0]),
+                    newfill = false;
+                !fill && (newfill = fill = createNode("fill"));
                 if ("fill-opacity" in params || "opacity" in params) {
-                    fill.opacity = ((+params["fill-opacity"] + 1 || 2) - 1) * ((+params.opacity + 1 || 2) - 1);
+                    var opacity = ((+a["fill-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1);
+                    opacity < 0 && (opacity = 0);
+                    opacity > 1 && (opacity = 1);
+                    fill.opacity = opacity;
                 }
                 params.fill && (fill.on = true);
-                if (typeof fill.on == "undefined" || params.fill == "none") {
+                if (fill.on == null || params.fill == "none") {
                     fill.on = false;
                 }
                 if (fill.on && params.fill) {
@@ -1671,18 +1527,25 @@ window.Raphael = (function () {
                         fill.type = "solid";
                     }
                 }
-                o.appendChild(fill);
-                var stroke = (o.getElementsByTagName("stroke") && o.getElementsByTagName("stroke")[0]) || createNode("stroke");
-                if ((params.stroke && params.stroke != "none") || params["stroke-width"] || typeof params["stroke-opacity"] != "undefined" || params["stroke-dasharray"] || params["stroke-miterlimit"] || params["stroke-linejoin"] || params["stroke-linecap"]) {
+                newfill && node.appendChild(fill);
+                var stroke = (node.getElementsByTagName("stroke") && node.getElementsByTagName("stroke")[0]),
+                newstroke = false;
+                !stroke && (newstroke = stroke = createNode("stroke"));
+                if ((params.stroke && params.stroke != "none") ||
+                    params["stroke-width"] ||
+                    params["stroke-opacity"] != null ||
+                    params["stroke-dasharray"] ||
+                    params["stroke-miterlimit"] ||
+                    params["stroke-linejoin"] ||
+                    params["stroke-linecap"]) {
                     stroke.on = true;
                 }
-                if (params.stroke == "none" || typeof stroke.on == "undefined" || params.stroke == 0) {
-                    stroke.on = false;
-                }
-                if (stroke.on && params.stroke) {
-                    stroke.color = R.getRGB(params.stroke).hex;
-                }
-                stroke.opacity = ((+params["stroke-opacity"] + 1 || 2) - 1) * ((+params.opacity + 1 || 2) - 1);
+                (params.stroke == "none" || stroke.on == null || params.stroke == 0 || params["stroke-width"] == 0) && (stroke.on = false);
+                stroke.on && params.stroke && (stroke.color = R.getRGB(params.stroke).hex);
+                var opacity = ((+a["stroke-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1);
+                opacity < 0 && (opacity = 0);
+                opacity > 1 && (opacity = 1);
+                stroke.opacity = opacity;
                 params["stroke-linejoin"] && (stroke.joinstyle = params["stroke-linejoin"] || "miter");
                 stroke.miterlimit = params["stroke-miterlimit"] || 8;
                 params["stroke-linecap"] && (stroke.endcap = {butt: "flat", square: "square", round: "round"}[params["stroke-linecap"]] || "miter");
@@ -1702,28 +1565,20 @@ window.Raphael = (function () {
                     };
                     stroke.dashstyle = dasharray[params["stroke-dasharray"]] || "";
                 }
-                o.appendChild(stroke);
+                newstroke && node.appendChild(stroke);
             }
             if (res.type == "text") {
-                var span = doc.createElement("span"),
-                    s = span.style,
-                    a = res.attrs;
-                s.padding = 0;
-                s.margin = 0;
-                s.lineHeight = 1;
-                s.display = "inline";
+                var s = paper.span.style;
                 a.font && (s.font = a.font);
                 a["font-family"] && (s.fontFamily = a["font-family"]);
                 a["font-size"] && (s.fontSize = a["font-size"]);
                 a["font-weight"] && (s.fontWeight = a["font-weight"]);
                 a["font-style"] && (s.fontStyle = a["font-style"]);
-                res.node.parentNode.appendChild(span);
-                span.innerText = res.node.string;
-                res.W = a.w = span.offsetWidth;
-                res.H = a.h = span.offsetHeight;
+                paper.span.innerHTML = res.node.string.replace(/</g, "&#60;").replace(/&/g, "&#38;").replace(/\n/g, "<br>");
+                res.W = a.w = paper.span.offsetWidth;
+                res.H = a.h = paper.span.offsetHeight;
                 res.X = a.x;
                 res.Y = a.y + Math.round(res.H / 2);
-                res.node.parentNode.removeChild(span);
 
                 // text-anchor emulation
                 switch (a["text-anchor"]) {
@@ -1755,10 +1610,10 @@ window.Raphael = (function () {
         var addGradientFill = function (o, gradient) {
             gradient = toGradient(gradient);
             o.attrs = o.attrs || {};
-            var attrs = o.attrs;
+            var attrs = o.attrs,
+                fill = o.node.getElementsByTagName("fill");
             o.attrs.gradient = gradient;
-            o = o.shape || o[0];
-            var fill = o.getElementsByTagName("fill");
+            o = o.shape || o.node;
             if (fill.length) {
                 fill = fill[0];
             } else {
@@ -1821,9 +1676,12 @@ window.Raphael = (function () {
         };
         Element.prototype.rotate = function (deg, cx, cy) {
             if (deg == null) {
+                if (this._.rt.cx) {
+                    return [this._.rt.deg, this._.rt.cx, this._.rt.cy].join(" ");
+                }
                 return this._.rt.deg;
             }
-            deg = deg.toString().split(separator);
+            deg = (deg + "").split(separator);
             if (deg.length - 1) {
                 cx = parseFloat(deg[1]);
                 cy = parseFloat(deg[2]);
@@ -1834,12 +1692,10 @@ window.Raphael = (function () {
             } else {
                 this._.rt.deg += deg;
             }
-            if (cy == null) {
-                cx = null;
-            }
+            (cy == null) && (cx = null);
             this._.rt.cx = cx;
             this._.rt.cy = cy;
-            this.setBox(null, cx, cy);
+            this.setBox(this.attrs, cx, cy);
             this.Group.style.rotation = this._.rt.deg;
             // gradient fix for rotation. TODO
             // var fill = (this.shape || this.node).getElementsByTagName("fill");
@@ -1857,7 +1713,11 @@ window.Raphael = (function () {
             }
             cx = cx || this._.rt.cx;
             cy = cy || this._.rt.cy;
-            var attr = this.attrs, x, y, w, h;
+            var attr = this.attrs,
+                x,
+                y,
+                w,
+                h;
             switch (this.type) {
                 case "circle":
                     x = attr.cx - attr.r;
@@ -1891,7 +1751,7 @@ window.Raphael = (function () {
                         w = this.paper.width;
                         h = this.paper.height;
                     } else {
-                        var dim = pathDimensions(this.attrs.path),
+                        var dim = pathDimensions(this.attrs.path);
                         x = dim.x;
                         y = dim.y;
                         w = dim.width;
@@ -1955,7 +1815,7 @@ window.Raphael = (function () {
         };
         Element.prototype.getBBox = function () {
             if (this.type == "path") {
-                return pathDimensions(this.attr("path"));
+                return pathDimensions(this.attrs.path);
             }
             return {
                 x: this.X + (this.bbx || 0),
@@ -1974,9 +1834,15 @@ window.Raphael = (function () {
                 if (arguments[0] == "translation") {
                     return this.translate();
                 }
+                if (arguments[0] == "rotation") {
+                    return this.rotate();
+                }
+                if (arguments[0] == "scale") {
+                    return this.scale();
+                }
                 return this.attrs[arguments[0]];
             }
-            if (this.attrs && arguments.length == 1 && arguments[0] instanceof win.Array) {
+            if (this.attrs && arguments.length == 1 && R.isArray(arguments[0])) {
                 var values = {};
                 for (var i = 0, ii = arguments[0].length; i < ii; i++) {
                     values[arguments[0][i]] = this.attrs[arguments[0][i]];
@@ -1998,11 +1864,8 @@ window.Raphael = (function () {
                 if (params.text && this.type == "text") {
                     this.node.string = params.text;
                 }
-                if (params.id) {
-                    this.node.id = params.id;
-                }
                 setFillAndStroke(this, params);
-                this.setBox(params);
+                this.setBox(this.attrs);
             }
             return this;
         };
@@ -2029,8 +1892,17 @@ window.Raphael = (function () {
             return this;
         };
         var theCircle = function (vml, x, y, r) {
-            var g = createNode("group");
-            var o = createNode("oval");
+            var g = createNode("group"),
+                gl = g.style,
+                o = createNode("oval"),
+                ol = o.style;
+            gl.position = "absolute";
+            gl.left = 0;
+            gl.top = 0;
+            gl.width = vml.width + "px";
+            gl.height = vml.height + "px";
+            g.coordsize = vml.coordsize;
+            g.coordorigin = vml.coordorigin;
             g.appendChild(o);
             var res = new Element(o, g, vml);
             res.type = "circle";
@@ -2044,26 +1916,38 @@ window.Raphael = (function () {
         };
         var theRect = function (vml, x, y, w, h, r) {
             var g = createNode("group"),
+                gl = g.style,
                 o = createNode(r ? "roundrect" : "rect"),
                 arcsize = (+r || 0) / (Math.min(w, h));
             o.arcsize = arcsize;
+            gl.position = "absolute";
+            gl.left = 0;
+            gl.top = 0;
+            gl.width = vml.width + "px";
+            gl.height = vml.height + "px";
+            g.coordsize = vml.coordsize;
+            g.coordorigin = vml.coordorigin;
             g.appendChild(o);
             var res = new Element(o, g, vml);
             res.type = "rect";
             setFillAndStroke(res, {stroke: "#000"});
-            res.attrs.x = x;
-            res.attrs.y = y;
-            res.attrs.w = w;
-            res.attrs.h = h;
-            res.attrs.r = +r;
             res.arcsize = arcsize;
-            res.setBox({x: x, y: y, width: w, height: h});
+            res.setBox({x: x, y: y, width: w, height: h, r: +r});
             vml.canvas.appendChild(g);
             return res;
         };
         var theEllipse = function (vml, x, y, rx, ry) {
-            var g = createNode("group");
-            var o = createNode("oval");
+            var g = createNode("group"),
+                gl = g.style,
+                o = createNode("oval"),
+                ol = o.style;
+            gl.position = "absolute";
+            gl.left = 0;
+            gl.top = 0;
+            gl.width = vml.width + "px";
+            gl.height = vml.height + "px";
+            g.coordsize = vml.coordsize;
+            g.coordorigin = vml.coordorigin;
             g.appendChild(o);
             var res = new Element(o, g, vml);
             res.type = "ellipse";
@@ -2077,12 +1961,22 @@ window.Raphael = (function () {
             return res;
         };
         var theImage = function (vml, src, x, y, w, h) {
-            var g = createNode("group");
-            var o = createNode("image");
+            var g = createNode("group"),
+                gl = g.style,
+                o = createNode("image"),
+                ol = o.style;
+            gl.position = "absolute";
+            gl.left = 0;
+            gl.top = 0;
+            gl.width = vml.width + "px";
+            gl.height = vml.height + "px";
+            g.coordsize = vml.coordsize;
+            g.coordorigin = vml.coordorigin;
             o.src = src;
             g.appendChild(o);
             var res = new Element(o, g, vml);
             res.type = "image";
+            res.attrs.src = src;
             res.attrs.x = x;
             res.attrs.y = y;
             res.attrs.w = w;
@@ -2092,10 +1986,21 @@ window.Raphael = (function () {
             return res;
         };
         var theText = function (vml, x, y, text) {
-            var g = createNode("group"), gs = g.style;
-            var el = createNode("shape"), ol = el.style;
-            var path = createNode("path"), ps = path.style;
-            path.v = ["m", Math.round(x), ", ", Math.round(y - 2), "l", Math.round(x) + 1, ", ", Math.round(y - 2)].join("");
+            var g = createNode("group"),
+                gs = g.style,
+                el = createNode("shape"),
+                ol = el.style,
+                path = createNode("path"),
+                ps = path.style,
+                o = createNode("textpath");
+            gs.position = "absolute";
+            gs.left = 0;
+            gs.top = 0;
+            gs.width = vml.width + "px";
+            gs.height = vml.height + "px";
+            g.coordsize = vml.coordsize;
+            g.coordorigin = vml.coordorigin;
+            path.v = ["m", Math.round(x), ", ", Math.round(y), "l", Math.round(x) + 1, ", ", Math.round(y)].join("");
             path.textpathok = true;
             ol.width = vml.width;
             ol.height = vml.height;
@@ -2104,11 +2009,8 @@ window.Raphael = (function () {
             gs.top = 0;
             gs.width = vml.width;
             gs.height = vml.height;
-            var o = createNode("textpath");
             o.string = text;
             o.on = true;
-            o.coordsize = vml.coordsize;
-            o.coordorigin = vml.coordorigin;
             el.appendChild(o);
             el.appendChild(path);
             g.appendChild(el);
@@ -2116,6 +2018,7 @@ window.Raphael = (function () {
             res.shape = el;
             res.textpath = path;
             res.type = "text";
+            res.attrs.text = text;
             res.attrs.x = x;
             res.attrs.y = y;
             res.attrs.w = 1;
@@ -2126,19 +2029,18 @@ window.Raphael = (function () {
             return res;
         };
         var setSize = function (width, height) {
+            var cs = this.canvas.style;
             this.width = width || this.width;
             this.height = height || this.height;
-            this.canvas.style.width = this.width + "px";
-            this.canvas.style.height = this.height + "px";
-            this.canvas.parentNode.style.clip = "rect(0 " + this.width + "px " + this.height + "px 0)";
+            cs.width = this.width + "px";
+            cs.height = this.height + "px";
+            cs.clip = "rect(0 " + this.width + "px " + this.height + "px 0)";
             this.canvas.coordsize = this.width + " " + this.height;
             return this;
         };
         doc.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
         try {
-            if (!doc.namespaces.rvml) {
-                doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
-            }
+            !doc.namespaces.rvml && doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
             var createNode = function (tagName) {
                 return doc.createElement('<rvml:' + tagName + ' class="rvml">');
             };
@@ -2148,50 +2050,42 @@ window.Raphael = (function () {
             };
         }
         var create = function () {
-            var con = getContainer.apply(null, arguments);
-            var container = con.container,
-                x = con.x,
-                y = con.y,
+            var con = getContainer.apply(null, arguments),
+                container = con.container,
+                height = con.height,
+                s,
                 width = con.width,
-                height = con.height;
+                x = con.x,
+                y = con.y;
             if (!container) {
                 throw new Error("VML container not found.");
             }
-            var c = doc.createElement("div"),
-                d = doc.createElement("div"),
-                r = paper.canvas = createNode("group"),
-                cs = c.style, rs = r.style;
+            var c = paper.canvas = doc.createElement("div"),
+                cs = c.style;
+            width = parseFloat(width) || "512px";
+            height = parseFloat(height) || "342px";
             paper.width = width;
             paper.height = height;
-            width = width || "512px";
-            height = height || "342px";
-            cs.clip = "rect(0 " + width + "px " + height + "px 0)";
-            cs.top = "-2px";
-            cs.left = "-2px";
+            paper.coordsize = width + " " + height;
+            paper.coordorigin = "0 0";
+            paper.span = doc.createElement("span");
+            s = paper.span.style;
+            c.appendChild(paper.span);
+            s.position = "absolute";
+            s.left = "-99999px";
+            s.top = "-99999px";
+            s.padding = 0;
+            s.margin = 0;
+            s.lineHeight = 1;
+            s.display = "inline";
+            cs.width  = width + "px";
+            cs.height = height + "px";
             cs.position = "absolute";
-            rs.position = "absolute";
-            d.style.position = "relative";
-            rs.width  = width;
-            rs.height = height;
-            r.coordsize = (/%$/.test(width) ? width : parseFloat(width)) + " " + (/%$/.test(height) ? height : parseFloat(height));
-            r.coordorigin = "0 0";
-
-            var b = createNode("rect"), bs = b.style;
-            bs.left = bs.top = 0;
-            bs.width  = rs.width;
-            bs.height = rs.height;
-            b.filled = b.stroked = "f";
-
-            r.appendChild(b);
-            c.appendChild(r);
-            d.appendChild(c);
+            cs.clip = "rect(0 " + width + "px " + height + "px 0)";
             if (container == 1) {
-                doc.body.appendChild(d);
-                cs.position = "absolute";
+                doc.body.appendChild(c);
                 cs.left = x + "px";
                 cs.top = y + "px";
-                cs.width = width;
-                cs.height = height;
                 container = {
                     style: {
                         width: width,
@@ -2199,12 +2093,12 @@ window.Raphael = (function () {
                     }
                 };
             } else {
-                cs.width = container.style.width = width;
-                cs.height = container.style.height = height;
+                container.style.width = width;
+                container.style.height = height;
                 if (container.firstChild) {
-                    container.insertBefore(d, container.firstChild);
+                    container.insertBefore(c, container.firstChild);
                 } else {
-                    container.appendChild(d);
+                    container.appendChild(c);
                 }
             }
             for (var prop in paper) {
@@ -2212,21 +2106,15 @@ window.Raphael = (function () {
             }
             plugins.call(container, container, R.fn);
             container.clear = function () {
-                var todel = [];
-                for (var i = 0, ii = r.childNodes.length; i < ii; i++) {
-                    if (r.childNodes[i] != b) {
-                        todel.push(r.childNodes[i]);
-                    }
-                }
-                for (i = 0, ii = todel.length; i < ii; i++) {
-                    r.removeChild(todel[i]);
+                while (c.firstChild) {
+                    c.removeChild(c.firstChild);
                 }
             };
             container.raphael = R;
             return container;
         };
         paper.remove = function () {
-            this.canvas.parentNode.parentNode.parentNode.removeChild(this.canvas.parentNode.parentNode);
+            this.canvas.parentNode.removeChild(this.canvas);
         };
         paper.safari = function () {};
     }
@@ -2305,8 +2193,8 @@ window.Raphael = (function () {
     paper.ellipse = function (x, y, rx, ry) {
         return theEllipse(this, x, y, rx, ry);
     };
-    paper.path = function (params, pathString) {
-        return thePath(params, pathString, this);
+    paper.path = function (pathString) {
+        return thePath(R.format.apply(R, arguments), this);
     };
     paper.image = function (src, x, y, w, h) {
         return theImage(this, src, x, y, w, h);
@@ -2314,90 +2202,44 @@ window.Raphael = (function () {
     paper.text = function (x, y, text) {
         return theText(this, x, y, text);
     };
-    paper.drawGrid = function (x, y, w, h, wv, hv, color) {
-        color = color || "#000";
-        var path = ["M", x, y, "L", x + w, y, x + w, y + h, x, y + h, x, y],
-            rowHeight = h / hv,
-            columnWidth = w / wv;
-        for (var i = 1; i < hv; i++) {
-            path = path.concat(["M", x, y + i * rowHeight, "L", x + w, y + i * rowHeight]);
-        }
-        for (var i = 1; i < wv; i++) {
-            path = path.concat(["M", x + i * columnWidth, y, "L", x + i * columnWidth, y + h]);
-        }
-        return this.path({stroke: color, "stroke-width": 1}, path.join(","));
-    };
-    paper.pathfinder = function (p, path) {
-        var commands = {
-            M: function (x, y) {
-                this.moveTo(x, y);
-            },
-            C: function (x1, y1, x2, y2, x3, y3) {
-                this.curveTo(x1, y1, x2, y2, x3, y3);
-            },
-            Q: function (x1, y1, x2, y2) {
-                this.qcurveTo(x1, y1, x2, y2);
-            },
-            T: function (x, y) {
-                this.qcurveTo(x, y);
-            },
-            S: function (x1, y1, x2, y2) {
-                p.curveTo(x1, y1, x2, y2);
-            },
-            L: function (x, y) {
-                p.lineTo(x, y);
-            },
-            H: function (x) {
-                this.lineTo(x, this.last.y);
-            },
-            V: function (y) {
-                this.lineTo(this.last.x, y);
-            },
-            A: function (rx, ry, xaxisrotation, largearcflag, sweepflag, x, y) {
-                this.arcTo(rx, ry, largearcflag, sweepflag, x, y);
-            },
-            Z: function () {
-                this.andClose();
-            }
-        };
-
-        path = pathToAbsolute(path);
-        for (var i = 0, ii = path.length; i < ii; i++) {
-            var b = path[i].shift();
-            commands[b].apply(p, path[i]);
-            path[i].unshift(b);
-        }
-    };
     paper.set = function (itemsArray) {
+        arguments.length > 1 && (itemsArray = Array.prototype.splice.call(arguments, 0, arguments.length));
         return new Set(itemsArray);
     };
     paper.setSize = setSize;
     Element.prototype.stop = function () {
         clearTimeout(this.animation_in_progress);
+        return this;
     };
     Element.prototype.scale = function (x, y, cx, cy) {
         if (x == null && y == null) {
-            return {x: this._.sx, y: this._.sy, toString: function () { return this.x.toFixed(3) + " " + this.y.toFixed(3); }};
+            return {x: this._.sx, y: this._.sy, toString: function () { return +this.x.toFixed(3) + " " + (+this.y.toFixed(3)); }};
         }
         y = y || x;
         !+y && (y = x);
-        var dx, dy, dcx, dcy, a = this.attrs;
+        var dx,
+            dy,
+            dcx,
+            dcy,
+            a = this.attrs;
         if (x != 0) {
-            var bb = this.type == "path" ? pathDimensions(a.path) : this.getBBox(),
+            var bb = this.getBBox(),
                 rcx = bb.x + bb.width / 2,
-                rcy = bb.y + bb.height / 2;
+                rcy = bb.y + bb.height / 2,
+                kx = x / this._.sx,
+                ky = y / this._.sy;
             cx = (+cx || cx == 0) ? cx : rcx;
             cy = (+cy || cy == 0) ? cy : rcy;
             var dirx = Math.round(x / Math.abs(x)),
                 diry = Math.round(y / Math.abs(y)),
                 s = this.node.style,
-                ncx = cx + (rcx - cx) * x * dirx / this._.sx,
-                ncy = cy + (rcy - cy) * y * diry / this._.sy;
+                ncx = cx + (rcx - cx) * dirx * kx,
+                ncy = cy + (rcy - cy) * diry * ky;
             switch (this.type) {
                 case "rect":
                 case "image":
-                    var neww = a.width * x * dirx / this._.sx,
-                        newh = a.height * y * diry / this._.sy,
+                    var neww = a.width * dirx * kx,
+                        newh = a.height * diry * ky,
                         newx = ncx - neww / 2,
                         newy = ncy - newh / 2;
                     this.attr({
@@ -2410,9 +2252,9 @@ window.Raphael = (function () {
                 case "circle":
                 case "ellipse":
                     this.attr({
-                        rx: a.rx * x / this._.sx,
-                        ry: a.ry * y / this._.sy,
-                        r: a.r * x / this._.sx,
+                        rx: a.rx * kx,
+                        ry: a.ry * ky,
+                        r: a.r * kx,
                         cx: ncx,
                         cy: ncy
                     });
@@ -2428,14 +2270,14 @@ window.Raphael = (function () {
                             skip = false;
                         }
                         if (R.svg && p[0].toUpperCase() == "A") {
-                            p[path[i].length - 2] *= x / this._.sx;
-                            p[path[i].length - 1] *= y / this._.sy;
-                            p[1] *= x / this._.sx;
-                            p[2] *= y / this._.sy;
+                            p[path[i].length - 2] *= kx;
+                            p[path[i].length - 1] *= ky;
+                            p[1] *= kx;
+                            p[2] *= ky;
                             p[5] = +(dirx + diry ? !!+p[5] : !+p[5]);
                         } else {
                             for (var j = 1, jj = p.length; j < jj; j++) {
-                                p[j] *= (j % 2) ? x / this._.sx : y / this._.sy;
+                                p[j] *= (j % 2) ? kx : ky;
                             }
                         }
                     }
@@ -2482,67 +2324,70 @@ window.Raphael = (function () {
         return this;
     };
 
+    // animation easing formulas
     R.easing_formulas = {
-        linear: function (time, beg, diff, dur) {
-          return time / dur;
+        linear: function (n) {
+            return n;
         },
-        "<": function (time, beg, diff, dur) {
-            return diff * (time /= dur) * time + beg;
+        "<": function (n) {
+            return Math.pow(n, 3);
         },
-        ">": function (time, beg, diff, dur) {
-            return -diff * (time /= dur) * (time - 2) + beg;
+        ">": function (n) {
+            return Math.pow(n - 1, 3) + 1;
         },
-        "<>": function (time, beg, diff, dur) {
-            if ((time /= dur/2) < 1) {
-                return diff / 2 * time * time + beg;
+        "<>": function (n) {
+            n = n * 2;
+            if (n < 1) {
+                return Math.pow(n, 3) / 2;
             }
-            return -diff / 2 * ((--time) * (time - 2) - 1) + beg;
+            n -= 2;
+            return (Math.pow(n, 3) + 2) / 2;
         },
-        bounce: function (time, beg, diff, dur) {
-            if ((time /= dur) < (1 / 2.75)) {
-                return diff * (7.5625 * time * time) + beg;
-            } else if (time < (2 / 2.75)) {
-                return diff * (7.5625 * (time -= (1.5 / 2.75)) * time + .75) + beg;
-            } else if (time < (2.5 / 2.75)) {
-                return diff * (7.5625 * (time -= (2.25 / 2.75)) * time + .9375) + beg;
-            } else {
-                return diff * (7.5625 * (time -= (2.625 / 2.75)) * time + .984375) + beg;
-            }
+        backIn: function (n) {
+            var s = 1.70158;
+            return n * n * ((s + 1) * n - s);
         },
-        elastic: function (time, beg, diff, dur) {
-            var s = 1.70158,
-                p = 0,
-                s,
-                a = diff;
-            if (time == 0) {
-                return beg;
-            }
-            if ((time /= dur) == 1) {
-                return beg + diff;
-            }
-            if (!p) {
-                p = dur * .3;
+        backOut: function (n) {
+            n = n - 1;
+            var s = 1.70158;
+            return n * n * ((s + 1) * n + s) + 1;
+        },
+        elastic: function (n) {
+            if (n == 0 || n == 1) {
+                return n;
             }
-            if (a < Math.abs(diff)) {
-                a = diff;
+            var p = .3,
                 s = p / 4;
+            return Math.pow(2, -10 * n) * Math.sin((n - s) * (2 * Math.PI) / p) + 1;
+        },
+        bounce: function (n) {
+            var s = 7.5625,
+                p = 2.75,
+                l;
+            if (n < (1 / p)) {
+                l = s * n * n;
             } else {
-                s = p / (2 * Math.PI) * Math.asin(diff / a);
+                if (n < (2 / p)) {
+                    n -= (1.5 / p);
+                    l = s * n * n + .75;
+                } else {
+                    if (n < (2.5 / p)) {
+                        n -= (2.25 / p);
+                        l = s * n * n + .9375;
+                    } else {
+                        n -= (2.625 / p);
+                        l = s * n * n + .984375;
+                    }
+                }
             }
-            return a * Math.pow(2, -10 * time) * Math.sin((time * dur - s) * (2 * Math.PI) / p) + diff + beg;
+            return l;
         }
     };
 
-    // animation easing formulas
-    R.easing = function(easing, time, beg, diff, dur) {
-        return (R.easing_formulas[easing] || R.easing_formulas.linear)(time, beg, diff, dur);
-    };
-
     Element.prototype.animate = function (params, ms, easing, callback) {
         clearTimeout(this.animation_in_progress);
         if (typeof easing == "function" || !easing) {
             callback = easing || null;
-            easing = "linear";
         }
         var from = {},
             to = {},
@@ -2567,7 +2412,7 @@ window.Raphael = (function () {
                         };
                         break;
                     case "path":
-                        var pathes = pathEqualiser(from[attr], to[attr]);
+                        var pathes = path2curve(from[attr], to[attr]);
                         from[attr] = pathes[0];
                         to[attr] = pathes[1];
                         diff[attr] = [];
@@ -2601,13 +2446,16 @@ window.Raphael = (function () {
         }
         var start = +new Date,
             prev = 0,
+            upto255 = function (color) {
+                return +color > 255 ? 255 : +color;
+            },
             that = this;
         (function tick() {
             var time = new Date - start,
                 set = {},
                 now;
             if (time < ms) {
-                pos = R.easing(easing, time, 0, 1, ms);
+                var pos = R.easing_formulas[easing] ? R.easing_formulas[easing](time / ms) : time / ms;
                 for (var attr in from) {
                     switch (availableAnimAttrs[attr]) {
                         case "number":
@@ -2615,9 +2463,9 @@ window.Raphael = (function () {
                             break;
                         case "colour":
                             now = "rgb(" + [
-                                Math.round(from[attr].r + pos * ms * diff[attr].r),
-                                Math.round(from[attr].g + pos * ms * diff[attr].g),
-                                Math.round(from[attr].b + pos * ms * diff[attr].b)
+                                upto255(Math.round(from[attr].r + pos * ms * diff[attr].r)),
+                                upto255(Math.round(from[attr].g + pos * ms * diff[attr].g)),
+                                upto255(Math.round(from[attr].b + pos * ms * diff[attr].b))
                             ].join(",") + ")";
                             break;
                         case "path":
@@ -2625,7 +2473,7 @@ window.Raphael = (function () {
                             for (var i = 0, ii = from[attr].length; i < ii; i++) {
                                 now[i] = [from[attr][i][0]];
                                 for (var j = 1, jj = from[attr][i].length; j < jj; j++) {
-                                    now[i][j] = from[attr][i][j] + pos * ms * diff[attr][i][j];
+                                    now[i][j] = +from[attr][i][j] + pos * ms * diff[attr][i][j];
                                 }
                                 now[i] = now[i].join(" ");
                             }
@@ -2649,20 +2497,16 @@ window.Raphael = (function () {
                             }
                             break;
                     }
-                    if (attr == "font-size") {
-                        set[attr] = now + "px";
-                    } else {
-                        set[attr] = now;
-                    }
+                    set[attr] = now;
                 }
                 that.attr(set);
                 that.animation_in_progress = setTimeout(tick);
-                paper.safari();
+                R.svg && paper.safari();
             } else {
                 (t.x || t.y) && that.translate(-t.x, -t.y);
                 that.attr(params);
                 clearTimeout(that.animation_in_progress);
-                paper.safari();
+                R.svg && paper.safari();
                 (typeof callback == "function") && callback.call(that);
             }
             prev = time;
@@ -2678,50 +2522,52 @@ window.Raphael = (function () {
         switch (this.type) {
             case "circle":
             case "ellipse":
-                this.attr({cx: this.attrs.cx + x, cy: this.attrs.cy + y});
+                this.attr({cx: +x + this.attrs.cx, cy: +y + this.attrs.cy});
                 break;
             case "rect":
             case "image":
             case "text":
-                this.attr({x: this.attrs.x + (+x), y: this.attrs.y + (+y)});
+                this.attr({x: +x + this.attrs.x, y: +y + this.attrs.y});
                 break;
             case "path":
                 var path = pathToRelative(this.attrs.path);
                 path[0][1] += +x;
                 path[0][2] += +y;
-                this.attr({path: path.join(" ")});
+                this.attr({path: path});
             break;
         }
         return this;
     };
 
     // Set
-    var Set = function () {
+    var Set = function (items) {
         this.items = [];
         this.length = 0;
-        for (var i = 0, ii = arguments.length; i < ii; i++) {
-            if (arguments[i] && (arguments[i].constructor == Element || arguments[i].constructor == Set)) {
-                this[this.items.length] = this.items[this.items.length] = arguments[i];
-                this.length++;
+        if (items) {
+            for (var i = 0, ii = items.length; i < ii; i++) {
+                if (items[i] && (items[i].constructor == Element || items[i].constructor == Set)) {
+                    this[this.items.length] = this.items[this.items.length] = items[i];
+                    this.length++;
+                }
             }
         }
     };
-    Set.prototype.push = function (item) {
-        if (item && item.constructor == Element || item.constructor == Set) {
-            var len = this.items.length;
-            this[len] = this.items[len] = item;
-            this.length++;
+    Set.prototype.push = function () {
+        var item,
+            len;
+        for (var i = 0, ii = arguments.length; i < ii; i++) {
+            item = arguments[i];
+            if (item && (item.constructor == Element || item.constructor == Set)) {
+                len = this.items.length;
+                this[len] = this.items[len] = item;
+                this.length++;
+            }
         }
         return this;
     };
-    Set.prototype.pull = function (id) {
-        var res = this.items.splice(id, 1)[0];
-        for (var j = id, jj = this.items.length; j < jj; j++) {
-            this[j] = this[j + 1];
-        }
-        delete this[jj + 1];
-        this.length--;
-        return res;
+    Set.prototype.pop = function () {
+        delete this[this.length--];
+        return this.items.pop();
     };
     for (var method in Element.prototype) {
         Set.prototype[method] = (function (methodname) {
@@ -2734,7 +2580,7 @@ window.Raphael = (function () {
         })(method);
     }
     Set.prototype.attr = function (name, value) {
-        if (name && name instanceof Array && typeof name[0] == "object") {
+        if (name && R.isArray(name) && typeof name[0] == "object") {
             for (var j = 0, jj = name.length; j < jj; j++) {
                 this.items[j].attr(name[j]);
             }
@@ -2745,9 +2591,12 @@ window.Raphael = (function () {
         }
         return this;
     };
-    
+
     Set.prototype.getBBox = function () {
-        var x = [], y = [], w = [], h = [];
+        var x = [],
+            y = [],
+            w = [],
+            h = [];
         for (var i = this.items.length; i--;) {
             var box = this.items[i].getBBox();
             x.push(box.x);
@@ -2767,26 +2616,42 @@ window.Raphael = (function () {
 
     R.registerFont = function (font) {
         if (!font.face) {
-            return;
+            return font;
         }
         this.fonts = this.fonts || {};
-        if (this.fonts[font.face["font-family"]]) {
-            this.fonts[font.face["font-family"]].push(font);
+        var fontcopy = {
+                w: font.w,
+                face: {},
+                glyphs: {}
+            },
+            family = font.face["font-family"];
+        for (var prop in font.face) {
+            fontcopy.face[prop] = font.face[prop];
+        }
+        if (this.fonts[family]) {
+            this.fonts[family].push(fontcopy);
         } else {
-            this.fonts[font.face["font-family"]] = [font];
+            this.fonts[family] = [fontcopy];
         }
         if (!font.svg) {
-            font.face["units-per-em"] = parseInt(font.face["units-per-em"], 10);
-
+            fontcopy.face["units-per-em"] = parseInt(font.face["units-per-em"], 10);
             for (var glyph in font.glyphs) {
                 var path = font.glyphs[glyph];
-                if (path.d) {
-                    path.d = "M" + path.d.replace(/[mlcxtrv]/g, function (command) {
-                        return {l: "L", c: "C", x: "z", t: "m", r: "l", v: "c"}[command] || "M";
-                    }) + "z";
+                fontcopy.glyphs[glyph] = {
+                    w: path.w,
+                    k: {},
+                    d: path.d && "M" + path.d.replace(/[mlcxtrv]/g, function (command) {
+                            return {l: "L", c: "C", x: "z", t: "m", r: "l", v: "c"}[command] || "M";
+                        }) + "z"
+                };
+                if (path.k) {
+                    for (var k in path.k) {
+                        fontcopy.glyphs[glyph].k[k] = path.k[k];
+                    }
                 }
             }
         }
+        return font;
     };
     paper.getFont = function (family, weight, style, stretch) {
         stretch = stretch || "normal";
@@ -2819,19 +2684,27 @@ window.Raphael = (function () {
             shift = 0,
             path = "",
             scale;
+        typeof font == "string" && (font = this.getFont(font));
         if (font) {
             scale = (size || 16) / font.face["units-per-em"];
             for (var i = 0, ii = letters.length; i < ii; i++) {
                 var prev = i && font.glyphs[letters[i - 1]] || {},
                     curr = font.glyphs[letters[i]];
                 shift += i ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) : 0;
-                curr && curr.d && out.push(this.path({fill: "#000", stroke: "none"}, curr.d).translate(shift, 0));
+                curr && curr.d && out.push(this.path(curr.d).attr({fill: "#000", stroke: "none", translation: [shift, 0]}));
             }
             out.scale(scale, scale, 0, y).translate(x, (size || 16) / 2);
         }
         return out;
     };
 
+    R.format = function (token) {
+        var args = R.isArray(arguments[1]) ? [0].concat(arguments[1]) : arguments;
+        token && typeof token == "string" && args.length - 1 && (token = token.replace(/\{(\d+)\}/g, function (str, i) {
+            return args[++i] || "";
+        }));
+        return token;
+    };
     R.ninja = function () {
         var r = window.Raphael;
         if (oldRaphael.was) {