You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/01/29 12:54:33 UTC

[1/9] stratos git commit: Add bootstrap popover to nodes

Repository: stratos
Updated Branches:
  refs/heads/master c429c120f -> 2c09990d5


Add bootstrap popover to nodes


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d901dad4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d901dad4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d901dad4

Branch: refs/heads/master
Commit: d901dad457e16fb977098a2b903f884a73789067
Parents: a0921a8
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Jan 28 10:54:36 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Wed Jan 28 18:10:57 2015 +0530

----------------------------------------------------------------------
 .../themes/theme0/css/custom/topology.css       | 21 ++---
 .../theme0/js/custom/applications_topology.js   | 90 +++++++++++++++++++-
 2 files changed, 94 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/d901dad4/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css
index a0d8f77..a779ccf 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css
@@ -10,19 +10,6 @@
     stroke-width: 2px;
 }
 
-div.tooltip {
-    position: absolute;
-    text-align: left;
-    width: 20em;
-    padding: .8em;
-    margin:1em;
-    font: 12px sans-serif;
-    background: lightsteelblue;
-    border: 0px;
-    border-radius: 8px;
-    pointer-events: none;
-}
-
 .application-topology {
     text-align: center;
     width: 82%;
@@ -47,4 +34,12 @@ div.tooltip {
 
 .keys>div {
     margin-top: 7px;
+}
+
+.popover-content {
+    font-size: 13px;
+}
+
+.popover.top>.arrow {
+    left: 60%;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d901dad4/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
index d73c05a..1751b42 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
@@ -34,7 +34,7 @@ function genTree(data){
                     status = items[prop].status;
 
                 if(items[prop].accessUrls){
-                    accessUrls = items[prop].accessUrls.toString();
+                    accessUrls = items[prop].accessUrls;
                 }else{
                     accessUrls = '';
                 }
@@ -163,17 +163,60 @@ function update(source) {
         });
 
     // Enter the nodes.
+    var div_html;
     var nodeEnter = node.enter().append("g")
         .attr("class", "node")
         .attr("transform", function (d) {
             return "translate(" + d.x + "," + d.y + ")";
         })
+        .attr('data-content', function (d) {
+            if (d.type == 'clusters') {
+                if(d.accessUrls != ''){
+                    var accessURLHTML = "<strong>Access URLs: </strong>";
+                    for(var i=0;i<d.accessUrls.length;i++){
+                        accessURLHTML +=  "<a href='"+ d.accessUrls[i] +"' target='_blank'>"+ d.accessUrls[i] +
+                            "</a><br/>" ;
+                    }
+
+                }else{
+                    var accessURLHTML ='';
+                }
+                div_html = "<strong>Cluster Id: </strong>" + d.name + "<br/>" +
+                            "<strong>Cluster Alias: </strong>" + d.alias + "<br/>" +
+                            accessURLHTML +
+                            "<strong>HostNames: </strong>" + d.hostNames + "<br/>" +
+                            "<strong>Service Name: </strong>" + d.serviceName + "<br/>" +
+                            "<strong>Status: </strong>" + d.status;
+
+            } else if (d.type == 'members') {
+
+                div_html = "<strong>Member Id: </strong>" + d.name + "<br/>" +
+                        "<strong>Default Private IP: </strong>" + d.defaultPrivateIP + "<br/>" +
+                        "<strong>Default Public IP: </strong>" + d.defaultPublicIP + "<br/>" +
+                        "<strong>Network Partition Id: </strong>" + d.networkPartitionId + "<br/>" +
+                        "<strong>Partition Id: </strong>" + d.partitionId + "<br/>" +
+                        "<strong>Status: </strong>" + d.status;
+            } else if (d.type == 'groups') {
+
+                div_html = "<strong>Group Instance Id: </strong>" + d.instanceId + "<br/>" +
+                        "<strong>Status: </strong>" + d.status;
+
+            } else if (d.type == 'applicationInstances') {
+                div_html = "<strong>Instance Id: </strong>" + d.name + "<br/>" +
+                        "<strong>Status: </strong>" + d.status;
+
+            } else {
+                div_html = "<strong>Alias: </strong>" + d.name + "<br/>"+
+                        "<strong>Status: </strong>" + d.status;
+
+            }
+           return div_html;
+        });
         // add tool tip for ps -eo pid,ppid,pcpu,size,comm,ruser,s
-        .on("mouseover", function (d) {
+/*        .on("mouseover", function (d) {
             div.transition()
                 .duration(200)
                 .style("opacity", .9);
-            console.log(d)
             if (d.type == 'clusters') {
                 if(d.accessUrls != ''){
                     var accessURLHTML = "<strong>Access URLs: </strong>" + d.accessUrls + "<br/>" ;
@@ -225,7 +268,7 @@ function update(source) {
             div.transition()
                 .duration(500)
                 .style("opacity", 0);
-        });
+        });*/
 
     nodeEnter.append("rect")
         .attr("x", -15)
@@ -304,4 +347,43 @@ function update(source) {
         .attr("class", "link")
         .attr("d", diagonal);
 
+    //enable popovers on nodes
+    $('svg .node').popover({
+        'trigger': 'manual'
+        ,'container': '.application-topology'
+        ,'placement': 'auto'
+        ,'white-space': 'nowrap'
+        ,'html':'true'
+        ,delay: {show: 50, hide: 400}
+    });
+
+    var timer,
+        popover_parent;
+    function hidePopover(elem) {
+        $(elem).popover('hide');
+    }
+    $('svg .node').hover(
+        function() {
+            var self = this;
+            clearTimeout(timer);
+            $('.popover').hide(); //Hide any open popovers on other elements.
+            popover_parent = self
+            $(self).popover('show');
+        },
+        function() {
+            var self = this;
+            timer = setTimeout(function(){hidePopover(self)},300);
+        });
+    $(document).on({
+        mouseenter: function() {
+            clearTimeout(timer);
+        },
+        mouseleave: function() {
+            var self = this;
+            timer = setTimeout(function(){hidePopover(popover_parent)},300);
+        }
+    }, '.popover');
+
 }
+
+


[2/9] stratos git commit: add AccessURLs to clusters

Posted by ga...@apache.org.
add AccessURLs to clusters


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a0921a85
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a0921a85
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a0921a85

Branch: refs/heads/master
Commit: a0921a859acfc035613e66a6ec3a08b400f59d5b
Parents: 65078b8
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Jan 28 05:20:40 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Wed Jan 28 18:10:57 2015 +0530

----------------------------------------------------------------------
 .../theme0/js/custom/applications_topology.js       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/a0921a85/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
index 10cce1f..d73c05a 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
@@ -32,9 +32,16 @@ function genTree(data){
                     hostNames = items[prop].hostNames.toString(),
                     serviceName = items[prop].serviceName,
                     status = items[prop].status;
+
+                if(items[prop].accessUrls){
+                    accessUrls = items[prop].accessUrls.toString();
+                }else{
+                    accessUrls = '';
+                }
                 var type = 'clusters';
                 rawout.push({"name": cur_name, "parent": parent, "type": type, "status": status,
-                    "alias":alias, "hostNames": hostNames, "serviceName": serviceName
+                    "alias":alias, "hostNames": hostNames, "serviceName": serviceName,
+                    "accessUrls":accessUrls
                 });
                 clustermembers(items[prop].member, collector, cur_name)
             }
@@ -166,10 +173,17 @@ function update(source) {
             div.transition()
                 .duration(200)
                 .style("opacity", .9);
+            console.log(d)
             if (d.type == 'clusters') {
+                if(d.accessUrls != ''){
+                    var accessURLHTML = "<strong>Access URLs: </strong>" + d.accessUrls + "<br/>" ;
+                }else{
+                    var accessURLHTML ='';
+                }
                 div.html(
                         "<strong>Cluster Id: </strong>" + d.name + "<br/>" +
                         "<strong>Cluster Alias: </strong>" + d.alias + "<br/>" +
+                            accessURLHTML +
                         "<strong>HostNames: </strong>" + d.hostNames + "<br/>" +
                         "<strong>Service Name: </strong>" + d.serviceName + "<br/>" +
                         "<strong>Status: </strong>" + d.status


[4/9] stratos git commit: cleanup and start node position correctly

Posted by ga...@apache.org.
cleanup and start node position correctly


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/84020e3f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/84020e3f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/84020e3f

Branch: refs/heads/master
Commit: 84020e3feb1be32da08e9612edf7ccfe21d7cc86
Parents: 2d67d2c
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Jan 29 11:00:59 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Thu Jan 29 11:00:59 2015 +0530

----------------------------------------------------------------------
 .../theme0/js/custom/applications_topology.js   | 68 +-------------------
 1 file changed, 3 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/84020e3f/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
index c104131..a9fd37f 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
@@ -118,7 +118,7 @@ function genTree(data){
 function update(source) {
 
     // ************** Generate the tree diagram	 *****************
-    var margin = {top: 40, right: 120, bottom: 20, left: 120},
+    var margin = {top: 80, right: 120, bottom: 20, left: 120},
         width = 900 - margin.right - margin.left,
         height = 900 - margin.top - margin.bottom;
 
@@ -153,7 +153,7 @@ function update(source) {
 
     // Normalize for fixed-depth.
     nodes.forEach(function (d) {
-        d.y = d.depth * 100;
+        d.y = d.depth * 100 + 80;
     });
 
     // Declare the nodes…
@@ -212,64 +212,7 @@ function update(source) {
             }
            return div_html;
         });
-        // add tool tip for ps -eo pid,ppid,pcpu,size,comm,ruser,s
-/*        .on("mouseover", function (d) {
-            div.transition()
-                .duration(200)
-                .style("opacity", .9);
-            if (d.type == 'clusters') {
-                if(d.accessUrls != ''){
-                    var accessURLHTML = "<strong>Access URLs: </strong>" + d.accessUrls + "<br/>" ;
-                }else{
-                    var accessURLHTML ='';
-                }
-                div.html(
-                        "<strong>Cluster Id: </strong>" + d.name + "<br/>" +
-                        "<strong>Cluster Alias: </strong>" + d.alias + "<br/>" +
-                            accessURLHTML +
-                        "<strong>HostNames: </strong>" + d.hostNames + "<br/>" +
-                        "<strong>Service Name: </strong>" + d.serviceName + "<br/>" +
-                        "<strong>Status: </strong>" + d.status
-                ).style("left", (d3.event.pageX) + "px")
-                    .style("top", (d3.event.pageY - 28) + "px");
-            } else if (d.type == 'members') {
-                div.html(
-                        "<strong>Member Id: </strong>" + d.name + "<br/>" +
-                        "<strong>Default Private IP: </strong>" + d.defaultPrivateIP + "<br/>" +
-                        "<strong>Default Public IP: </strong>" + d.defaultPublicIP + "<br/>" +
-                        "<strong>Network Partition Id: </strong>" + d.networkPartitionId + "<br/>" +
-                        "<strong>Partition Id: </strong>" + d.partitionId + "<br/>" +
-                        "<strong>Status: </strong>" + d.status
-                ).style("left", (d3.event.pageX) + "px")
-                    .style("top", (d3.event.pageY - 28) + "px");
-            } else if (d.type == 'groups') {
-                div.html(
-                        "<strong>Group Instance Id: </strong>" + d.instanceId + "<br/>" +
-                        "<strong>Status: </strong>" + d.status
-                ).style("left", (d3.event.pageX) + "px")
-                    .style("top", (d3.event.pageY - 28) + "px");
-            } else if (d.type == 'applicationInstances') {
-                div.html(
-                        "<strong>Instance Id: </strong>" + d.name + "<br/>" +
-                        "<strong>Status: </strong>" + d.status
-                ).style("left", (d3.event.pageX) + "px")
-                    .style("top", (d3.event.pageY - 28) + "px");
-
-            } else {
-                div.html(
-                        "<strong>Alias: </strong>" + d.name + "<br/>"+
-                        "<strong>Status: </strong>" + d.status
-                ).style("left", (d3.event.pageX) + "px")
-                    .style("top", (d3.event.pageY - 28) + "px");
-            }
-
-        })
-        .on("mouseout", function (d) {
-            div.transition()
-                .duration(500)
-                .style("opacity", 0);
-        });*/
-
+        // add popover on nodes
     nodeEnter.append("rect")
         .attr("x", -15)
         .attr("y", -15)
@@ -331,11 +274,6 @@ function update(source) {
         })
         .style("fill-opacity", 1);
 
-    // add the tool tip
-    var div = d3.select("body").append("div")
-        .attr("class", "tooltip")
-        .style("opacity", 0);
-
     // Declare the links…
     var link = svg.selectAll("path.link")
         .data(links, function (d) {


[5/9] stratos git commit: canvg:svg to canvas lib added

Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/e014d0ab/components/org.apache.stratos.manager.console/console/themes/theme0/js/canvg/rgbcolor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/canvg/rgbcolor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/canvg/rgbcolor.js
new file mode 100644
index 0000000..e244594
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/canvg/rgbcolor.js
@@ -0,0 +1,287 @@
+/**
+ * A class to parse color values
+ * @author Stoyan Stefanov <ss...@gmail.com>
+ * @link   http://www.phpied.com/rgb-color-parser-in-javascript/
+ * @license Use it if you like it
+ */
+function RGBColor(color_string)
+{
+    this.ok = false;
+
+    // strip any leading #
+    if (color_string.charAt(0) == '#') { // remove # if any
+        color_string = color_string.substr(1,6);
+    }
+
+    color_string = color_string.replace(/ /g,'');
+    color_string = color_string.toLowerCase();
+
+    // before getting into regexps, try simple matches
+    // and overwrite the input
+    var simple_colors = {
+        aliceblue: 'f0f8ff',
+        antiquewhite: 'faebd7',
+        aqua: '00ffff',
+        aquamarine: '7fffd4',
+        azure: 'f0ffff',
+        beige: 'f5f5dc',
+        bisque: 'ffe4c4',
+        black: '000000',
+        blanchedalmond: 'ffebcd',
+        blue: '0000ff',
+        blueviolet: '8a2be2',
+        brown: 'a52a2a',
+        burlywood: 'deb887',
+        cadetblue: '5f9ea0',
+        chartreuse: '7fff00',
+        chocolate: 'd2691e',
+        coral: 'ff7f50',
+        cornflowerblue: '6495ed',
+        cornsilk: 'fff8dc',
+        crimson: 'dc143c',
+        cyan: '00ffff',
+        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',
+        feldspar: 'd19275',
+        firebrick: 'b22222',
+        floralwhite: 'fffaf0',
+        forestgreen: '228b22',
+        fuchsia: 'ff00ff',
+        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',
+        lightgrey: 'd3d3d3',
+        lightgreen: '90ee90',
+        lightpink: 'ffb6c1',
+        lightsalmon: 'ffa07a',
+        lightseagreen: '20b2aa',
+        lightskyblue: '87cefa',
+        lightslateblue: '8470ff',
+        lightslategray: '778899',
+        lightsteelblue: 'b0c4de',
+        lightyellow: 'ffffe0',
+        lime: '00ff00',
+        limegreen: '32cd32',
+        linen: 'faf0e6',
+        magenta: 'ff00ff',
+        maroon: '800000',
+        mediumaquamarine: '66cdaa',
+        mediumblue: '0000cd',
+        mediumorchid: 'ba55d3',
+        mediumpurple: '9370d8',
+        mediumseagreen: '3cb371',
+        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: 'd87093',
+        papayawhip: 'ffefd5',
+        peachpuff: 'ffdab9',
+        peru: 'cd853f',
+        pink: 'ffc0cb',
+        plum: 'dda0dd',
+        powderblue: 'b0e0e6',
+        purple: '800080',
+        red: 'ff0000',
+        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',
+        violetred: 'd02090',
+        wheat: 'f5deb3',
+        white: 'ffffff',
+        whitesmoke: 'f5f5f5',
+        yellow: 'ffff00',
+        yellowgreen: '9acd32'
+    };
+    for (var key in simple_colors) {
+        if (color_string == key) {
+            color_string = simple_colors[key];
+        }
+    }
+    // emd of simple type-in colors
+
+    // array of color definition objects
+    var color_defs = [
+        {
+            re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
+            example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
+            process: function (bits){
+                return [
+                    parseInt(bits[1]),
+                    parseInt(bits[2]),
+                    parseInt(bits[3])
+                ];
+            }
+        },
+        {
+            re: /^(\w{2})(\w{2})(\w{2})$/,
+            example: ['#00ff00', '336699'],
+            process: function (bits){
+                return [
+                    parseInt(bits[1], 16),
+                    parseInt(bits[2], 16),
+                    parseInt(bits[3], 16)
+                ];
+            }
+        },
+        {
+            re: /^(\w{1})(\w{1})(\w{1})$/,
+            example: ['#fb0', 'f0f'],
+            process: function (bits){
+                return [
+                    parseInt(bits[1] + bits[1], 16),
+                    parseInt(bits[2] + bits[2], 16),
+                    parseInt(bits[3] + bits[3], 16)
+                ];
+            }
+        }
+    ];
+
+    // search through the definitions to find a match
+    for (var i = 0; i < color_defs.length; i++) {
+        var re = color_defs[i].re;
+        var processor = color_defs[i].process;
+        var bits = re.exec(color_string);
+        if (bits) {
+            channels = processor(bits);
+            this.r = channels[0];
+            this.g = channels[1];
+            this.b = channels[2];
+            this.ok = true;
+        }
+
+    }
+
+    // validate/cleanup values
+    this.r = (this.r < 0 || isNaN(this.r)) ? 0 : ((this.r > 255) ? 255 : this.r);
+    this.g = (this.g < 0 || isNaN(this.g)) ? 0 : ((this.g > 255) ? 255 : this.g);
+    this.b = (this.b < 0 || isNaN(this.b)) ? 0 : ((this.b > 255) ? 255 : this.b);
+
+    // some getters
+    this.toRGB = function () {
+        return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')';
+    }
+    this.toHex = function () {
+        var r = this.r.toString(16);
+        var g = this.g.toString(16);
+        var b = this.b.toString(16);
+        if (r.length == 1) r = '0' + r;
+        if (g.length == 1) g = '0' + g;
+        if (b.length == 1) b = '0' + b;
+        return '#' + r + g + b;
+    }
+
+    // help
+    this.getHelpXML = function () {
+
+        var examples = new Array();
+        // add regexps
+        for (var i = 0; i < color_defs.length; i++) {
+            var example = color_defs[i].example;
+            for (var j = 0; j < example.length; j++) {
+                examples[examples.length] = example[j];
+            }
+        }
+        // add type-in colors
+        for (var sc in simple_colors) {
+            examples[examples.length] = sc;
+        }
+
+        var xml = document.createElement('ul');
+        xml.setAttribute('id', 'rgbcolor-examples');
+        for (var i = 0; i < examples.length; i++) {
+            try {
+                var list_item = document.createElement('li');
+                var list_color = new RGBColor(examples[i]);
+                var example_div = document.createElement('div');
+                example_div.style.cssText =
+                    'margin: 3px; '
+                    + 'border: 1px solid black; '
+                    + 'background:' + list_color.toHex() + '; '
+                    + 'color:' + list_color.toHex()
+                ;
+                example_div.appendChild(document.createTextNode('test'));
+                var list_item_value = document.createTextNode(
+                        ' ' + examples[i] + ' -> ' + list_color.toRGB() + ' -> ' + list_color.toHex()
+                );
+                list_item.appendChild(example_div);
+                list_item.appendChild(list_item_value);
+                xml.appendChild(list_item);
+
+            } catch(e){}
+        }
+        return xml;
+
+    }
+
+}
\ No newline at end of file


[9/9] stratos git commit: Merge branch 'after-alpha-4' of https://github.com/dakshika/stratos

Posted by ga...@apache.org.
Merge branch 'after-alpha-4' of https://github.com/dakshika/stratos


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2c09990d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2c09990d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2c09990d

Branch: refs/heads/master
Commit: 2c09990d514204d2fb783558e62b9cad1c07e767
Parents: c429c12 8df3600
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Thu Jan 29 17:18:08 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Thu Jan 29 17:18:08 2015 +0530

----------------------------------------------------------------------
 .../themes/theme0/css/custom/topology.css       |   25 +-
 .../theme0/helpers/applications_topology.js     |    2 +-
 .../console/themes/theme0/js/canvg/canvg.js     | 2957 ++++++++++++++++++
 .../console/themes/theme0/js/canvg/rgbcolor.js  |  287 ++
 .../theme0/js/custom/applications_topology.js   |  133 +-
 .../theme0/partials/applications_topology.hbs   |   28 +
 6 files changed, 3369 insertions(+), 63 deletions(-)
----------------------------------------------------------------------



[3/9] stratos git commit: node link styles added

Posted by ga...@apache.org.
node link styles added


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2d67d2ca
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2d67d2ca
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2d67d2ca

Branch: refs/heads/master
Commit: 2d67d2cae002c96716f533bc578fcbb57e71234d
Parents: d901dad
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Jan 29 01:07:25 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Thu Jan 29 01:07:25 2015 +0530

----------------------------------------------------------------------
 .../console/themes/theme0/js/custom/applications_topology.js      | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/2d67d2ca/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
index 1751b42..c104131 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
@@ -344,6 +344,9 @@ function update(source) {
 
     // Enter the links.
     link.enter().insert("path", "g")
+        .style('fill','none')
+        .style('stroke-width','2')
+        .style('stroke','#ccc')
         .attr("class", "link")
         .attr("d", diagonal);
 


[7/9] stratos git commit: canvg:svg to canvas lib added

Posted by ga...@apache.org.
canvg:svg to canvas lib added


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e014d0ab
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e014d0ab
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e014d0ab

Branch: refs/heads/master
Commit: e014d0abf2ba214fb13eba66c10b01368fcdd289
Parents: 84020e3
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Jan 29 16:47:55 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Thu Jan 29 16:47:55 2015 +0530

----------------------------------------------------------------------
 .../console/themes/theme0/js/canvg/canvg.js     | 2957 ++++++++++++++++++
 .../console/themes/theme0/js/canvg/rgbcolor.js  |  287 ++
 2 files changed, 3244 insertions(+)
----------------------------------------------------------------------



[8/9] stratos git commit: Export to canvas initial version added

Posted by ga...@apache.org.
Export to canvas initial version added


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8df36000
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8df36000
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8df36000

Branch: refs/heads/master
Commit: 8df360002b98e708cd86c1b3c4dc979e195dc751
Parents: e014d0a
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Jan 29 16:49:33 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Thu Jan 29 16:49:33 2015 +0530

----------------------------------------------------------------------
 .../themes/theme0/css/custom/topology.css       |  4 ++-
 .../theme0/helpers/applications_topology.js     |  2 +-
 .../theme0/partials/applications_topology.hbs   | 28 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/8df36000/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css
index a779ccf..3bd34ea 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/topology.css
@@ -42,4 +42,6 @@
 
 .popover.top>.arrow {
     left: 60%;
-}
\ No newline at end of file
+}
+
+#export{margin-right: 5px;}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8df36000/components/org.apache.stratos.manager.console/console/themes/theme0/helpers/applications_topology.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/helpers/applications_topology.js b/components/org.apache.stratos.manager.console/console/themes/theme0/helpers/applications_topology.js
index dc73200..584a829 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/helpers/applications_topology.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/helpers/applications_topology.js
@@ -1,7 +1,7 @@
 var resources = function (page, meta) {
     return {
         js: ['JSONEditor-0.7.12/jsoneditor-0.7.12.js','bootstrap-switch-3.0.2/bootstrap-switch.min.js', 'custom/script.js', 'd3js-v3/d3.v3.min.js' ,
-        'custom/applications_topology.js'],
+            'canvg/rgbcolor.js', 'canvg/canvg.js','custom/applications_topology.js'],
         css: ['bootstrap-switch-3.0.2/bootstrap-switch.min.css', 'custom/style.css', 'custom/topology.css']
     };
 };

http://git-wip-us.apache.org/repos/asf/stratos/blob/8df36000/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_topology.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_topology.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_topology.hbs
index ec58a12..719e216 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_topology.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_topology.hbs
@@ -14,6 +14,7 @@
                 </div>
                 <div class='col-md-11'>
                     <button class='btn btn-info btn-lg pull-right' type='button' id='refresh' data-form=''>Refresh </button>
+                    <a class='btn btn-info btn-lg pull-right' type='button' id='export' data-form=''>Export As PNG </a>
                 </div>
             </div>
         </div>
@@ -36,6 +37,7 @@
         <div class="application-topology">
 
         </div>
+        <canvas id="canvasOriginal" height="190" width="190" style="display:none"></canvas>
     </div>
 
 </div>
@@ -64,11 +66,37 @@ $(document).ready(function () {
                 } else {
                     $(".application-topology").html('');
                     update(genTree(data));
+                    //call canvas update event
+                    canvg('canvasOriginal', new XMLSerializer().serializeToString(svg));
                 }
             }
         })
     });
 
+    //make svg to canvas
+    var svg = $('svg')[0];
+    var canvasOriginal = $('#canvasOriginal')[0];
+    var ctxOriginal = canvasOriginal.getContext('2d');
+    // this saves the inline svg to canvas without external css
+    canvg('canvasOriginal', new XMLSerializer().serializeToString(svg));
+    /**
+     * This is the function that will take care of image extracting and
+     * setting proper filename for the download.
+     * IMPORTANT: Call it from within a onclick event.
+     */
+    function downloadCanvas(link, canvasId, filename) {
+        link.href = document.getElementById(canvasId).toDataURL();
+        link.download = filename;
+    }
+
+    /**
+     * The event handler for the link's onclick event. We give THIS as a
+     * parameter (=the link element), ID of the canvas and a filename.
+     */
+    $('#export').click(function() {
+        downloadCanvas(this, 'canvasOriginal', '{{{appName}}}.png');
+    });
+
 
 });
 </script>
\ No newline at end of file


[6/9] stratos git commit: canvg:svg to canvas lib added

Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/e014d0ab/components/org.apache.stratos.manager.console/console/themes/theme0/js/canvg/canvg.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/canvg/canvg.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/canvg/canvg.js
new file mode 100644
index 0000000..00781ca
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/canvg/canvg.js
@@ -0,0 +1,2957 @@
+/*
+ * canvg.js - Javascript SVG parser and renderer on Canvas
+ * MIT Licensed
+ * Gabe Lerner (gabelerner@gmail.com)
+ * http://code.google.com/p/canvg/
+ *
+ * Requires: rgbcolor.js - http://www.phpied.com/rgb-color-parser-in-javascript/
+ */
+(function(){
+    // canvg(target, s)
+    // empty parameters: replace all 'svg' elements on page with 'canvas' elements
+    // target: canvas element or the id of a canvas element
+    // s: svg string, url to svg file, or xml document
+    // opts: optional hash of options
+    //		 ignoreMouse: true => ignore mouse events
+    //		 ignoreAnimation: true => ignore animations
+    //		 ignoreDimensions: true => does not try to resize canvas
+    //		 ignoreClear: true => does not clear canvas
+    //		 offsetX: int => draws at a x offset
+    //		 offsetY: int => draws at a y offset
+    //		 scaleWidth: int => scales horizontally to width
+    //		 scaleHeight: int => scales vertically to height
+    //		 renderCallback: function => will call the function after the first render is completed
+    //		 forceRedraw: function => will call the function on every frame, if it returns true, will redraw
+    this.canvg = function (target, s, opts) {
+        // no parameters
+        if (target == null && s == null && opts == null) {
+            var svgTags = document.querySelectorAll('svg');
+            for (var i=0; i<svgTags.length; i++) {
+                var svgTag = svgTags[i];
+                var c = document.createElement('canvas');
+                c.width = svgTag.clientWidth;
+                c.height = svgTag.clientHeight;
+                svgTag.parentNode.insertBefore(c, svgTag);
+                svgTag.parentNode.removeChild(svgTag);
+                var div = document.createElement('div');
+                div.appendChild(svgTag);
+                canvg(c, div.innerHTML);
+            }
+            return;
+        }
+
+        if (typeof target == 'string') {
+            target = document.getElementById(target);
+        }
+
+        // store class on canvas
+        if (target.svg != null) target.svg.stop();
+        var svg = build(opts || {});
+        // on i.e. 8 for flash canvas, we can't assign the property so check for it
+        if (!(target.childNodes.length == 1 && target.childNodes[0].nodeName == 'OBJECT')) target.svg = svg;
+
+        var ctx = target.getContext('2d');
+        if (typeof(s.documentElement) != 'undefined') {
+            // load from xml doc
+            svg.loadXmlDoc(ctx, s);
+        }
+        else if (s.substr(0,1) == '<') {
+            // load from xml string
+            svg.loadXml(ctx, s);
+        }
+        else {
+            // load from url
+            svg.load(ctx, s);
+        }
+    }
+
+    function build(opts) {
+        var svg = { opts: opts };
+
+        svg.FRAMERATE = 30;
+        svg.MAX_VIRTUAL_PIXELS = 30000;
+
+        svg.log = function(msg) {};
+        if (svg.opts['log'] == true && typeof(console) != 'undefined') {
+            svg.log = function(msg) { console.log(msg); };
+        };
+
+        // globals
+        svg.init = function(ctx) {
+            var uniqueId = 0;
+            svg.UniqueId = function () { uniqueId++; return 'canvg' + uniqueId;	};
+            svg.Definitions = {};
+            svg.Styles = {};
+            svg.Animations = [];
+            svg.Images = [];
+            svg.ctx = ctx;
+            svg.ViewPort = new (function () {
+                this.viewPorts = [];
+                this.Clear = function() { this.viewPorts = []; }
+                this.SetCurrent = function(width, height) { this.viewPorts.push({ width: width, height: height }); }
+                this.RemoveCurrent = function() { this.viewPorts.pop(); }
+                this.Current = function() { return this.viewPorts[this.viewPorts.length - 1]; }
+                this.width = function() { return this.Current().width; }
+                this.height = function() { return this.Current().height; }
+                this.ComputeSize = function(d) {
+                    if (d != null && typeof(d) == 'number') return d;
+                    if (d == 'x') return this.width();
+                    if (d == 'y') return this.height();
+                    return Math.sqrt(Math.pow(this.width(), 2) + Math.pow(this.height(), 2)) / Math.sqrt(2);
+                }
+            });
+        }
+        svg.init();
+
+        // images loaded
+        svg.ImagesLoaded = function() {
+            for (var i=0; i<svg.Images.length; i++) {
+                if (!svg.Images[i].loaded) return false;
+            }
+            return true;
+        }
+
+        // trim
+        svg.trim = function(s) { return s.replace(/^\s+|\s+$/g, ''); }
+
+        // compress spaces
+        svg.compressSpaces = function(s) { return s.replace(/[\s\r\t\n]+/gm,' '); }
+
+        // ajax
+        svg.ajax = function(url) {
+            var AJAX;
+            if(window.XMLHttpRequest){AJAX=new XMLHttpRequest();}
+            else{AJAX=new ActiveXObject('Microsoft.XMLHTTP');}
+            if(AJAX){
+                AJAX.open('GET',url,false);
+                AJAX.send(null);
+                return AJAX.responseText;
+            }
+            return null;
+        }
+
+        // parse xml
+        svg.parseXml = function(xml) {
+            if (typeof(Windows) != 'undefined' && typeof(Windows.Data) != 'undefined' && typeof(Windows.Data.Xml) != 'undefined') {
+                var xmlDoc = new Windows.Data.Xml.Dom.XmlDocument();
+                var settings = new Windows.Data.Xml.Dom.XmlLoadSettings();
+                settings.prohibitDtd = false;
+                xmlDoc.loadXml(xml, settings);
+                return xmlDoc;
+            }
+            else if (window.DOMParser)
+            {
+                var parser = new DOMParser();
+                return parser.parseFromString(xml, 'text/xml');
+            }
+            else
+            {
+                xml = xml.replace(/<!DOCTYPE svg[^>]*>/, '');
+                var xmlDoc = new ActiveXObject('Microsoft.XMLDOM');
+                xmlDoc.async = 'false';
+                xmlDoc.loadXML(xml);
+                return xmlDoc;
+            }
+        }
+
+        svg.Property = function(name, value) {
+            this.name = name;
+            this.value = value;
+        }
+        svg.Property.prototype.getValue = function() {
+            return this.value;
+        }
+
+        svg.Property.prototype.hasValue = function() {
+            return (this.value != null && this.value !== '');
+        }
+
+        // return the numerical value of the property
+        svg.Property.prototype.numValue = function() {
+            if (!this.hasValue()) return 0;
+
+            var n = parseFloat(this.value);
+            if ((this.value + '').match(/%$/)) {
+                n = n / 100.0;
+            }
+            return n;
+        }
+
+        svg.Property.prototype.valueOrDefault = function(def) {
+            if (this.hasValue()) return this.value;
+            return def;
+        }
+
+        svg.Property.prototype.numValueOrDefault = function(def) {
+            if (this.hasValue()) return this.numValue();
+            return def;
+        }
+
+        // color extensions
+        // augment the current color value with the opacity
+        svg.Property.prototype.addOpacity = function(opacityProp) {
+            var newValue = this.value;
+            if (opacityProp.value != null && opacityProp.value != '' && typeof(this.value)=='string') { // can only add opacity to colors, not patterns
+                var color = new RGBColor(this.value);
+                if (color.ok) {
+                    newValue = 'rgba(' + color.r + ', ' + color.g + ', ' + color.b + ', ' + opacityProp.numValue() + ')';
+                }
+            }
+            return new svg.Property(this.name, newValue);
+        }
+
+        // definition extensions
+        // get the definition from the definitions table
+        svg.Property.prototype.getDefinition = function() {
+            var name = this.value.match(/#([^\)'"]+)/);
+            if (name) { name = name[1]; }
+            if (!name) { name = this.value; }
+            return svg.Definitions[name];
+        }
+
+        svg.Property.prototype.isUrlDefinition = function() {
+            return this.value.indexOf('url(') == 0
+        }
+
+        svg.Property.prototype.getFillStyleDefinition = function(e, opacityProp) {
+            var def = this.getDefinition();
+
+            // gradient
+            if (def != null && def.createGradient) {
+                return def.createGradient(svg.ctx, e, opacityProp);
+            }
+
+            // pattern
+            if (def != null && def.createPattern) {
+                if (def.getHrefAttribute().hasValue()) {
+                    var pt = def.attribute('patternTransform');
+                    def = def.getHrefAttribute().getDefinition();
+                    if (pt.hasValue()) { def.attribute('patternTransform', true).value = pt.value; }
+                }
+                return def.createPattern(svg.ctx, e);
+            }
+
+            return null;
+        }
+
+        // length extensions
+        svg.Property.prototype.getDPI = function(viewPort) {
+            return 96.0; // TODO: compute?
+        }
+
+        svg.Property.prototype.getEM = function(viewPort) {
+            var em = 12;
+
+            var fontSize = new svg.Property('fontSize', svg.Font.Parse(svg.ctx.font).fontSize);
+            if (fontSize.hasValue()) em = fontSize.toPixels(viewPort);
+
+            return em;
+        }
+
+        svg.Property.prototype.getUnits = function() {
+            var s = this.value+'';
+            return s.replace(/[0-9\.\-]/g,'');
+        }
+
+        // get the length as pixels
+        svg.Property.prototype.toPixels = function(viewPort, processPercent) {
+            if (!this.hasValue()) return 0;
+            var s = this.value+'';
+            if (s.match(/em$/)) return this.numValue() * this.getEM(viewPort);
+            if (s.match(/ex$/)) return this.numValue() * this.getEM(viewPort) / 2.0;
+            if (s.match(/px$/)) return this.numValue();
+            if (s.match(/pt$/)) return this.numValue() * this.getDPI(viewPort) * (1.0 / 72.0);
+            if (s.match(/pc$/)) return this.numValue() * 15;
+            if (s.match(/cm$/)) return this.numValue() * this.getDPI(viewPort) / 2.54;
+            if (s.match(/mm$/)) return this.numValue() * this.getDPI(viewPort) / 25.4;
+            if (s.match(/in$/)) return this.numValue() * this.getDPI(viewPort);
+            if (s.match(/%$/)) return this.numValue() * svg.ViewPort.ComputeSize(viewPort);
+            var n = this.numValue();
+            if (processPercent && n < 1.0) return n * svg.ViewPort.ComputeSize(viewPort);
+            return n;
+        }
+
+        // time extensions
+        // get the time as milliseconds
+        svg.Property.prototype.toMilliseconds = function() {
+            if (!this.hasValue()) return 0;
+            var s = this.value+'';
+            if (s.match(/s$/)) return this.numValue() * 1000;
+            if (s.match(/ms$/)) return this.numValue();
+            return this.numValue();
+        }
+
+        // angle extensions
+        // get the angle as radians
+        svg.Property.prototype.toRadians = function() {
+            if (!this.hasValue()) return 0;
+            var s = this.value+'';
+            if (s.match(/deg$/)) return this.numValue() * (Math.PI / 180.0);
+            if (s.match(/grad$/)) return this.numValue() * (Math.PI / 200.0);
+            if (s.match(/rad$/)) return this.numValue();
+            return this.numValue() * (Math.PI / 180.0);
+        }
+
+        // text extensions
+        // get the text baseline
+        var textBaselineMapping = {
+            'baseline': 'alphabetic',
+            'before-edge': 'top',
+            'text-before-edge': 'top',
+            'middle': 'middle',
+            'central': 'middle',
+            'after-edge': 'bottom',
+            'text-after-edge': 'bottom',
+            'ideographic': 'ideographic',
+            'alphabetic': 'alphabetic',
+            'hanging': 'hanging',
+            'mathematical': 'alphabetic'
+        };
+        svg.Property.prototype.toTextBaseline = function () {
+            if (!this.hasValue()) return null;
+            return textBaselineMapping[this.value];
+        }
+
+        // fonts
+        svg.Font = new (function() {
+            this.Styles = 'normal|italic|oblique|inherit';
+            this.Variants = 'normal|small-caps|inherit';
+            this.Weights = 'normal|bold|bolder|lighter|100|200|300|400|500|600|700|800|900|inherit';
+
+            this.CreateFont = function(fontStyle, fontVariant, fontWeight, fontSize, fontFamily, inherit) {
+                var f = inherit != null ? this.Parse(inherit) : this.CreateFont('', '', '', '', '', svg.ctx.font);
+                return {
+                    fontFamily: fontFamily || f.fontFamily,
+                    fontSize: fontSize || f.fontSize,
+                    fontStyle: fontStyle || f.fontStyle,
+                    fontWeight: fontWeight || f.fontWeight,
+                    fontVariant: fontVariant || f.fontVariant,
+                    toString: function () { return [this.fontStyle, this.fontVariant, this.fontWeight, this.fontSize, this.fontFamily].join(' ') }
+                }
+            }
+
+            var that = this;
+            this.Parse = function(s) {
+                var f = {};
+                var d = svg.trim(svg.compressSpaces(s || '')).split(' ');
+                var set = { fontSize: false, fontStyle: false, fontWeight: false, fontVariant: false }
+                var ff = '';
+                for (var i=0; i<d.length; i++) {
+                    if (!set.fontStyle && that.Styles.indexOf(d[i]) != -1) { if (d[i] != 'inherit') f.fontStyle = d[i]; set.fontStyle = true; }
+                    else if (!set.fontVariant && that.Variants.indexOf(d[i]) != -1) { if (d[i] != 'inherit') f.fontVariant = d[i]; set.fontStyle = set.fontVariant = true;	}
+                    else if (!set.fontWeight && that.Weights.indexOf(d[i]) != -1) {	if (d[i] != 'inherit') f.fontWeight = d[i]; set.fontStyle = set.fontVariant = set.fontWeight = true; }
+                    else if (!set.fontSize) { if (d[i] != 'inherit') f.fontSize = d[i].split('/')[0]; set.fontStyle = set.fontVariant = set.fontWeight = set.fontSize = true; }
+                    else { if (d[i] != 'inherit') ff += d[i]; }
+                } if (ff != '') f.fontFamily = ff;
+                return f;
+            }
+        });
+
+        // points and paths
+        svg.ToNumberArray = function(s) {
+            var a = svg.trim(svg.compressSpaces((s || '').replace(/,/g, ' '))).split(' ');
+            for (var i=0; i<a.length; i++) {
+                a[i] = parseFloat(a[i]);
+            }
+            return a;
+        }
+        svg.Point = function(x, y) {
+            this.x = x;
+            this.y = y;
+        }
+        svg.Point.prototype.angleTo = function(p) {
+            return Math.atan2(p.y - this.y, p.x - this.x);
+        }
+
+        svg.Point.prototype.applyTransform = function(v) {
+            var xp = this.x * v[0] + this.y * v[2] + v[4];
+            var yp = this.x * v[1] + this.y * v[3] + v[5];
+            this.x = xp;
+            this.y = yp;
+        }
+
+        svg.CreatePoint = function(s) {
+            var a = svg.ToNumberArray(s);
+            return new svg.Point(a[0], a[1]);
+        }
+        svg.CreatePath = function(s) {
+            var a = svg.ToNumberArray(s);
+            var path = [];
+            for (var i=0; i<a.length; i+=2) {
+                path.push(new svg.Point(a[i], a[i+1]));
+            }
+            return path;
+        }
+
+        // bounding box
+        svg.BoundingBox = function(x1, y1, x2, y2) { // pass in initial points if you want
+            this.x1 = Number.NaN;
+            this.y1 = Number.NaN;
+            this.x2 = Number.NaN;
+            this.y2 = Number.NaN;
+
+            this.x = function() { return this.x1; }
+            this.y = function() { return this.y1; }
+            this.width = function() { return this.x2 - this.x1; }
+            this.height = function() { return this.y2 - this.y1; }
+
+            this.addPoint = function(x, y) {
+                if (x != null) {
+                    if (isNaN(this.x1) || isNaN(this.x2)) {
+                        this.x1 = x;
+                        this.x2 = x;
+                    }
+                    if (x < this.x1) this.x1 = x;
+                    if (x > this.x2) this.x2 = x;
+                }
+
+                if (y != null) {
+                    if (isNaN(this.y1) || isNaN(this.y2)) {
+                        this.y1 = y;
+                        this.y2 = y;
+                    }
+                    if (y < this.y1) this.y1 = y;
+                    if (y > this.y2) this.y2 = y;
+                }
+            }
+            this.addX = function(x) { this.addPoint(x, null); }
+            this.addY = function(y) { this.addPoint(null, y); }
+
+            this.addBoundingBox = function(bb) {
+                this.addPoint(bb.x1, bb.y1);
+                this.addPoint(bb.x2, bb.y2);
+            }
+
+            this.addQuadraticCurve = function(p0x, p0y, p1x, p1y, p2x, p2y) {
+                var cp1x = p0x + 2/3 * (p1x - p0x); // CP1 = QP0 + 2/3 *(QP1-QP0)
+                var cp1y = p0y + 2/3 * (p1y - p0y); // CP1 = QP0 + 2/3 *(QP1-QP0)
+                var cp2x = cp1x + 1/3 * (p2x - p0x); // CP2 = CP1 + 1/3 *(QP2-QP0)
+                var cp2y = cp1y + 1/3 * (p2y - p0y); // CP2 = CP1 + 1/3 *(QP2-QP0)
+                this.addBezierCurve(p0x, p0y, cp1x, cp2x, cp1y,	cp2y, p2x, p2y);
+            }
+
+            this.addBezierCurve = function(p0x, p0y, p1x, p1y, p2x, p2y, p3x, p3y) {
+                // from http://blog.hackers-cafe.net/2009/06/how-to-calculate-bezier-curves-bounding.html
+                var p0 = [p0x, p0y], p1 = [p1x, p1y], p2 = [p2x, p2y], p3 = [p3x, p3y];
+                this.addPoint(p0[0], p0[1]);
+                this.addPoint(p3[0], p3[1]);
+
+                for (i=0; i<=1; i++) {
+                    var f = function(t) {
+                        return Math.pow(1-t, 3) * p0[i]
+                            + 3 * Math.pow(1-t, 2) * t * p1[i]
+                            + 3 * (1-t) * Math.pow(t, 2) * p2[i]
+                            + Math.pow(t, 3) * p3[i];
+                    }
+
+                    var b = 6 * p0[i] - 12 * p1[i] + 6 * p2[i];
+                    var a = -3 * p0[i] + 9 * p1[i] - 9 * p2[i] + 3 * p3[i];
+                    var c = 3 * p1[i] - 3 * p0[i];
+
+                    if (a == 0) {
+                        if (b == 0) continue;
+                        var t = -c / b;
+                        if (0 < t && t < 1) {
+                            if (i == 0) this.addX(f(t));
+                            if (i == 1) this.addY(f(t));
+                        }
+                        continue;
+                    }
+
+                    var b2ac = Math.pow(b, 2) - 4 * c * a;
+                    if (b2ac < 0) continue;
+                    var t1 = (-b + Math.sqrt(b2ac)) / (2 * a);
+                    if (0 < t1 && t1 < 1) {
+                        if (i == 0) this.addX(f(t1));
+                        if (i == 1) this.addY(f(t1));
+                    }
+                    var t2 = (-b - Math.sqrt(b2ac)) / (2 * a);
+                    if (0 < t2 && t2 < 1) {
+                        if (i == 0) this.addX(f(t2));
+                        if (i == 1) this.addY(f(t2));
+                    }
+                }
+            }
+
+            this.isPointInBox = function(x, y) {
+                return (this.x1 <= x && x <= this.x2 && this.y1 <= y && y <= this.y2);
+            }
+
+            this.addPoint(x1, y1);
+            this.addPoint(x2, y2);
+        }
+
+        // transforms
+        svg.Transform = function(v) {
+            var that = this;
+            this.Type = {}
+
+            // translate
+            this.Type.translate = function(s) {
+                this.p = svg.CreatePoint(s);
+                this.apply = function(ctx) {
+                    ctx.translate(this.p.x || 0.0, this.p.y || 0.0);
+                }
+                this.unapply = function(ctx) {
+                    ctx.translate(-1.0 * this.p.x || 0.0, -1.0 * this.p.y || 0.0);
+                }
+                this.applyToPoint = function(p) {
+                    p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]);
+                }
+            }
+
+            // rotate
+            this.Type.rotate = function(s) {
+                var a = svg.ToNumberArray(s);
+                this.angle = new svg.Property('angle', a[0]);
+                this.cx = a[1] || 0;
+                this.cy = a[2] || 0;
+                this.apply = function(ctx) {
+                    ctx.translate(this.cx, this.cy);
+                    ctx.rotate(this.angle.toRadians());
+                    ctx.translate(-this.cx, -this.cy);
+                }
+                this.unapply = function(ctx) {
+                    ctx.translate(this.cx, this.cy);
+                    ctx.rotate(-1.0 * this.angle.toRadians());
+                    ctx.translate(-this.cx, -this.cy);
+                }
+                this.applyToPoint = function(p) {
+                    var a = this.angle.toRadians();
+                    p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]);
+                    p.applyTransform([Math.cos(a), Math.sin(a), -Math.sin(a), Math.cos(a), 0, 0]);
+                    p.applyTransform([1, 0, 0, 1, -this.p.x || 0.0, -this.p.y || 0.0]);
+                }
+            }
+
+            this.Type.scale = function(s) {
+                this.p = svg.CreatePoint(s);
+                this.apply = function(ctx) {
+                    ctx.scale(this.p.x || 1.0, this.p.y || this.p.x || 1.0);
+                }
+                this.unapply = function(ctx) {
+                    ctx.scale(1.0 / this.p.x || 1.0, 1.0 / this.p.y || this.p.x || 1.0);
+                }
+                this.applyToPoint = function(p) {
+                    p.applyTransform([this.p.x || 0.0, 0, 0, this.p.y || 0.0, 0, 0]);
+                }
+            }
+
+            this.Type.matrix = function(s) {
+                this.m = svg.ToNumberArray(s);
+                this.apply = function(ctx) {
+                    ctx.transform(this.m[0], this.m[1], this.m[2], this.m[3], this.m[4], this.m[5]);
+                }
+                this.unapply = function(ctx) {
+                    var a = this.m[0];
+                    var b = this.m[2];
+                    var c = this.m[4];
+                    var d = this.m[1];
+                    var e = this.m[3];
+                    var f = this.m[5];
+                    var g = 0.0;
+                    var h = 0.0;
+                    var i = 1.0;
+                    var det = 1 / (a*(e*i-f*h)-b*(d*i-f*g)+c*(d*h-e*g));
+                    ctx.transform(
+                            det*(e*i-f*h),
+                            det*(f*g-d*i),
+                            det*(c*h-b*i),
+                            det*(a*i-c*g),
+                            det*(b*f-c*e),
+                            det*(c*d-a*f)
+                    );
+                }
+                this.applyToPoint = function(p) {
+                    p.applyTransform(this.m);
+                }
+            }
+
+            this.Type.SkewBase = function(s) {
+                this.base = that.Type.matrix;
+                this.base(s);
+                this.angle = new svg.Property('angle', s);
+            }
+            this.Type.SkewBase.prototype = new this.Type.matrix;
+
+            this.Type.skewX = function(s) {
+                this.base = that.Type.SkewBase;
+                this.base(s);
+                this.m = [1, 0, Math.tan(this.angle.toRadians()), 1, 0, 0];
+            }
+            this.Type.skewX.prototype = new this.Type.SkewBase;
+
+            this.Type.skewY = function(s) {
+                this.base = that.Type.SkewBase;
+                this.base(s);
+                this.m = [1, Math.tan(this.angle.toRadians()), 0, 1, 0, 0];
+            }
+            this.Type.skewY.prototype = new this.Type.SkewBase;
+
+            this.transforms = [];
+
+            this.apply = function(ctx) {
+                for (var i=0; i<this.transforms.length; i++) {
+                    this.transforms[i].apply(ctx);
+                }
+            }
+
+            this.unapply = function(ctx) {
+                for (var i=this.transforms.length-1; i>=0; i--) {
+                    this.transforms[i].unapply(ctx);
+                }
+            }
+
+            this.applyToPoint = function(p) {
+                for (var i=0; i<this.transforms.length; i++) {
+                    this.transforms[i].applyToPoint(p);
+                }
+            }
+
+            var data = svg.trim(svg.compressSpaces(v)).replace(/\)([a-zA-Z])/g, ') $1').replace(/\)(\s?,\s?)/g,') ').split(/\s(?=[a-z])/);
+            for (var i=0; i<data.length; i++) {
+                var type = svg.trim(data[i].split('(')[0]);
+                var s = data[i].split('(')[1].replace(')','');
+                var transform = new this.Type[type](s);
+                transform.type = type;
+                this.transforms.push(transform);
+            }
+        }
+
+        // aspect ratio
+        svg.AspectRatio = function(ctx, aspectRatio, width, desiredWidth, height, desiredHeight, minX, minY, refX, refY) {
+            // aspect ratio - http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute
+            aspectRatio = svg.compressSpaces(aspectRatio);
+            aspectRatio = aspectRatio.replace(/^defer\s/,''); // ignore defer
+            var align = aspectRatio.split(' ')[0] || 'xMidYMid';
+            var meetOrSlice = aspectRatio.split(' ')[1] || 'meet';
+
+            // calculate scale
+            var scaleX = width / desiredWidth;
+            var scaleY = height / desiredHeight;
+            var scaleMin = Math.min(scaleX, scaleY);
+            var scaleMax = Math.max(scaleX, scaleY);
+            if (meetOrSlice == 'meet') { desiredWidth *= scaleMin; desiredHeight *= scaleMin; }
+            if (meetOrSlice == 'slice') { desiredWidth *= scaleMax; desiredHeight *= scaleMax; }
+
+            refX = new svg.Property('refX', refX);
+            refY = new svg.Property('refY', refY);
+            if (refX.hasValue() && refY.hasValue()) {
+                ctx.translate(-scaleMin * refX.toPixels('x'), -scaleMin * refY.toPixels('y'));
+            }
+            else {
+                // align
+                if (align.match(/^xMid/) && ((meetOrSlice == 'meet' && scaleMin == scaleY) || (meetOrSlice == 'slice' && scaleMax == scaleY))) ctx.translate(width / 2.0 - desiredWidth / 2.0, 0);
+                if (align.match(/YMid$/) && ((meetOrSlice == 'meet' && scaleMin == scaleX) || (meetOrSlice == 'slice' && scaleMax == scaleX))) ctx.translate(0, height / 2.0 - desiredHeight / 2.0);
+                if (align.match(/^xMax/) && ((meetOrSlice == 'meet' && scaleMin == scaleY) || (meetOrSlice == 'slice' && scaleMax == scaleY))) ctx.translate(width - desiredWidth, 0);
+                if (align.match(/YMax$/) && ((meetOrSlice == 'meet' && scaleMin == scaleX) || (meetOrSlice == 'slice' && scaleMax == scaleX))) ctx.translate(0, height - desiredHeight);
+            }
+
+            // scale
+            if (align == 'none') ctx.scale(scaleX, scaleY);
+            else if (meetOrSlice == 'meet') ctx.scale(scaleMin, scaleMin);
+            else if (meetOrSlice == 'slice') ctx.scale(scaleMax, scaleMax);
+
+            // translate
+            ctx.translate(minX == null ? 0 : -minX, minY == null ? 0 : -minY);
+        }
+
+        // elements
+        svg.Element = {}
+
+        svg.EmptyProperty = new svg.Property('EMPTY', '');
+
+        svg.Element.ElementBase = function(node) {
+            this.attributes = {};
+            this.styles = {};
+            this.children = [];
+
+            // get or create attribute
+            this.attribute = function(name, createIfNotExists) {
+                var a = this.attributes[name];
+                if (a != null) return a;
+
+                if (createIfNotExists == true) { a = new svg.Property(name, ''); this.attributes[name] = a; }
+                return a || svg.EmptyProperty;
+            }
+
+            this.getHrefAttribute = function() {
+                for (var a in this.attributes) {
+                    if (a.match(/:href$/)) {
+                        return this.attributes[a];
+                    }
+                }
+                return svg.EmptyProperty;
+            }
+
+            // get or create style, crawls up node tree
+            this.style = function(name, createIfNotExists, skipAncestors) {
+                var s = this.styles[name];
+                if (s != null) return s;
+
+                var a = this.attribute(name);
+                if (a != null && a.hasValue()) {
+                    this.styles[name] = a; // move up to me to cache
+                    return a;
+                }
+
+                if (skipAncestors != true) {
+                    var p = this.parent;
+                    if (p != null) {
+                        var ps = p.style(name);
+                        if (ps != null && ps.hasValue()) {
+                            return ps;
+                        }
+                    }
+                }
+
+                if (createIfNotExists == true) { s = new svg.Property(name, ''); this.styles[name] = s; }
+                return s || svg.EmptyProperty;
+            }
+
+            // base render
+            this.render = function(ctx) {
+                // don't render display=none
+                if (this.style('display').value == 'none') return;
+
+                // don't render visibility=hidden
+                if (this.style('visibility').value == 'hidden') return;
+
+                ctx.save();
+                if (this.attribute('mask').hasValue()) { // mask
+                    var mask = this.attribute('mask').getDefinition();
+                    if (mask != null) mask.apply(ctx, this);
+                }
+                else if (this.style('filter').hasValue()) { // filter
+                    var filter = this.style('filter').getDefinition();
+                    if (filter != null) filter.apply(ctx, this);
+                }
+                else {
+                    this.setContext(ctx);
+                    this.renderChildren(ctx);
+                    this.clearContext(ctx);
+                }
+                ctx.restore();
+            }
+
+            // base set context
+            this.setContext = function(ctx) {
+                // OVERRIDE ME!
+            }
+
+            // base clear context
+            this.clearContext = function(ctx) {
+                // OVERRIDE ME!
+            }
+
+            // base render children
+            this.renderChildren = function(ctx) {
+                for (var i=0; i<this.children.length; i++) {
+                    this.children[i].render(ctx);
+                }
+            }
+
+            this.addChild = function(childNode, create) {
+                var child = childNode;
+                if (create) child = svg.CreateElement(childNode);
+                child.parent = this;
+                if (child.type != 'title') { this.children.push(child);	}
+            }
+
+            if (node != null && node.nodeType == 1) { //ELEMENT_NODE
+                // add attributes
+                for (var i=0; i<node.attributes.length; i++) {
+                    var attribute = node.attributes[i];
+                    this.attributes[attribute.nodeName] = new svg.Property(attribute.nodeName, attribute.nodeValue);
+                }
+
+                // add tag styles
+                var styles = svg.Styles[node.nodeName];
+                if (styles != null) {
+                    for (var name in styles) {
+                        this.styles[name] = styles[name];
+                    }
+                }
+
+                // add class styles
+                if (this.attribute('class').hasValue()) {
+                    var classes = svg.compressSpaces(this.attribute('class').value).split(' ');
+                    for (var j=0; j<classes.length; j++) {
+                        styles = svg.Styles['.'+classes[j]];
+                        if (styles != null) {
+                            for (var name in styles) {
+                                this.styles[name] = styles[name];
+                            }
+                        }
+                        styles = svg.Styles[node.nodeName+'.'+classes[j]];
+                        if (styles != null) {
+                            for (var name in styles) {
+                                this.styles[name] = styles[name];
+                            }
+                        }
+                    }
+                }
+
+                // add id styles
+                if (this.attribute('id').hasValue()) {
+                    var styles = svg.Styles['#' + this.attribute('id').value];
+                    if (styles != null) {
+                        for (var name in styles) {
+                            this.styles[name] = styles[name];
+                        }
+                    }
+                }
+
+                // add inline styles
+                if (this.attribute('style').hasValue()) {
+                    var styles = this.attribute('style').value.split(';');
+                    for (var i=0; i<styles.length; i++) {
+                        if (svg.trim(styles[i]) != '') {
+                            var style = styles[i].split(':');
+                            var name = svg.trim(style[0]);
+                            var value = svg.trim(style[1]);
+                            this.styles[name] = new svg.Property(name, value);
+                        }
+                    }
+                }
+
+                // add id
+                if (this.attribute('id').hasValue()) {
+                    if (svg.Definitions[this.attribute('id').value] == null) {
+                        svg.Definitions[this.attribute('id').value] = this;
+                    }
+                }
+
+                // add children
+                for (var i=0; i<node.childNodes.length; i++) {
+                    var childNode = node.childNodes[i];
+                    if (childNode.nodeType == 1) this.addChild(childNode, true); //ELEMENT_NODE
+                    if (this.captureTextNodes && (childNode.nodeType == 3 || childNode.nodeType == 4)) {
+                        var text = childNode.nodeValue || childNode.text || '';
+                        if (svg.trim(svg.compressSpaces(text)) != '') {
+                            this.addChild(new svg.Element.tspan(childNode), false); // TEXT_NODE
+                        }
+                    }
+                }
+            }
+        }
+
+        svg.Element.RenderedElementBase = function(node) {
+            this.base = svg.Element.ElementBase;
+            this.base(node);
+
+            this.setContext = function(ctx) {
+                // fill
+                if (this.style('fill').isUrlDefinition()) {
+                    var fs = this.style('fill').getFillStyleDefinition(this, this.style('fill-opacity'));
+                    if (fs != null) ctx.fillStyle = fs;
+                }
+                else if (this.style('fill').hasValue()) {
+                    var fillStyle = this.style('fill');
+                    if (fillStyle.value == 'currentColor') fillStyle.value = this.style('color').value;
+                    if (fillStyle.value != 'inherit') ctx.fillStyle = (fillStyle.value == 'none' ? 'rgba(0,0,0,0)' : fillStyle.value);
+                }
+                if (this.style('fill-opacity').hasValue()) {
+                    var fillStyle = new svg.Property('fill', ctx.fillStyle);
+                    fillStyle = fillStyle.addOpacity(this.style('fill-opacity'));
+                    ctx.fillStyle = fillStyle.value;
+                }
+
+                // stroke
+                if (this.style('stroke').isUrlDefinition()) {
+                    var fs = this.style('stroke').getFillStyleDefinition(this, this.style('stroke-opacity'));
+                    if (fs != null) ctx.strokeStyle = fs;
+                }
+                else if (this.style('stroke').hasValue()) {
+                    var strokeStyle = this.style('stroke');
+                    if (strokeStyle.value == 'currentColor') strokeStyle.value = this.style('color').value;
+                    if (strokeStyle.value != 'inherit') ctx.strokeStyle = (strokeStyle.value == 'none' ? 'rgba(0,0,0,0)' : strokeStyle.value);
+                }
+                if (this.style('stroke-opacity').hasValue()) {
+                    var strokeStyle = new svg.Property('stroke', ctx.strokeStyle);
+                    strokeStyle = strokeStyle.addOpacity(this.style('stroke-opacity'));
+                    ctx.strokeStyle = strokeStyle.value;
+                }
+                if (this.style('stroke-width').hasValue()) {
+                    var newLineWidth = this.style('stroke-width').toPixels();
+                    ctx.lineWidth = newLineWidth == 0 ? 0.001 : newLineWidth; // browsers don't respect 0
+                }
+                if (this.style('stroke-linecap').hasValue()) ctx.lineCap = this.style('stroke-linecap').value;
+                if (this.style('stroke-linejoin').hasValue()) ctx.lineJoin = this.style('stroke-linejoin').value;
+                if (this.style('stroke-miterlimit').hasValue()) ctx.miterLimit = this.style('stroke-miterlimit').value;
+                if (this.style('stroke-dasharray').hasValue() && this.style('stroke-dasharray').value != 'none') {
+                    var gaps = svg.ToNumberArray(this.style('stroke-dasharray').value);
+                    if (typeof(ctx.setLineDash) != 'undefined') { ctx.setLineDash(gaps); }
+                    else if (typeof(ctx.webkitLineDash) != 'undefined') { ctx.webkitLineDash = gaps; }
+                    else if (typeof(ctx.mozDash) != 'undefined' && !(gaps.length==1 && gaps[0]==0)) { ctx.mozDash = gaps; }
+
+                    var offset = this.style('stroke-dashoffset').numValueOrDefault(1);
+                    if (typeof(ctx.lineDashOffset) != 'undefined') { ctx.lineDashOffset = offset; }
+                    else if (typeof(ctx.webkitLineDashOffset) != 'undefined') { ctx.webkitLineDashOffset = offset; }
+                    else if (typeof(ctx.mozDashOffset) != 'undefined') { ctx.mozDashOffset = offset; }
+                }
+
+                // font
+                if (typeof(ctx.font) != 'undefined') {
+                    ctx.font = svg.Font.CreateFont(
+                        this.style('font-style').value,
+                        this.style('font-variant').value,
+                        this.style('font-weight').value,
+                        this.style('font-size').hasValue() ? this.style('font-size').toPixels() + 'px' : '',
+                        this.style('font-family').value).toString();
+                }
+
+                // transform
+                if (this.attribute('transform').hasValue()) {
+                    var transform = new svg.Transform(this.attribute('transform').value);
+                    transform.apply(ctx);
+                }
+
+                // clip
+                if (this.style('clip-path', false, true).hasValue()) {
+                    var clip = this.style('clip-path', false, true).getDefinition();
+                    if (clip != null) clip.apply(ctx);
+                }
+
+                // opacity
+                if (this.style('opacity').hasValue()) {
+                    ctx.globalAlpha = this.style('opacity').numValue();
+                }
+            }
+        }
+        svg.Element.RenderedElementBase.prototype = new svg.Element.ElementBase;
+
+        svg.Element.PathElementBase = function(node) {
+            this.base = svg.Element.RenderedElementBase;
+            this.base(node);
+
+            this.path = function(ctx) {
+                if (ctx != null) ctx.beginPath();
+                return new svg.BoundingBox();
+            }
+
+            this.renderChildren = function(ctx) {
+                this.path(ctx);
+                svg.Mouse.checkPath(this, ctx);
+                if (ctx.fillStyle != '') {
+                    if (this.style('fill-rule').valueOrDefault('inherit') != 'inherit') { ctx.fill(this.style('fill-rule').value); }
+                    else { ctx.fill(); }
+                }
+                if (ctx.strokeStyle != '') ctx.stroke();
+
+                var markers = this.getMarkers();
+                if (markers != null) {
+                    if (this.style('marker-start').isUrlDefinition()) {
+                        var marker = this.style('marker-start').getDefinition();
+                        marker.render(ctx, markers[0][0], markers[0][1]);
+                    }
+                    if (this.style('marker-mid').isUrlDefinition()) {
+                        var marker = this.style('marker-mid').getDefinition();
+                        for (var i=1;i<markers.length-1;i++) {
+                            marker.render(ctx, markers[i][0], markers[i][1]);
+                        }
+                    }
+                    if (this.style('marker-end').isUrlDefinition()) {
+                        var marker = this.style('marker-end').getDefinition();
+                        marker.render(ctx, markers[markers.length-1][0], markers[markers.length-1][1]);
+                    }
+                }
+            }
+
+            this.getBoundingBox = function() {
+                return this.path();
+            }
+
+            this.getMarkers = function() {
+                return null;
+            }
+        }
+        svg.Element.PathElementBase.prototype = new svg.Element.RenderedElementBase;
+
+        // svg element
+        svg.Element.svg = function(node) {
+            this.base = svg.Element.RenderedElementBase;
+            this.base(node);
+
+            this.baseClearContext = this.clearContext;
+            this.clearContext = function(ctx) {
+                this.baseClearContext(ctx);
+                svg.ViewPort.RemoveCurrent();
+            }
+
+            this.baseSetContext = this.setContext;
+            this.setContext = function(ctx) {
+                // initial values and defaults
+                ctx.strokeStyle = 'rgba(0,0,0,0)';
+                ctx.lineCap = 'butt';
+                ctx.lineJoin = 'miter';
+                ctx.miterLimit = 4;
+                if (typeof(ctx.font) != 'undefined' && typeof(window.getComputedStyle) != 'undefined') {
+                    ctx.font = window.getComputedStyle(ctx.canvas).getPropertyValue('font');
+                }
+
+                this.baseSetContext(ctx);
+
+                // create new view port
+                if (!this.attribute('x').hasValue()) this.attribute('x', true).value = 0;
+                if (!this.attribute('y').hasValue()) this.attribute('y', true).value = 0;
+                ctx.translate(this.attribute('x').toPixels('x'), this.attribute('y').toPixels('y'));
+
+                var width = svg.ViewPort.width();
+                var height = svg.ViewPort.height();
+
+                if (!this.attribute('width').hasValue()) this.attribute('width', true).value = '100%';
+                if (!this.attribute('height').hasValue()) this.attribute('height', true).value = '100%';
+                if (typeof(this.root) == 'undefined') {
+                    width = this.attribute('width').toPixels('x');
+                    height = this.attribute('height').toPixels('y');
+
+                    var x = 0;
+                    var y = 0;
+                    if (this.attribute('refX').hasValue() && this.attribute('refY').hasValue()) {
+                        x = -this.attribute('refX').toPixels('x');
+                        y = -this.attribute('refY').toPixels('y');
+                    }
+
+                    if (this.attribute('overflow').valueOrDefault('hidden') != 'visible') {
+                        ctx.beginPath();
+                        ctx.moveTo(x, y);
+                        ctx.lineTo(width, y);
+                        ctx.lineTo(width, height);
+                        ctx.lineTo(x, height);
+                        ctx.closePath();
+                        ctx.clip();
+                    }
+                }
+                svg.ViewPort.SetCurrent(width, height);
+
+                // viewbox
+                if (this.attribute('viewBox').hasValue()) {
+                    var viewBox = svg.ToNumberArray(this.attribute('viewBox').value);
+                    var minX = viewBox[0];
+                    var minY = viewBox[1];
+                    width = viewBox[2];
+                    height = viewBox[3];
+
+                    svg.AspectRatio(ctx,
+                        this.attribute('preserveAspectRatio').value,
+                        svg.ViewPort.width(),
+                        width,
+                        svg.ViewPort.height(),
+                        height,
+                        minX,
+                        minY,
+                        this.attribute('refX').value,
+                        this.attribute('refY').value);
+
+                    svg.ViewPort.RemoveCurrent();
+                    svg.ViewPort.SetCurrent(viewBox[2], viewBox[3]);
+                }
+            }
+        }
+        svg.Element.svg.prototype = new svg.Element.RenderedElementBase;
+
+        // rect element
+        svg.Element.rect = function(node) {
+            this.base = svg.Element.PathElementBase;
+            this.base(node);
+
+            this.path = function(ctx) {
+                var x = this.attribute('x').toPixels('x');
+                var y = this.attribute('y').toPixels('y');
+                var width = this.attribute('width').toPixels('x');
+                var height = this.attribute('height').toPixels('y');
+                var rx = this.attribute('rx').toPixels('x');
+                var ry = this.attribute('ry').toPixels('y');
+                if (this.attribute('rx').hasValue() && !this.attribute('ry').hasValue()) ry = rx;
+                if (this.attribute('ry').hasValue() && !this.attribute('rx').hasValue()) rx = ry;
+                rx = Math.min(rx, width / 2.0);
+                ry = Math.min(ry, height / 2.0);
+                if (ctx != null) {
+                    ctx.beginPath();
+                    ctx.moveTo(x + rx, y);
+                    ctx.lineTo(x + width - rx, y);
+                    ctx.quadraticCurveTo(x + width, y, x + width, y + ry)
+                    ctx.lineTo(x + width, y + height - ry);
+                    ctx.quadraticCurveTo(x + width, y + height, x + width - rx, y + height)
+                    ctx.lineTo(x + rx, y + height);
+                    ctx.quadraticCurveTo(x, y + height, x, y + height - ry)
+                    ctx.lineTo(x, y + ry);
+                    ctx.quadraticCurveTo(x, y, x + rx, y)
+                    ctx.closePath();
+                }
+
+                return new svg.BoundingBox(x, y, x + width, y + height);
+            }
+        }
+        svg.Element.rect.prototype = new svg.Element.PathElementBase;
+
+        // circle element
+        svg.Element.circle = function(node) {
+            this.base = svg.Element.PathElementBase;
+            this.base(node);
+
+            this.path = function(ctx) {
+                var cx = this.attribute('cx').toPixels('x');
+                var cy = this.attribute('cy').toPixels('y');
+                var r = this.attribute('r').toPixels();
+
+                if (ctx != null) {
+                    ctx.beginPath();
+                    ctx.arc(cx, cy, r, 0, Math.PI * 2, true);
+                    ctx.closePath();
+                }
+
+                return new svg.BoundingBox(cx - r, cy - r, cx + r, cy + r);
+            }
+        }
+        svg.Element.circle.prototype = new svg.Element.PathElementBase;
+
+        // ellipse element
+        svg.Element.ellipse = function(node) {
+            this.base = svg.Element.PathElementBase;
+            this.base(node);
+
+            this.path = function(ctx) {
+                var KAPPA = 4 * ((Math.sqrt(2) - 1) / 3);
+                var rx = this.attribute('rx').toPixels('x');
+                var ry = this.attribute('ry').toPixels('y');
+                var cx = this.attribute('cx').toPixels('x');
+                var cy = this.attribute('cy').toPixels('y');
+
+                if (ctx != null) {
+                    ctx.beginPath();
+                    ctx.moveTo(cx, cy - ry);
+                    ctx.bezierCurveTo(cx + (KAPPA * rx), cy - ry,  cx + rx, cy - (KAPPA * ry), cx + rx, cy);
+                    ctx.bezierCurveTo(cx + rx, cy + (KAPPA * ry), cx + (KAPPA * rx), cy + ry, cx, cy + ry);
+                    ctx.bezierCurveTo(cx - (KAPPA * rx), cy + ry, cx - rx, cy + (KAPPA * ry), cx - rx, cy);
+                    ctx.bezierCurveTo(cx - rx, cy - (KAPPA * ry), cx - (KAPPA * rx), cy - ry, cx, cy - ry);
+                    ctx.closePath();
+                }
+
+                return new svg.BoundingBox(cx - rx, cy - ry, cx + rx, cy + ry);
+            }
+        }
+        svg.Element.ellipse.prototype = new svg.Element.PathElementBase;
+
+        // line element
+        svg.Element.line = function(node) {
+            this.base = svg.Element.PathElementBase;
+            this.base(node);
+
+            this.getPoints = function() {
+                return [
+                    new svg.Point(this.attribute('x1').toPixels('x'), this.attribute('y1').toPixels('y')),
+                    new svg.Point(this.attribute('x2').toPixels('x'), this.attribute('y2').toPixels('y'))];
+            }
+
+            this.path = function(ctx) {
+                var points = this.getPoints();
+
+                if (ctx != null) {
+                    ctx.beginPath();
+                    ctx.moveTo(points[0].x, points[0].y);
+                    ctx.lineTo(points[1].x, points[1].y);
+                }
+
+                return new svg.BoundingBox(points[0].x, points[0].y, points[1].x, points[1].y);
+            }
+
+            this.getMarkers = function() {
+                var points = this.getPoints();
+                var a = points[0].angleTo(points[1]);
+                return [[points[0], a], [points[1], a]];
+            }
+        }
+        svg.Element.line.prototype = new svg.Element.PathElementBase;
+
+        // polyline element
+        svg.Element.polyline = function(node) {
+            this.base = svg.Element.PathElementBase;
+            this.base(node);
+
+            this.points = svg.CreatePath(this.attribute('points').value);
+            this.path = function(ctx) {
+                var bb = new svg.BoundingBox(this.points[0].x, this.points[0].y);
+                if (ctx != null) {
+                    ctx.beginPath();
+                    ctx.moveTo(this.points[0].x, this.points[0].y);
+                }
+                for (var i=1; i<this.points.length; i++) {
+                    bb.addPoint(this.points[i].x, this.points[i].y);
+                    if (ctx != null) ctx.lineTo(this.points[i].x, this.points[i].y);
+                }
+                return bb;
+            }
+
+            this.getMarkers = function() {
+                var markers = [];
+                for (var i=0; i<this.points.length - 1; i++) {
+                    markers.push([this.points[i], this.points[i].angleTo(this.points[i+1])]);
+                }
+                markers.push([this.points[this.points.length-1], markers[markers.length-1][1]]);
+                return markers;
+            }
+        }
+        svg.Element.polyline.prototype = new svg.Element.PathElementBase;
+
+        // polygon element
+        svg.Element.polygon = function(node) {
+            this.base = svg.Element.polyline;
+            this.base(node);
+
+            this.basePath = this.path;
+            this.path = function(ctx) {
+                var bb = this.basePath(ctx);
+                if (ctx != null) {
+                    ctx.lineTo(this.points[0].x, this.points[0].y);
+                    ctx.closePath();
+                }
+                return bb;
+            }
+        }
+        svg.Element.polygon.prototype = new svg.Element.polyline;
+
+        // path element
+        svg.Element.path = function(node) {
+            this.base = svg.Element.PathElementBase;
+            this.base(node);
+
+            var d = this.attribute('d').value;
+            // TODO: convert to real lexer based on http://www.w3.org/TR/SVG11/paths.html#PathDataBNF
+            d = d.replace(/,/gm,' '); // get rid of all commas
+            d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from commands
+            d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from commands
+            d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([^\s])/gm,'$1 $2'); // separate commands from points
+            d = d.replace(/([^\s])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from points
+            d = d.replace(/([0-9])([+\-])/gm,'$1 $2'); // separate digits when no comma
+            d = d.replace(/(\.[0-9]*)(\.)/gm,'$1 $2'); // separate digits when no comma
+            d = d.replace(/([Aa](\s+[0-9]+){3})\s+([01])\s*([01])/gm,'$1 $3 $4 '); // shorthand elliptical arc path syntax
+            d = svg.compressSpaces(d); // compress multiple spaces
+            d = svg.trim(d);
+            this.PathParser = new (function(d) {
+                this.tokens = d.split(' ');
+
+                this.reset = function() {
+                    this.i = -1;
+                    this.command = '';
+                    this.previousCommand = '';
+                    this.start = new svg.Point(0, 0);
+                    this.control = new svg.Point(0, 0);
+                    this.current = new svg.Point(0, 0);
+                    this.points = [];
+                    this.angles = [];
+                }
+
+                this.isEnd = function() {
+                    return this.i >= this.tokens.length - 1;
+                }
+
+                this.isCommandOrEnd = function() {
+                    if (this.isEnd()) return true;
+                    return this.tokens[this.i + 1].match(/^[A-Za-z]$/) != null;
+                }
+
+                this.isRelativeCommand = function() {
+                    switch(this.command)
+                    {
+                        case 'm':
+                        case 'l':
+                        case 'h':
+                        case 'v':
+                        case 'c':
+                        case 's':
+                        case 'q':
+                        case 't':
+                        case 'a':
+                        case 'z':
+                            return true;
+                            break;
+                    }
+                    return false;
+                }
+
+                this.getToken = function() {
+                    this.i++;
+                    return this.tokens[this.i];
+                }
+
+                this.getScalar = function() {
+                    return parseFloat(this.getToken());
+                }
+
+                this.nextCommand = function() {
+                    this.previousCommand = this.command;
+                    this.command = this.getToken();
+                }
+
+                this.getPoint = function() {
+                    var p = new svg.Point(this.getScalar(), this.getScalar());
+                    return this.makeAbsolute(p);
+                }
+
+                this.getAsControlPoint = function() {
+                    var p = this.getPoint();
+                    this.control = p;
+                    return p;
+                }
+
+                this.getAsCurrentPoint = function() {
+                    var p = this.getPoint();
+                    this.current = p;
+                    return p;
+                }
+
+                this.getReflectedControlPoint = function() {
+                    if (this.previousCommand.toLowerCase() != 'c' &&
+                        this.previousCommand.toLowerCase() != 's' &&
+                        this.previousCommand.toLowerCase() != 'q' &&
+                        this.previousCommand.toLowerCase() != 't' ){
+                        return this.current;
+                    }
+
+                    // reflect point
+                    var p = new svg.Point(2 * this.current.x - this.control.x, 2 * this.current.y - this.control.y);
+                    return p;
+                }
+
+                this.makeAbsolute = function(p) {
+                    if (this.isRelativeCommand()) {
+                        p.x += this.current.x;
+                        p.y += this.current.y;
+                    }
+                    return p;
+                }
+
+                this.addMarker = function(p, from, priorTo) {
+                    // if the last angle isn't filled in because we didn't have this point yet ...
+                    if (priorTo != null && this.angles.length > 0 && this.angles[this.angles.length-1] == null) {
+                        this.angles[this.angles.length-1] = this.points[this.points.length-1].angleTo(priorTo);
+                    }
+                    this.addMarkerAngle(p, from == null ? null : from.angleTo(p));
+                }
+
+                this.addMarkerAngle = function(p, a) {
+                    this.points.push(p);
+                    this.angles.push(a);
+                }
+
+                this.getMarkerPoints = function() { return this.points; }
+                this.getMarkerAngles = function() {
+                    for (var i=0; i<this.angles.length; i++) {
+                        if (this.angles[i] == null) {
+                            for (var j=i+1; j<this.angles.length; j++) {
+                                if (this.angles[j] != null) {
+                                    this.angles[i] = this.angles[j];
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    return this.angles;
+                }
+            })(d);
+
+            this.path = function(ctx) {
+                var pp = this.PathParser;
+                pp.reset();
+
+                var bb = new svg.BoundingBox();
+                if (ctx != null) ctx.beginPath();
+                while (!pp.isEnd()) {
+                    pp.nextCommand();
+                    switch (pp.command) {
+                        case 'M':
+                        case 'm':
+                            var p = pp.getAsCurrentPoint();
+                            pp.addMarker(p);
+                            bb.addPoint(p.x, p.y);
+                            if (ctx != null) ctx.moveTo(p.x, p.y);
+                            pp.start = pp.current;
+                            while (!pp.isCommandOrEnd()) {
+                                var p = pp.getAsCurrentPoint();
+                                pp.addMarker(p, pp.start);
+                                bb.addPoint(p.x, p.y);
+                                if (ctx != null) ctx.lineTo(p.x, p.y);
+                            }
+                            break;
+                        case 'L':
+                        case 'l':
+                            while (!pp.isCommandOrEnd()) {
+                                var c = pp.current;
+                                var p = pp.getAsCurrentPoint();
+                                pp.addMarker(p, c);
+                                bb.addPoint(p.x, p.y);
+                                if (ctx != null) ctx.lineTo(p.x, p.y);
+                            }
+                            break;
+                        case 'H':
+                        case 'h':
+                            while (!pp.isCommandOrEnd()) {
+                                var newP = new svg.Point((pp.isRelativeCommand() ? pp.current.x : 0) + pp.getScalar(), pp.current.y);
+                                pp.addMarker(newP, pp.current);
+                                pp.current = newP;
+                                bb.addPoint(pp.current.x, pp.current.y);
+                                if (ctx != null) ctx.lineTo(pp.current.x, pp.current.y);
+                            }
+                            break;
+                        case 'V':
+                        case 'v':
+                            while (!pp.isCommandOrEnd()) {
+                                var newP = new svg.Point(pp.current.x, (pp.isRelativeCommand() ? pp.current.y : 0) + pp.getScalar());
+                                pp.addMarker(newP, pp.current);
+                                pp.current = newP;
+                                bb.addPoint(pp.current.x, pp.current.y);
+                                if (ctx != null) ctx.lineTo(pp.current.x, pp.current.y);
+                            }
+                            break;
+                        case 'C':
+                        case 'c':
+                            while (!pp.isCommandOrEnd()) {
+                                var curr = pp.current;
+                                var p1 = pp.getPoint();
+                                var cntrl = pp.getAsControlPoint();
+                                var cp = pp.getAsCurrentPoint();
+                                pp.addMarker(cp, cntrl, p1);
+                                bb.addBezierCurve(curr.x, curr.y, p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+                                if (ctx != null) ctx.bezierCurveTo(p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+                            }
+                            break;
+                        case 'S':
+                        case 's':
+                            while (!pp.isCommandOrEnd()) {
+                                var curr = pp.current;
+                                var p1 = pp.getReflectedControlPoint();
+                                var cntrl = pp.getAsControlPoint();
+                                var cp = pp.getAsCurrentPoint();
+                                pp.addMarker(cp, cntrl, p1);
+                                bb.addBezierCurve(curr.x, curr.y, p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+                                if (ctx != null) ctx.bezierCurveTo(p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+                            }
+                            break;
+                        case 'Q':
+                        case 'q':
+                            while (!pp.isCommandOrEnd()) {
+                                var curr = pp.current;
+                                var cntrl = pp.getAsControlPoint();
+                                var cp = pp.getAsCurrentPoint();
+                                pp.addMarker(cp, cntrl, cntrl);
+                                bb.addQuadraticCurve(curr.x, curr.y, cntrl.x, cntrl.y, cp.x, cp.y);
+                                if (ctx != null) ctx.quadraticCurveTo(cntrl.x, cntrl.y, cp.x, cp.y);
+                            }
+                            break;
+                        case 'T':
+                        case 't':
+                            while (!pp.isCommandOrEnd()) {
+                                var curr = pp.current;
+                                var cntrl = pp.getReflectedControlPoint();
+                                pp.control = cntrl;
+                                var cp = pp.getAsCurrentPoint();
+                                pp.addMarker(cp, cntrl, cntrl);
+                                bb.addQuadraticCurve(curr.x, curr.y, cntrl.x, cntrl.y, cp.x, cp.y);
+                                if (ctx != null) ctx.quadraticCurveTo(cntrl.x, cntrl.y, cp.x, cp.y);
+                            }
+                            break;
+                        case 'A':
+                        case 'a':
+                            while (!pp.isCommandOrEnd()) {
+                                var curr = pp.current;
+                                var rx = pp.getScalar();
+                                var ry = pp.getScalar();
+                                var xAxisRotation = pp.getScalar() * (Math.PI / 180.0);
+                                var largeArcFlag = pp.getScalar();
+                                var sweepFlag = pp.getScalar();
+                                var cp = pp.getAsCurrentPoint();
+
+                                // Conversion from endpoint to center parameterization
+                                // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
+                                // x1', y1'
+                                var currp = new svg.Point(
+                                        Math.cos(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.sin(xAxisRotation) * (curr.y - cp.y) / 2.0,
+                                        -Math.sin(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.cos(xAxisRotation) * (curr.y - cp.y) / 2.0
+                                );
+                                // adjust radii
+                                var l = Math.pow(currp.x,2)/Math.pow(rx,2)+Math.pow(currp.y,2)/Math.pow(ry,2);
+                                if (l > 1) {
+                                    rx *= Math.sqrt(l);
+                                    ry *= Math.sqrt(l);
+                                }
+                                // cx', cy'
+                                var s = (largeArcFlag == sweepFlag ? -1 : 1) * Math.sqrt(
+                                        ((Math.pow(rx,2)*Math.pow(ry,2))-(Math.pow(rx,2)*Math.pow(currp.y,2))-(Math.pow(ry,2)*Math.pow(currp.x,2))) /
+                                        (Math.pow(rx,2)*Math.pow(currp.y,2)+Math.pow(ry,2)*Math.pow(currp.x,2))
+                                );
+                                if (isNaN(s)) s = 0;
+                                var cpp = new svg.Point(s * rx * currp.y / ry, s * -ry * currp.x / rx);
+                                // cx, cy
+                                var centp = new svg.Point(
+                                        (curr.x + cp.x) / 2.0 + Math.cos(xAxisRotation) * cpp.x - Math.sin(xAxisRotation) * cpp.y,
+                                        (curr.y + cp.y) / 2.0 + Math.sin(xAxisRotation) * cpp.x + Math.cos(xAxisRotation) * cpp.y
+                                );
+                                // vector magnitude
+                                var m = function(v) { return Math.sqrt(Math.pow(v[0],2) + Math.pow(v[1],2)); }
+                                // ratio between two vectors
+                                var r = function(u, v) { return (u[0]*v[0]+u[1]*v[1]) / (m(u)*m(v)) }
+                                // angle between two vectors
+                                var a = function(u, v) { return (u[0]*v[1] < u[1]*v[0] ? -1 : 1) * Math.acos(r(u,v)); }
+                                // initial angle
+                                var a1 = a([1,0], [(currp.x-cpp.x)/rx,(currp.y-cpp.y)/ry]);
+                                // angle delta
+                                var u = [(currp.x-cpp.x)/rx,(currp.y-cpp.y)/ry];
+                                var v = [(-currp.x-cpp.x)/rx,(-currp.y-cpp.y)/ry];
+                                var ad = a(u, v);
+                                if (r(u,v) <= -1) ad = Math.PI;
+                                if (r(u,v) >= 1) ad = 0;
+
+                                // for markers
+                                var dir = 1 - sweepFlag ? 1.0 : -1.0;
+                                var ah = a1 + dir * (ad / 2.0);
+                                var halfWay = new svg.Point(
+                                        centp.x + rx * Math.cos(ah),
+                                        centp.y + ry * Math.sin(ah)
+                                );
+                                pp.addMarkerAngle(halfWay, ah - dir * Math.PI / 2);
+                                pp.addMarkerAngle(cp, ah - dir * Math.PI);
+
+                                bb.addPoint(cp.x, cp.y); // TODO: this is too naive, make it better
+                                if (ctx != null) {
+                                    var r = rx > ry ? rx : ry;
+                                    var sx = rx > ry ? 1 : rx / ry;
+                                    var sy = rx > ry ? ry / rx : 1;
+
+                                    ctx.translate(centp.x, centp.y);
+                                    ctx.rotate(xAxisRotation);
+                                    ctx.scale(sx, sy);
+                                    ctx.arc(0, 0, r, a1, a1 + ad, 1 - sweepFlag);
+                                    ctx.scale(1/sx, 1/sy);
+                                    ctx.rotate(-xAxisRotation);
+                                    ctx.translate(-centp.x, -centp.y);
+                                }
+                            }
+                            break;
+                        case 'Z':
+                        case 'z':
+                            if (ctx != null) ctx.closePath();
+                            pp.current = pp.start;
+                    }
+                }
+
+                return bb;
+            }
+
+            this.getMarkers = function() {
+                var points = this.PathParser.getMarkerPoints();
+                var angles = this.PathParser.getMarkerAngles();
+
+                var markers = [];
+                for (var i=0; i<points.length; i++) {
+                    markers.push([points[i], angles[i]]);
+                }
+                return markers;
+            }
+        }
+        svg.Element.path.prototype = new svg.Element.PathElementBase;
+
+        // pattern element
+        svg.Element.pattern = function(node) {
+            this.base = svg.Element.ElementBase;
+            this.base(node);
+
+            this.createPattern = function(ctx, element) {
+                var width = this.attribute('width').toPixels('x', true);
+                var height = this.attribute('height').toPixels('y', true);
+
+                // render me using a temporary svg element
+                var tempSvg = new svg.Element.svg();
+                tempSvg.attributes['viewBox'] = new svg.Property('viewBox', this.attribute('viewBox').value);
+                tempSvg.attributes['width'] = new svg.Property('width', width + 'px');
+                tempSvg.attributes['height'] = new svg.Property('height', height + 'px');
+                tempSvg.attributes['transform'] = new svg.Property('transform', this.attribute('patternTransform').value);
+                tempSvg.children = this.children;
+
+                var c = document.createElement('canvas');
+                c.width = width;
+                c.height = height;
+                var cctx = c.getContext('2d');
+                if (this.attribute('x').hasValue() && this.attribute('y').hasValue()) {
+                    cctx.translate(this.attribute('x').toPixels('x', true), this.attribute('y').toPixels('y', true));
+                }
+                // render 3x3 grid so when we transform there's no white space on edges
+                for (var x=-1; x<=1; x++) {
+                    for (var y=-1; y<=1; y++) {
+                        cctx.save();
+                        cctx.translate(x * c.width, y * c.height);
+                        tempSvg.render(cctx);
+                        cctx.restore();
+                    }
+                }
+                var pattern = ctx.createPattern(c, 'repeat');
+                return pattern;
+            }
+        }
+        svg.Element.pattern.prototype = new svg.Element.ElementBase;
+
+        // marker element
+        svg.Element.marker = function(node) {
+            this.base = svg.Element.ElementBase;
+            this.base(node);
+
+            this.baseRender = this.render;
+            this.render = function(ctx, point, angle) {
+                ctx.translate(point.x, point.y);
+                if (this.attribute('orient').valueOrDefault('auto') == 'auto') ctx.rotate(angle);
+                if (this.attribute('markerUnits').valueOrDefault('strokeWidth') == 'strokeWidth') ctx.scale(ctx.lineWidth, ctx.lineWidth);
+                ctx.save();
+
+                // render me using a temporary svg element
+                var tempSvg = new svg.Element.svg();
+                tempSvg.attributes['viewBox'] = new svg.Property('viewBox', this.attribute('viewBox').value);
+                tempSvg.attributes['refX'] = new svg.Property('refX', this.attribute('refX').value);
+                tempSvg.attributes['refY'] = new svg.Property('refY', this.attribute('refY').value);
+                tempSvg.attributes['width'] = new svg.Property('width', this.attribute('markerWidth').value);
+                tempSvg.attributes['height'] = new svg.Property('height', this.attribute('markerHeight').value);
+                tempSvg.attributes['fill'] = new svg.Property('fill', this.attribute('fill').valueOrDefault('black'));
+                tempSvg.attributes['stroke'] = new svg.Property('stroke', this.attribute('stroke').valueOrDefault('none'));
+                tempSvg.children = this.children;
+                tempSvg.render(ctx);
+
+                ctx.restore();
+                if (this.attribute('markerUnits').valueOrDefault('strokeWidth') == 'strokeWidth') ctx.scale(1/ctx.lineWidth, 1/ctx.lineWidth);
+                if (this.attribute('orient').valueOrDefault('auto') == 'auto') ctx.rotate(-angle);
+                ctx.translate(-point.x, -point.y);
+            }
+        }
+        svg.Element.marker.prototype = new svg.Element.ElementBase;
+
+        // definitions element
+        svg.Element.defs = function(node) {
+            this.base = svg.Element.ElementBase;
+            this.base(node);
+
+            this.render = function(ctx) {
+                // NOOP
+            }
+        }
+        svg.Element.defs.prototype = new svg.Element.ElementBase;
+
+        // base for gradients
+        svg.Element.GradientBase = function(node) {
+            this.base = svg.Element.ElementBase;
+            this.base(node);
+
+            this.gradientUnits = this.attribute('gradientUnits').valueOrDefault('objectBoundingBox');
+
+            this.stops = [];
+            for (var i=0; i<this.children.length; i++) {
+                var child = this.children[i];
+                if (child.type == 'stop') this.stops.push(child);
+            }
+
+            this.getGradient = function() {
+                // OVERRIDE ME!
+            }
+
+            this.createGradient = function(ctx, element, parentOpacityProp) {
+                var stopsContainer = this;
+                if (this.getHrefAttribute().hasValue()) {
+                    stopsContainer = this.getHrefAttribute().getDefinition();
+                }
+
+                var addParentOpacity = function (color) {
+                    if (parentOpacityProp.hasValue()) {
+                        var p = new svg.Property('color', color);
+                        return p.addOpacity(parentOpacityProp).value;
+                    }
+                    return color;
+                };
+
+                var g = this.getGradient(ctx, element);
+                if (g == null) return addParentOpacity(stopsContainer.stops[stopsContainer.stops.length - 1].color);
+                for (var i=0; i<stopsContainer.stops.length; i++) {
+                    g.addColorStop(stopsContainer.stops[i].offset, addParentOpacity(stopsContainer.stops[i].color));
+                }
+
+                if (this.attribute('gradientTransform').hasValue()) {
+                    // render as transformed pattern on temporary canvas
+                    var rootView = svg.ViewPort.viewPorts[0];
+
+                    var rect = new svg.Element.rect();
+                    rect.attributes['x'] = new svg.Property('x', -svg.MAX_VIRTUAL_PIXELS/3.0);
+                    rect.attributes['y'] = new svg.Property('y', -svg.MAX_VIRTUAL_PIXELS/3.0);
+                    rect.attributes['width'] = new svg.Property('width', svg.MAX_VIRTUAL_PIXELS);
+                    rect.attributes['height'] = new svg.Property('height', svg.MAX_VIRTUAL_PIXELS);
+
+                    var group = new svg.Element.g();
+                    group.attributes['transform'] = new svg.Property('transform', this.attribute('gradientTransform').value);
+                    group.children = [ rect ];
+
+                    var tempSvg = new svg.Element.svg();
+                    tempSvg.attributes['x'] = new svg.Property('x', 0);
+                    tempSvg.attributes['y'] = new svg.Property('y', 0);
+                    tempSvg.attributes['width'] = new svg.Property('width', rootView.width);
+                    tempSvg.attributes['height'] = new svg.Property('height', rootView.height);
+                    tempSvg.children = [ group ];
+
+                    var c = document.createElement('canvas');
+                    c.width = rootView.width;
+                    c.height = rootView.height;
+                    var tempCtx = c.getContext('2d');
+                    tempCtx.fillStyle = g;
+                    tempSvg.render(tempCtx);
+                    return tempCtx.createPattern(c, 'no-repeat');
+                }
+
+                return g;
+            }
+        }
+        svg.Element.GradientBase.prototype = new svg.Element.ElementBase;
+
+        // linear gradient element
+        svg.Element.linearGradient = function(node) {
+            this.base = svg.Element.GradientBase;
+            this.base(node);
+
+            this.getGradient = function(ctx, element) {
+                var bb = this.gradientUnits == 'objectBoundingBox' ? element.getBoundingBox() : null;
+
+                if (!this.attribute('x1').hasValue()
+                    && !this.attribute('y1').hasValue()
+                    && !this.attribute('x2').hasValue()
+                    && !this.attribute('y2').hasValue()) {
+                    this.attribute('x1', true).value = 0;
+                    this.attribute('y1', true).value = 0;
+                    this.attribute('x2', true).value = 1;
+                    this.attribute('y2', true).value = 0;
+                }
+
+                var x1 = (this.gradientUnits == 'objectBoundingBox'
+                    ? bb.x() + bb.width() * this.attribute('x1').numValue()
+                    : this.attribute('x1').toPixels('x'));
+                var y1 = (this.gradientUnits == 'objectBoundingBox'
+                    ? bb.y() + bb.height() * this.attribute('y1').numValue()
+                    : this.attribute('y1').toPixels('y'));
+                var x2 = (this.gradientUnits == 'objectBoundingBox'
+                    ? bb.x() + bb.width() * this.attribute('x2').numValue()
+                    : this.attribute('x2').toPixels('x'));
+                var y2 = (this.gradientUnits == 'objectBoundingBox'
+                    ? bb.y() + bb.height() * this.attribute('y2').numValue()
+                    : this.attribute('y2').toPixels('y'));
+
+                if (x1 == x2 && y1 == y2) return null;
+                return ctx.createLinearGradient(x1, y1, x2, y2);
+            }
+        }
+        svg.Element.linearGradient.prototype = new svg.Element.GradientBase;
+
+        // radial gradient element
+        svg.Element.radialGradient = function(node) {
+            this.base = svg.Element.GradientBase;
+            this.base(node);
+
+            this.getGradient = function(ctx, element) {
+                var bb = element.getBoundingBox();
+
+                if (!this.attribute('cx').hasValue()) this.attribute('cx', true).value = '50%';
+                if (!this.attribute('cy').hasValue()) this.attribute('cy', true).value = '50%';
+                if (!this.attribute('r').hasValue()) this.attribute('r', true).value = '50%';
+
+                var cx = (this.gradientUnits == 'objectBoundingBox'
+                    ? bb.x() + bb.width() * this.attribute('cx').numValue()
+                    : this.attribute('cx').toPixels('x'));
+                var cy = (this.gradientUnits == 'objectBoundingBox'
+                    ? bb.y() + bb.height() * this.attribute('cy').numValue()
+                    : this.attribute('cy').toPixels('y'));
+
+                var fx = cx;
+                var fy = cy;
+                if (this.attribute('fx').hasValue()) {
+                    fx = (this.gradientUnits == 'objectBoundingBox'
+                        ? bb.x() + bb.width() * this.attribute('fx').numValue()
+                        : this.attribute('fx').toPixels('x'));
+                }
+                if (this.attribute('fy').hasValue()) {
+                    fy = (this.gradientUnits == 'objectBoundingBox'
+                        ? bb.y() + bb.height() * this.attribute('fy').numValue()
+                        : this.attribute('fy').toPixels('y'));
+                }
+
+                var r = (this.gradientUnits == 'objectBoundingBox'
+                    ? (bb.width() + bb.height()) / 2.0 * this.attribute('r').numValue()
+                    : this.attribute('r').toPixels());
+
+                return ctx.createRadialGradient(fx, fy, 0, cx, cy, r);
+            }
+        }
+        svg.Element.radialGradient.prototype = new svg.Element.GradientBase;
+
+        // gradient stop element
+        svg.Element.stop = function(node) {
+            this.base = svg.Element.ElementBase;
+            this.base(node);
+
+            this.offset = this.attribute('offset').numValue();
+            if (this.offset < 0) this.offset = 0;
+            if (this.offset > 1) this.offset = 1;
+
+            var stopColor = this.style('stop-color');
+            if (this.style('stop-opacity').hasValue()) stopColor = stopColor.addOpacity(this.style('stop-opacity'));
+            this.color = stopColor.value;
+        }
+        svg.Element.stop.prototype = new svg.Element.ElementBase;
+
+        // animation base element
+        svg.Element.AnimateBase = function(node) {
+            this.base = svg.Element.ElementBase;
+            this.base(node);
+
+            svg.Animations.push(this);
+
+            this.duration = 0.0;
+            this.begin = this.attribute('begin').toMilliseconds();
+            this.maxDuration = this.begin + this.attribute('dur').toMilliseconds();
+
+            this.getProperty = function() {
+                var attributeType = this.attribute('attributeType').value;
+                var attributeName = this.attribute('attributeName').value;
+
+                if (attributeType == 'CSS') {
+                    return this.parent.style(attributeName, true);
+                }
+                return this.parent.attribute(attributeName, true);
+            };
+
+            this.initialValue = null;
+            this.initialUnits = '';
+            this.removed = false;
+
+            this.calcValue = function() {
+                // OVERRIDE ME!
+                return '';
+            }
+
+            this.update = function(delta) {
+                // set initial value
+                if (this.initialValue == null) {
+                    this.initialValue = this.getProperty().value;
+                    this.initialUnits = this.getProperty().getUnits();
+                }
+
+                // if we're past the end time
+                if (this.duration > this.maxDuration) {
+                    // loop for indefinitely repeating animations
+                    if (this.attribute('repeatCount').value == 'indefinite'
+                        || this.attribute('repeatDur').value == 'indefinite') {
+                        this.duration = 0.0
+                    }
+                    else if (this.attribute('fill').valueOrDefault('remove') == 'freeze' && !this.frozen) {
+                        this.frozen = true;
+                        this.parent.animationFrozen = true;
+                        this.parent.animationFrozenValue = this.getProperty().value;
+                    }
+                    else if (this.attribute('fill').valueOrDefault('remove') == 'remove' && !this.removed) {
+                        this.removed = true;
+                        this.getProperty().value = this.parent.animationFrozen ? this.parent.animationFrozenValue : this.initialValue;
+                        return true;
+                    }
+                    return false;
+                }
+                this.duration = this.duration + delta;
+
+                // if we're past the begin time
+                var updated = false;
+                if (this.begin < this.duration) {
+                    var newValue = this.calcValue(); // tween
+
+                    if (this.attribute('type').hasValue()) {
+                        // for transform, etc.
+                        var type = this.attribute('type').value;
+                        newValue = type + '(' + newValue + ')';
+                    }
+
+                    this.getProperty().value = newValue;
+                    updated = true;
+                }
+
+                return updated;
+            }
+
+            this.from = this.attribute('from');
+            this.to = this.attribute('to');
+            this.values = this.attribute('values');
+            if (this.values.hasValue()) this.values.value = this.values.value.split(';');
+
+            // fraction of duration we've covered
+            this.progress = function() {
+                var ret = { progress: (this.duration - this.begin) / (this.maxDuration - this.begin) };
+                if (this.values.hasValue()) {
+                    var p = ret.progress * (this.values.value.length - 1);
+                    var lb = Math.floor(p), ub = Math.ceil(p);
+                    ret.from = new svg.Property('from', parseFloat(this.values.value[lb]));
+                    ret.to = new svg.Property('to', parseFloat(this.values.value[ub]));
+                    ret.progress = (p - lb) / (ub - lb);
+                }
+                else {
+                    ret.from = this.from;
+                    ret.to = this.to;
+                }
+                return ret;
+            }
+        }
+        svg.Element.AnimateBase.prototype = new svg.Element.ElementBase;
+
+        // animate element
+        svg.Element.animate = function(node) {
+            this.base = svg.Element.AnimateBase;
+            this.base(node);
+
+            this.calcValue = function() {
+                var p = this.progress();
+
+                // tween value linearly
+                var newValue = p.from.numValue() + (p.to.numValue() - p.from.numValue()) * p.progress;
+                return newValue + this.initialUnits;
+            };
+        }
+        svg.Element.animate.prototype = new svg.Element.AnimateBase;
+
+        // animate color element
+        svg.Element.animateColor = function(node) {
+            this.base = svg.Element.AnimateBase;
+            this.base(node);
+
+            this.calcValue = function() {
+                var p = this.progress();
+                var from = new RGBColor(p.from.value);
+                var to = new RGBColor(p.to.value);
+
+                if (from.ok && to.ok) {
+                    // tween color linearly
+                    var r = from.r + (to.r - from.r) * p.progress;
+                    var g = from.g + (to.g - from.g) * p.progress;
+                    var b = from.b + (to.b - from.b) * p.progress;
+                    return 'rgb('+parseInt(r,10)+','+parseInt(g,10)+','+parseInt(b,10)+')';
+                }
+                return this.attribute('from').value;
+            };
+        }
+        svg.Element.animateColor.prototype = new svg.Element.AnimateBase;
+
+        // animate transform element
+        svg.Element.animateTransform = function(node) {
+            this.base = svg.Element.AnimateBase;
+            this.base(node);
+
+            this.calcValue = function() {
+                var p = this.progress();
+
+                // tween value linearly
+                var from = svg.ToNumberArray(p.from.value);
+                var to = svg.ToNumberArray(p.to.value);
+                var newValue = '';
+                for (var i=0; i<from.length; i++) {
+                    newValue += from[i] + (to[i] - 

<TRUNCATED>