From f2981144f74c0933f8a5f73c4939fac1bad668bc Mon Sep 17 00:00:00 2001
From: root <bryan@olenepal.org>
Date: Thu, 01 Oct 2009 04:10:10 +0000
Subject: merged raphael branch w/ master

---
diff --git a/assets/default/images/chakra_logo.png b/assets/default/images/chakra_logo.png
index b7f9b3a..b7f9b3a 100644..100755
--- a/assets/default/images/chakra_logo.png
+++ b/assets/default/images/chakra_logo.png
Binary files differ
diff --git a/assets/default/images/english.png b/assets/default/images/english.png
index 6a3eaab..6a3eaab 100644..100755
--- a/assets/default/images/english.png
+++ b/assets/default/images/english.png
Binary files differ
diff --git a/assets/default/images/favicon.ico b/assets/default/images/favicon.ico
index 20bf7f1..20bf7f1 100644..100755
--- a/assets/default/images/favicon.ico
+++ b/assets/default/images/favicon.ico
Binary files differ
diff --git a/assets/default/images/geography.png b/assets/default/images/geography.png
index 3a9a2dc..3a9a2dc 100644..100755
--- a/assets/default/images/geography.png
+++ b/assets/default/images/geography.png
Binary files differ
diff --git a/assets/default/images/grade1.png b/assets/default/images/grade1.png
index 2e27b65..2e27b65 100644..100755
--- a/assets/default/images/grade1.png
+++ b/assets/default/images/grade1.png
Binary files differ
diff --git a/assets/default/images/grade2_bw.png b/assets/default/images/grade2_bw.png
index 28eb7c0..28eb7c0 100644..100755
--- a/assets/default/images/grade2_bw.png
+++ b/assets/default/images/grade2_bw.png
Binary files differ
diff --git a/assets/default/images/grade3.png b/assets/default/images/grade3.png
index 8248bf0..8248bf0 100644..100755
--- a/assets/default/images/grade3.png
+++ b/assets/default/images/grade3.png
Binary files differ
diff --git a/assets/default/images/grade4_bw.png b/assets/default/images/grade4_bw.png
index c597442..c597442 100644..100755
--- a/assets/default/images/grade4_bw.png
+++ b/assets/default/images/grade4_bw.png
Binary files differ
diff --git a/assets/default/images/grade5_bw.png b/assets/default/images/grade5_bw.png
index a8a9d8a..a8a9d8a 100644..100755
--- a/assets/default/images/grade5_bw.png
+++ b/assets/default/images/grade5_bw.png
Binary files differ
diff --git a/assets/default/images/grade6.png b/assets/default/images/grade6.png
index 26e6f9b..26e6f9b 100644..100755
--- a/assets/default/images/grade6.png
+++ b/assets/default/images/grade6.png
Binary files differ
diff --git a/assets/default/images/grade7_bw.png b/assets/default/images/grade7_bw.png
index 6ff1dd1..6ff1dd1 100644..100755
--- a/assets/default/images/grade7_bw.png
+++ b/assets/default/images/grade7_bw.png
Binary files differ
diff --git a/assets/default/images/grade8_bw.png b/assets/default/images/grade8_bw.png
index 15b3be7..15b3be7 100644..100755
--- a/assets/default/images/grade8_bw.png
+++ b/assets/default/images/grade8_bw.png
Binary files differ
diff --git a/assets/default/images/health.png b/assets/default/images/health.png
index 305c8d0..305c8d0 100644..100755
--- a/assets/default/images/health.png
+++ b/assets/default/images/health.png
Binary files differ
diff --git a/assets/default/images/help.png b/assets/default/images/help.png
index 9209167..9209167 100644..100755
--- a/assets/default/images/help.png
+++ b/assets/default/images/help.png
Binary files differ
diff --git a/assets/default/images/history.png b/assets/default/images/history.png
index 79a79c0..79a79c0 100644..100755
--- a/assets/default/images/history.png
+++ b/assets/default/images/history.png
Binary files differ
diff --git a/assets/default/images/karma_logo.png b/assets/default/images/karma_logo.png
index dc8610a..dc8610a 100644..100755
--- a/assets/default/images/karma_logo.png
+++ b/assets/default/images/karma_logo.png
Binary files differ
diff --git a/assets/default/images/mathematics.png b/assets/default/images/mathematics.png
index e8a6ee2..e8a6ee2 100644..100755
--- a/assets/default/images/mathematics.png
+++ b/assets/default/images/mathematics.png
Binary files differ
diff --git a/assets/default/images/music.png b/assets/default/images/music.png
index 0530497..0530497 100644..100755
--- a/assets/default/images/music.png
+++ b/assets/default/images/music.png
Binary files differ
diff --git a/assets/default/images/mystuff.png b/assets/default/images/mystuff.png
index 40d3dba..40d3dba 100644..100755
--- a/assets/default/images/mystuff.png
+++ b/assets/default/images/mystuff.png
Binary files differ
diff --git a/assets/default/images/nepali.png b/assets/default/images/nepali.png
index 08b82a7..08b82a7 100644..100755
--- a/assets/default/images/nepali.png
+++ b/assets/default/images/nepali.png
Binary files differ
diff --git a/assets/default/images/profile.png b/assets/default/images/profile.png
index 16b5f9b..16b5f9b 100644..100755
--- a/assets/default/images/profile.png
+++ b/assets/default/images/profile.png
Binary files differ
diff --git a/assets/default/images/science.png b/assets/default/images/science.png
index 7422dcb..7422dcb 100644..100755
--- a/assets/default/images/science.png
+++ b/assets/default/images/science.png
Binary files differ
diff --git a/chakra/grade1.html b/chakra/grade1.html
index d061a73..d061a73 100644..100755
--- a/chakra/grade1.html
+++ b/chakra/grade1.html
diff --git a/chakra/grade1english.html b/chakra/grade1english.html
index 2f062ec..2f062ec 100644..100755
--- a/chakra/grade1english.html
+++ b/chakra/grade1english.html
diff --git a/chakra/grade1mathematics.html b/chakra/grade1mathematics.html
index 8590c7d..8590c7d 100644..100755
--- a/chakra/grade1mathematics.html
+++ b/chakra/grade1mathematics.html
diff --git a/css/chakra.css b/css/chakra.css
index d09c585..d09c585 100644..100755
--- a/css/chakra.css
+++ b/css/chakra.css
diff --git a/css/karma.css b/css/karma.css
index 0135a5e..bce5ee2 100755
--- a/css/karma.css
+++ b/css/karma.css
@@ -19,6 +19,3 @@ karma loader
 		
 	}
 }
-.canvas {
-
-}
\ No newline at end of file
diff --git a/docs/jsdoc/symbols/jQuery.html b/docs/jsdoc/symbols/jQuery.html
index 465eabf..465eabf 100644..100755
--- a/docs/jsdoc/symbols/jQuery.html
+++ b/docs/jsdoc/symbols/jQuery.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KGraphic.html b/docs/jsdoc/symbols/jQueryanonymous-KGraphic.html
index b9a0ae2..b9a0ae2 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KGraphic.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KGraphic.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KGroup.html b/docs/jsdoc/symbols/jQueryanonymous-KGroup.html
index c0860cc..c0860cc 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KGroup.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KGroup.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KImage.html b/docs/jsdoc/symbols/jQueryanonymous-KImage.html
index d10b28f..d10b28f 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KImage.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KImage.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KMedia.html b/docs/jsdoc/symbols/jQueryanonymous-KMedia.html
index 9633275..9633275 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KMedia.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KMedia.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KObject.html b/docs/jsdoc/symbols/jQueryanonymous-KObject.html
index 8641378..8641378 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KObject.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KObject.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KRectangle.html b/docs/jsdoc/symbols/jQueryanonymous-KRectangle.html
index f1e9ded..f1e9ded 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KRectangle.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KRectangle.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KShape.html b/docs/jsdoc/symbols/jQueryanonymous-KShape.html
index 7c11509..7c11509 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KShape.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KShape.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KSound.html b/docs/jsdoc/symbols/jQueryanonymous-KSound.html
index ad3a13d..ad3a13d 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KSound.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KSound.html
diff --git a/docs/jsdoc/symbols/jQueryanonymous-KSurface.html b/docs/jsdoc/symbols/jQueryanonymous-KSurface.html
index f136bcd..f136bcd 100644..100755
--- a/docs/jsdoc/symbols/jQueryanonymous-KSurface.html
+++ b/docs/jsdoc/symbols/jQueryanonymous-KSurface.html
diff --git a/docs/jsdoc/symbols/src/jquery.karma.js.html b/docs/jsdoc/symbols/src/jquery.karma.js.html
index 9d74e19..9d74e19 100644..100755
--- a/docs/jsdoc/symbols/src/jquery.karma.js.html
+++ b/docs/jsdoc/symbols/src/jquery.karma.js.html
diff --git a/examples/adding_up_to_10/css/lesson.css b/examples/adding_up_to_10/css/lesson.css
index 5147cfa..e368b14 100755
--- a/examples/adding_up_to_10/css/lesson.css
+++ b/examples/adding_up_to_10/css/lesson.css
@@ -1,32 +1,33 @@
+@charset "UTF-8";
 
-#main {
+#karma-main {
 width:800px;
 height:600px;
 position:absolute;
 }
-#action {
+
+#main {
 float:left;
 position:relative;
 width: 650px;
 height: 600px;
 
 }
-#sidebar {
+#side {
 background-image: url(../assets/generic/images/sidebar.png);
--moz-background-clip:border;
--moz-background-inline-policy:continuous;
--moz-background-origin:padding;
 background:none none repeat scroll 0 0;
 float:left;
 height:600px;
 position:relative;
 width:150px;
 }
-#actionTop {
+
+#top {
 width: 650px;
 height: 300px;
 position:relative;
 }
+
 #bottom {
 clear:both;
 float:left;
@@ -34,32 +35,26 @@ width: 650px;
 height: 300px;
 position:relative;
 }
-#topLtSide {
+#topLeftArea {
 float:left;
 width: 300px;
 height: 300px;
 position:relative;
 }
-#topMd {
--moz-background-clip:border;
--moz-background-inline-policy:continuous;
--moz-background-origin:padding;
+#topMiddleArea {
 background:none none repeat scroll 0 0;
 float:left;
 width: 50px;
 height: 300px;
 position:relative;
 }
-#topRtSide {
+#topRightArea {
 float:left;
 width: 300px;
 height:300px;
 position:relative;
 }
-#topLtBox {
--moz-background-clip:border;
--moz-background-inline-policy:continuous;
--moz-background-origin:padding;
+#topLeftCard {
 background:none none repeat scroll 0 0;
 width: 200px;
 height: 200px;
@@ -68,22 +63,22 @@ position:absolute;
 top:50px;
 }
 
-#topLtCanvas {
--moz-background-clip:border;
--moz-background-inline-policy:continuous;
--moz-background-origin:padding;
+#topLeftPaper {
 background:none none repeat scroll 0 0;
 position:absolute;
 top: 50px;
 left: 75px;
+width:200px; 
+height:200px;
 }
-#plussign {
+
+#plusSign {
 display: block;
 margin-left: auto;
 margin-right: auto;
 margin-top: 150px;
 }
-#topRtBox {
+#topRightCard {
 background: none none repeat scroll 0 0;
 width: 200px;
 height: 200px;
@@ -91,18 +86,17 @@ position:absolute;
 right: 50px;
 top: 50px;
 }
-#topRtCanvas {
+#topRightPaper {
 background:none none repeat scroll 0 0;
 position:absolute;
 left: 50px;
 right:50px;
 top:50px;
+width:200px;
+height:200px;
 }
 
 .bottom {
--moz-background-clip:border;
--moz-background-inline-policy:continuous;
--moz-background-origin:padding;
 background:none none repeat scroll 0 0;
 float:left;
 width: 216.5px;
@@ -110,7 +104,7 @@ height: 300px;
 position:relative;
 }
 
-.bottomBox {
+.bottomCard {
     left:25px;
     position:absolute;
     width: 200px;
@@ -118,7 +112,8 @@ position:relative;
     top: 20px;
 }
 
-.sidebarItem {
+
+.sideItem {
     clear:both;
     float:left;
     width:150px;
@@ -134,7 +129,7 @@ top:10px;
 left:25px;
 }
 
-#timerCanvas {
+#timerPaper {
 position:absolute;
 width:100px;
 height:150px;
@@ -142,28 +137,31 @@ top:10px;
 left:25px;
 }
 
-#scorebox {
+#scoreBox {
 position:absolute;
 width:100px;
 height:150px;
 top:10px;
 left:25px;
+z-index: 10;
 }
 
-#scoreboxCanvas {
-position:absolute;
-width:100px;
-height:150px;
-top:10px;
-left:25px;
+#scoreBoxText {
+position:relative;
+top:60px;
+font: 70px Arial;
+color: #fff;
+text-align: center;
+z-index: 100;
 }
 
 
-#chimpCanvas {
+#chimpPaper {
 position:absolute;
 top:10px;
 left:25px;
-
+width:120px; 
+height:125px;
 }
 
 #buttons {
diff --git a/examples/adding_up_to_10/index.html b/examples/adding_up_to_10/index.html
index ea752d9..2f769b8 100755
--- a/examples/adding_up_to_10/index.html
+++ b/examples/adding_up_to_10/index.html
@@ -4,9 +4,10 @@
 	<title>Karma - Adding Up to 10</title>
 	<meta name="keywords" content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal" />
 	<link type="text/css" rel="stylesheet" href="css/lesson.css" />
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 	<link type="image/ico" rel="icon" href="../../assets/default/images/favicon.ico" /> 
 	<link type="text/css" rel="stylesheet" href="../../css/karma.css" />
+	<script type="text/javascript" src="../../js/raphael-min.js"></script>
 	<script type="text/javascript" src="../../js/jquery-1.3.2.min.js"></script>
 	<script type="text/javascript" src="../../js/karma.Gettext.js"></script>
 	<script type="text/javascript" src="../../js/jquery.karma.js"></script>
@@ -18,53 +19,52 @@
 
 <body>
   <div id="karma-main"> 
-    <div id="action">
-      <div id="actionTop">
+    <div id="main">
+      <div id="top">
 
-	<div id="topLtSide">
-	  <img id="topLtBox" src="assets/generic/images/yellowBox.png" alt="" />
-	  <canvas id="topLtCanvas" width="200px" height="200px"></canvas>
+	<div id="topLeftArea">
+	  <img id="topLeftCard" src="assets/generic/images/yellowBox.png" alt="" />
+	  <div id="topLeftPaper" ></div>
 
 	</div>
-	<div id="topMd">
-	  <img id="plussign" src="assets/generic/images/plussign.png" alt=""/>
+	<div id="topMiddleArea">
+	  <img id="plusSign" src="assets/generic/images/plussign.png" alt=""/>
 	</div>
-	<div id="topRtSide">
-	  <img id="topRtBox" src="assets/generic/images/yellowBox.png" alt=""/>
-	  <canvas id="topRtCanvas" width="200px" height="200px"></canvas>
+	<div id="topRightArea">
+	  <img id="topRightCard" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <div id="topRightPaper"></div>
 	</div>
 
       </div>
 
       <div id="bottom">
-	<!-- <canvas id="bottomCanvas"></canvas> -->
-	<div id="bottomLt" class="bottom">
-	  <img class="bottomBox" src="assets/generic/images/yellowBox.png" alt=""/>
-	  <canvas id="bottomLtCanvas" class="bottomBox" width="200px" height="200px"> </canvas>
+	<div id="bottomLeft" class="bottom">
+	  <img class="bottomCard" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <div id="bottomLeftPaper" class="bottomCard"> </div>
 	</div>
-	<div id="bottomMd" class="bottom">
-	  <img class="bottomBox" src="assets/generic/images/yellowBox.png" alt=""/>
-	  <canvas id="bottomMdCanvas" class="bottomBox" width="200px" height="200px"> </canvas>
+	<div id="bottomMiddle" class="bottom">
+	  <img class="bottomCard" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <div id="bottomMiddlePaper" class="bottomCard"> </div>
 	</div>
-	<div id="bottomRt" class="bottom">
-	  <img class="bottomBox" src="assets/generic/images/yellowBox.png" alt=""/>
-	  <canvas id="bottomRtCanvas" class="bottomBox" width="200px" height="200px"> </canvas>
+	<div id="bottomRight" class="bottom">
+	  <img class="bottomCard" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <div id="bottomRightPaper" class="bottomCard"> </div>
 	</div>
 
       </div>
       
     </div>
-    <div id="sidebar">
-      <div class="sidebarItem">
+    <div id="side">
+      <div class="sideItem">
 	<img id="timer" src="assets/generic/images/scorebox.png" alt=""/>
-	<canvas id="timerCanvas" width="100" height="140" > </canvas>
+	<div id="timerPaper"> </div>
       </div>
-      <div class="sidebarItem">
-	<img id="scorebox" src="assets/generic/images/scorebox.png" alt=""/>
-	<canvas id="scoreboxCanvas" width="100" height="140"></canvas>
+      <div class="sideItem">
+	<img id="scoreBox" src="assets/generic/images/scorebox.png" alt=""/>
+	<div id="scoreBoxText"></div>
       </div>
-      <div class="sidebarItem">
-	<canvas id="chimpCanvas" width="120px" height="125px"> </canvas>
+      <div class="sideItem">
+	<div id="chimpPaper"> </div>
 	<div id="buttons">
 	    <button id="start">Start</button>
 	    <button id="stop">Stop</button>
@@ -75,7 +75,7 @@
 
     </div>
 
-
+    <div id="overlayPaper"></div>
   </div>
 
 
diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10/js/lesson.js
index 852bd3f..6de97dc 100755
--- a/examples/adding_up_to_10/js/lesson.js
+++ b/examples/adding_up_to_10/js/lesson.js
@@ -1,7 +1,9 @@
+/* jslint browser: true
+*/
 $(document).ready(function(){
 
 
-    var k = $.karma ({container: "#karma-main", lang: "en"});
+    var k = $.karma({container: "#karma-main", lang: "en"});
     
     k.init({
 	images: [
@@ -11,289 +13,357 @@ $(document).ready(function(){
 	    {name: "chilli", file: "chilli.png", localized : false },
 	    {name: "fish"  , file: "fish64px.png",   localized : false },
 	    {name: "flower", file: "flower37px.png", localized : false },
-	    {name: "normalChimp", file: "normalChimp_120x125.png", localized : false},
-	    {name: "happyChimp", file: "happyChimp_120x125.png", localized: false},
-	    {name: "sadChimp", file: "sadChimp_120x125.png", localized : false}
-
-	]
-	,
+	    {name: "normalChimp", file: "normalChimp_120x125.png", 
+	     localized : false},
+	    {name: "happyChimp", file: "happyChimp_120x125.png", 
+	     localized: false},
+	    {name: "sadChimp", file: "sadChimp_120x125.png", 
+	     localized : false}],
 	sounds: [
-
 	    {name: "correct",  file: "correct.ogg"},
 	    {name: "incorrect", file: "incorrect.ogg"},
 	    {name: "trigger", file: "trigger.ogg", localized: false}
- 	    
-	],
-	surfaces: [
-	    {name:"topLt", canvas:"topLtCanvas"},
-	    {name:"topRt", canvas:"topRtCanvas"},
-	    {name:"bottomLt", canvas:"bottomLtCanvas"},
-	    {name:"bottomMd", canvas:"bottomMdCanvas"},
-	    {name:"bottomRt", canvas:"bottomRtCanvas"},
-	    {name:"timer", canvas:"timerCanvas"},
-	    {name:"scorebox", canvas:"scoreboxCanvas"},
-	    {name:"chimp", canvas:"chimpCanvas"}
-    
-]	
+	]
+
     });
     
     
 k.main(function() {
 
 
-    var imgNames = ["ball",  "banana", "balloon","chilli", "fish", "flower"];
+    var imageNames = ["ball",  "banana", "balloon","chilli", "fish", "flower"];
     //game logic
-    var total, level=0, time, n0, n1, correct;
-    var maskd=200;
-    var d=160;
-    var choices=[];
-    var score = 0;
-    var correct;
-    var speed = 2000;
-    var playerCorrect = 0;
-    var endTimerX = 80;
-    var startTimerY = 10;
-    var endTimerY = 100;
-    var offsetTimerY = 5;
-    var timerId;
-
-    var timerFn = function () {
-	k.surfaces['timer'].clear();
-
-	if ( startTimerY >= endTimerY ){
-	    //you didn't answer in time
-	    k.library.sounds["trigger"].play();
-	    answer(false, true);
-	    game();
-	} 
+    var cards;
+    var totalCorrect = 0, n0 = 0, n1 = 0, correctCard = 0,
+        level = 0, score = 0, numCorrectAnswers = 0;
+    var DRAW_MAX_X = 170, DRAW_MAX_Y = 170;
+    var choices=[0, 0, 0];
+    var timerSpeed = 12000;
+    var START_TIMER_Y = 25, END_TIMER_Y = 125;
+    var timerPaper, chimpPaper;
+    var timerRect;
+    var	normalChimpImage, sadChimpImage, happyChimpImage;
+    var overlayCard, topLeftCard, topRightCard, bottomLeftCard, 
+	bottomMiddleCard, bottomRightCard;
+
+    var buttons=[];
+    var isTimerRunning = false;
+    var dispatchChoice;
+
+    var createCard = function (paperName, width, height) {
+	var set;
+	var paper;
+
+	if(!width || !height){
+	    paper = Raphael(paperName+"Paper", 200, 200);
+	}
 	else {
-	    k.surfaces['timer'].clear();
-	    startTimerY = startTimerY + offsetTimerY;
-	    k.surfaces['timer'].ctx.fillStyle = "#fff";
-	    k.surfaces['timer'].ctx.fillRect(10, startTimerY, endTimerX, 20);
+	    paper = Raphael(paperName+"Paper", width, height);
 	}
+	set = paper.set();
+	return { "paper": paper, "prefix": paperName, "set": set};	
     };
 
+
+    overlayCard = createCard("overlay", 800, 600);
+    topLeftCard = createCard("topLeft");
+    topRightCard = createCard("topRight");
+    bottomLeftCard = createCard("bottomLeft");
+    bottomMiddleCard = createCard("bottomMiddle");
+    bottomRightCard = createCard("bottomRight");
+
+
+    cards = [ topLeftCard, topRightCard, bottomLeftCard, 
+	     bottomMiddleCard, bottomRightCard];
+
+    sets =  [topLeftCard.set, topRightCard.set, bottomLeftCard.set, 
+	     bottomMiddleCard.set, bottomRightCard.set];
+
+
+    function drawCards () {
+	var imageId = imageNames[ level ];
+	//reinitialize choices to zero
+	choices = [0, 0, 0];
+
+	cards.forEach(function (box) {
+		box.set.remove();
+	});
 	
-	function game () {
-	    $.each(k.surfaces, function () {
-		if (this.name != "chimp"){
-		this.clear();
-		}
-	    });
-	    
-	    
-	    writeScore();
-	    total = k.math.rand( 2, 10 ); //the total
-	    n0 = total - k.math.rand(1, total - 1 ); //first number
-	    n1 = total - n0; //second number
-
-	    //chose one option (the correct option) 
-	    //and then put the correct value into it 
-	    correct = k.math.rand( 0, 2 );	
-	    choices[ correct ] = total;
-	    
-	    for (var i=0; i<3; i++) {
-		//generate the two other options
-		if ( choices[i] === total) {
-		    continue;
+	totalCorrect = k.math.rand( 2, 5 + level ); //the totalCorrect
+	n0 = totalCorrect - k.math.rand(1, totalCorrect - 1 ); //first number
+	n1 = totalCorrect - n0; //second number
+
+	//chose one option (the correct option) 
+	//and then put the correct value into it 
+	correctCard = k.math.rand( 0, 2 );	
+	choices[ correctCard ] = totalCorrect;
+   
+	var computeUniqueChoice = function(choice){
+	    var newChoice = 0;
+	    if (choice === totalCorrect) {
+		return choice;
+	    } else {
+		newChoice = k.math.rand( 1, 10 );
+		if (newChoice === totalCorrect){
+		    return computeUniqueChoice(choice);
 		} else {
-		    // generate the other options
-		    choices[ i ] = k.math.rand( 2, 10 ); 
-		    for (var j = 0; j < i; j++){
-			if (choices[i] === choices[j]) {
-			    choices[ i ] = k.math.rand( 2, 10 );
-			}
-		    }	    
+		    return newChoice;
 		}
 	    }
+	};
+
+	choices = choices.map(computeUniqueChoice);
+	
+	var drawCard = function (card, n) {
+	    var positions = [];
+	    var x =  0, y = 0; 
+	    var isOverlapping = false;
+	    var imageVarNames = {};
+	    var varPrefix = card.prefix;	
+	    imageVarNames[varPrefix] = [];
+	    card.set = card.paper.set();
 	    
-	    var imgId = imgNames[ level ] ;
-
- 
-	    var card = function (surface, n, minx, miny, d ) {
-		surface.save();
-		var r = k.rectangle({x:minx, y:miny, width:maskd, height:maskd,
-		    stroke:false,fill:false}).draw(surface);
-		
-		//do the clip
-		//surface.clip();
-		var pos = [];
-		var x, y, flag;
-
-
-		for (var i=0; i<n; i++) {
-		   do {
-			flag = false;
-			x = k.math.rand( 0, d );
-			y = k.math.rand( 0, d );
-			for ( var j=0; j<pos.length; j++) {
-			    if ( k.geometry.distance2( pos[j], 
-				{"x": x, "y": y} )  < 120 ) {
-				flag = true;
-				break;
-			    }
+	    for (var i=0; i<n; i++) {
+		do {
+		    isOverlapping = false;
+		    x = k.math.rand( 0, DRAW_MAX_X);
+		    y = k.math.rand( 0, DRAW_MAX_Y );
+		    for ( var j=0; j<positions.length; j++) {
+			if ( k.geometry.distance2( positions[j], 
+						   {"x": x, "y": y} )  < 137 ) {
+			    isOverlapping = true;
+			    break;
 			}
-			
-		    }while ( flag === true );
-		    pos.push( { "x":x, "y": y } ); 
-		    k.library.images[ imgId ].draw(surface, x, y )
-		}
-		
-		
-		
-		surface.restore();
+		    }
+		    
+		}while ( isOverlapping === true );
+		positions.push( { "x":x, "y": y } ); 
+		imageVarNames[varPrefix][i] = card.paper.
+ 		        image(k.library.images[imageId].src, x , y, 35, 35);
+		card.set.push(imageVarNames[varPrefix][i]);		    
 	    }
-
-
-	    //put the cards
-	    card(k.surfaces["topLt"], n0 , 0, 0, d);
-	    card(k.surfaces["topRt"], n1 , 0, 0, d);
-	    card(k.surfaces["bottomLt"], choices[ 0 ] ,  0, 0, d);
-	    card(k.surfaces["bottomMd"], choices[ 1 ] , 0, 0, d);
-	    card(k.surfaces["bottomRt"], choices[ 2 ] , 0, 0, d);
 	    
+	};
+
+	//put the cards
+	drawCard(topLeftCard, n0);
+	drawCard(topRightCard, n1);
+	drawCard(bottomLeftCard, choices[ 0 ]);
+	drawCard(bottomMiddleCard, choices[ 1 ]);
+	drawCard(bottomRightCard, choices[ 2 ]);
+	
     }
 
-    var writeScore = function (){
-	k.surfaces["scorebox"].save().
-	clear().
-	font("bold 50px sans-serif white").
-	fillStyle("#fff").
-	textBaseline("middle").
-	fillText("" + score, 30, 100).
-	restore();
+    //put the buttons on the cards
+    buttons[ 0 ] = { node: $('#bottomLeftPaper')[0], num: 0};
+    buttons[ 1 ] = { node: $('#bottomMiddlePaper')[0], num: 1};
+    buttons[ 2 ] = { node: $('#bottomRightPaper')[0], num: 2};
+
+    var addButtons = function(){
+	buttons.forEach(function(button) {
+	    var numButton = button.num;
+	    button.node.addEventListener('click', function dispatchChoice(){ 
+		var myButton = numButton;
+		chooseCard(myButton);}, false);
+	});
+    };
+
+
+    var removeButtons = function(){
+	buttons.forEach(function(button) {
+	    button.node.removeEventListener('click', dispatchChoice, false);
+	});
+    };
+
+    var chooseCard = function(numButton) {
+		if ( choices[numButton] === totalCorrect){
+		    //If the player has completed all the levels
+		    if (numCorrectAnswers === 4 && level === 5) {
+			congrats();
+		    } else {
+			computeScore(true, false);
+			resetTimer();
+			animateTimer();
+			drawCards();
+		    }
+		}else {
+		    computeScore(false, false);
+		    resetTimer();
+		    animateTimer();
+		    drawCards(); 
+		} 
+    };
+
+
+
+    var writeScore = function (newScore){
+         $('#scoreBoxText')[0].innerHTML = newScore; 
     };
 
-    var answer = function (correct, tooSlow) {
+
+    var computeScore = function (correct, tooSlow) {
 
 	if ( correct === false) {
 	    //answer was incorrect or took too long
 	    score = score - 1;
-	    playerCorrect = playerCorrect - 1;
-	    writeScore();
+	    numCorrectAnswers = numCorrectAnswers - 1;
+	    writeScore(score);
 	    if (tooSlow === true) {
-		k.library.sounds[ "trigger" ].play();
+		k.library.sounds.trigger.play();
 	    } else {
-		k.library.sounds[ "incorrect" ].play();
+		k.library.sounds.incorrect.play();
 	    }
 	    //animate sad monkey
 	    animateChimp(false);
 	    
 	} else {
 	    score = score + 1;
-	    playerCorrect = playerCorrect + 1;
-	    writeScore();
-	    k.library.sounds[ "correct" ].play();
+	    numCorrectAnswers = numCorrectAnswers + 1;
+	    writeScore(score);
+	    k.library.sounds.correct.play();
 	    animateChimp(true);
-	    if (playerCorrect === 5){
-		level = (level+1)% imgNames.length;
-		speed = speed - 300;
-		playerCorrect = 0;
-	    }
+	    if (numCorrectAnswers == 5){
+		level = level + 1;
+		timerSpeed = timerSpeed - 1000;
+		numCorrectAnswers = 0;
+	    } 
+	   
 	}
-
-	changeTimer('start');
+	
 
     };
 
-    var animateChimp = function (answer) {
-	var timerChimp;	
-	k.surfaces["chimp"].clear();
-	if( answer === true){
-	    k.library.images["happyChimp"].draw(k.surfaces["chimp"], 0, 0);
-	} else {
-	    k.library.images["sadChimp"].draw(k.surfaces["chimp"], 0, 0);
-	}
 
-	var restoreChimp = function () {
-	    k.surfaces["chimp"].clear();
-	    k.library.images["normalChimp"].draw(k.surfaces["chimp"], 0, 0);
-	};
+    var startGame = function () {
+	score = 0;
+	writeScore(score);
+	addButtons();
+	isTimerRunning = true;
 
-	timerChimp = setTimeout(restoreChimp, 800);
+	//move timer back to start in case it is 
+	//already running
+	resetTimer();
 
+	//start timer
+	animateTimer();
 
-    };
-    
-    var changeTimer = function (status){
-	startTimerY = 10;
-	k.surfaces["timer"].clear();
-	clearInterval(timerId);
-
-	if (status === 'start'){
-	    timerId = setInterval(timerFn, speed);
-	}
-
+	drawCards();
     };
 
-    var startStop = function (start) {
-	score = level = 0;
-	startTimerY = 10;
-	$.each(k.surfaces, function () { 
-	    if (this.name != "chimp"){
-		this.clear();
-	    }
+    var stopGame = function () {
+	writeScore(' ');
+	removeButtons();
+	//stop timer
+	isTimerRunning = false;
+	resetTimer();
+	
+	//clear the cards
+	cards.forEach(function (card) {
+	    card.set.remove();
+	    card.set = card.paper.set();
 	});
-
-	changeTimer('start');
-	game();
 	
-
     };
 
-    var start = function () {
-	startStop(true);
+    var resetGame = function () {
+	score = 0;
+	writeScore(score);
+	isTimerRunning = true;
+	resetTimer();
+	animateTimer();
+	drawCards();
+	
     };
 
-    
-    var stop = function () {
-	changeTimer('stop');
+    var resetTimer = function () {
+    	timerRect.animate({y: START_TIMER_Y}, 0);
     };
     
-    var reset = function () {
-	startStop(true);
+    var animateTimer = function () {
+	timerRect.animate({y : END_TIMER_Y}, timerSpeed, function(){ 
+	    timerRect.attr("y", START_TIMER_Y);
+	    if (isTimerRunning === true){
+		computeScore(false, true);
+		animateTimer();
+		drawCards();
+	    }
+	});
     };
 
 
+    var animateChimp = function (answer) {
+	var timerChimp;	
+	normalChimpImage.hide();
+	if( answer === true){ 
+	    happyChimpImage.show();
+	} else {
+	    sadChimpImage.show();
+	}
 
-						      
-
-	//put the buttons
-	var buttons=[];
-	buttons[ 0 ] = { "surface": k.surfaces["bottomLt"], "id": 0};
-	buttons[ 1 ] = { "surface": k.surfaces["bottomMd"], "id": 1};
-	buttons[ 2 ] = { "surface": k.surfaces["bottomRt"], "id": 2};
 	
-	$.each(buttons, function( key, item ) {
-		item.surface.canvas.addEventListener('click',  function( ev ) {
-		   if ( choices[ item.id ] === total){
-		       answer(true);
-		       game();
-		   }else {
-		       answer(false); 
-		       game(); 
-		   } 
-		    
-		}, false);
-	});
+	timerChip = setTimeout(function() { 
+	    happyChimpImage.hide(); 
+	    sadChimpImage.hide(); 
+	    normalChimpImage.show();}, 800);
+			       
+    };
+
+    var congrats = function () {
+	var congratsText;
+	stopGame();
+
+	$('#overlayPaper').css({"position": "absolute",
+				"background": "white", "opacity": "0.8",
+				"z-index": "100"});
+	congratsChimp = overlayCard.paper.image(
+	    k.library.images.happyChimp.src, 200, 100, 300, 400);
+	congratsChimp.attr({"fill-opacity": "1", "opacity": "1"});
+	congratsText = overlayCard.paper.text(400, 550, "Great Job!");
+	congratsText.attr({"font-size": 80});
+	overlayCard.set.push(congratsChimp, congratsText);
+
+	congratsChimp.node.addEventListener('click', function(){
+	    $('#overlayPaper').css({"opacity": 0});
+	    overlayCard.set.remove();
+	}, false);
 
+    };
+						      
     document.getElementById('start').
-    addEventListener('click', start, false);
+    addEventListener('click', startGame, false);
 
 
     document.getElementById('stop').
-    addEventListener('click', stop, false);
+    addEventListener('click', stopGame, true);
     
     document.getElementById('reset').
-    addEventListener('click', reset, false);
+    addEventListener('click', resetGame, false);
    
-    k.library.images["normalChimp"].draw(k.surfaces["chimp"], 0, 0);
+
+    //set up the timer
+    timerPaper = Raphael('timerPaper', 100, 150);
+    timerRect = timerPaper.rect(7, START_TIMER_Y, 85, 20, 3);
+    timerRect.attr('fill', "#fff");
+
+    //Set up the monkeys
+    chimpPaper = Raphael('chimpPaper', 120, 125);
+    normalChimpImage = chimpPaper.image(k.library.images.normalChimp.src, 
+				   0, 20, 100, 100);
+    sadChimpImage = chimpPaper.image(k.library.images.sadChimp.src, 
+				0, 20, 100, 100);
+    happyChimpImage = chimpPaper.image(k.library.images.happyChimp.src, 
+				  0, 20, 100, 100);
+    happyChimpImage.hide();
+    sadChimpImage.hide();
+
+    
 
 
 //end of Karma.main
 });
 
+    
+
 
 //end of ready
 });
\ No newline at end of file
diff --git a/index.html b/index.html
index 37fe6d2..37fe6d2 100644..100755
--- a/index.html
+++ b/index.html
diff --git a/js/raphael-min.js b/js/raphael-min.js
new file mode 100755
index 0000000..eac42bb
--- /dev/null
+++ b/js/raphael-min.js
@@ -0,0 +1,7 @@
+/*
+ * Raphael 1.0 RC1.4 - JavaScript Vector Library
+ *
+ * Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com)
+ * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
+ */
+window.Raphael=(function(){var Y=/[, ]+/,g=document,L=window,P={was:"Raphael" in window,is:window.Raphael},f=function(){return l.apply(f,arguments);},b={},q={"clip-rect":"0 0 10e9 10e9",cx:0,cy:0,fill:"#fff","fill-opacity":1,font:'10px "Arial"',"font-family":'"Arial"',"font-size":"10","font-style":"normal","font-weight":400,gradient:0,height:0,href:"http://raphaeljs.com/",opacity:1,path:"M0,0",r:0,rotation:0,rx:0,ry:0,scale:"1 1",src:"",stroke:"#000","stroke-dasharray":"","stroke-linecap":"butt","stroke-linejoin":"butt","stroke-miterlimit":0,"stroke-opacity":1,"stroke-width":1,target:"_blank","text-anchor":"middle",title:"Raphael",translation:"0 0",width:0,x:0,y:0},u={"clip-rect":"csv",cx:"number",cy:"number",fill:"colour","fill-opacity":"number","font-size":"number",height:"number",opacity:"number",path:"path",r:"number",rotation:"csv",rx:"number",ry:"number",scale:"csv",stroke:"colour","stroke-opacity":"number","stroke-width":"number",translation:"csv",width:"number",x:"number",y:"number"},v=["click","dblclick","mousedown","mousemove","mouseout","mouseover","mouseup"];f.version="1.0 RC1.4";f.type=(window.SVGAngle||document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")?"SVG":"VML");f.svg=!(f.vml=f.type=="VML");f.idGenerator=0;f.fn={};f.is=function(i,e){e=(e+"").toLowerCase();if(e=="undefined"&&typeof i=="undefined"){return true;}if(i==null&&e=="null"){return true;}return Object.prototype.toString.call(i).replace(/^\[object\s+|\]$/gi,"").toLowerCase()==e;};f.setWindow=function(e){L=e;g=L.document;};f.hsb2rgb=X(function(af,ad,aj){if(f.is(af,"object")&&"h" in af&&"s" in af&&"b" in af){aj=af.b;ad=af.s;af=af.h;}var aa,ab,ak;if(aj==0){return{r:0,g:0,b:0,hex:"#000"};}if(af>1||ad>1||aj>1){af/=255;ad/=255;aj/=255;}var ac=Math.floor(af*6),ag=(af*6)-ac,Z=aj*(1-ad),R=aj*(1-(ad*ag)),al=aj*(1-(ad*(1-ag)));aa=[aj,R,Z,Z,al,aj,aj][ac];ab=[al,aj,aj,R,Z,Z,al][ac];ak=[Z,Z,al,aj,aj,R,Z][ac];aa*=255;ab*=255;ak*=255;var ah={r:aa,g:ab,b:ak},e=Math.round(aa).toString(16),ae=Math.round(ab).toString(16),ai=Math.round(ak).toString(16);if(e.length==1){e="0"+e;}if(ae.length==1){ae="0"+ae;}if(ai.length==1){ai="0"+ai;}ah.hex="#"+e+ae+ai;return ah;},f);f.rgb2hsb=X(function(e,i,ad){if(f.is(e,"object")&&"r" in e&&"g" in e&&"b" in e){ad=e.b;i=e.g;e=e.r;}if(f.is(e,"string")){var af=f.getRGB(e);e=af.r;i=af.g;ad=af.b;}if(e>1||i>1||ad>1){e/=255;i/=255;ad/=255;}var ac=Math.max(e,i,ad),R=Math.min(e,i,ad),aa,Z,ab=ac;if(R==ac){return{h:0,s:0,b:ac};}else{var ae=(ac-R);Z=ae/ac;if(e==ac){aa=(i-ad)/ae;}else{if(i==ac){aa=2+((ad-e)/ae);}else{aa=4+((e-i)/ae);}}aa/=6;if(aa<0){aa+=1;}if(aa>1){aa-=1;}}return{h:aa,s:Z,b:ab};},f);f._path2string=function(){var Z="",ac;for(var R=0,aa=this.length;R<aa;R++){for(var e=0,ab=this[R].length;e<ab;e++){Z+=this[R][e];e&&e!=ab-1&&(Z+=",");}R!=aa-1&&(Z+="\n");}return Z.replace(/,(?=-)/g,"");};function X(Z,i,e){function R(){var aa=Array.prototype.splice.call(arguments,0,arguments.length),ab=aa.join("\u25ba");R.cache=R.cache||{};R.count=R.count||[];if(ab in R.cache){return e?e(R.cache[ab]):R.cache[ab];}if(R.count.length>1000){delete R.cache[R.count.unshift()];}R.count.push(ab);R.cache[ab]=Z.apply(i,aa);return e?e(R.cache[ab]):R.cache[ab];}return R;}f.getRGB=X(function(e){var af={aliceblue:"#f0f8ff",amethyst:"#96c",antiquewhite:"#faebd7",aqua:"#0ff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000",blanchedalmond:"#ffebcd",blue:"#00f",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#0ff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#f0f",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgreen:"#90ee90",lightgrey:"#d3d3d3",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#789",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#0f0",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#f0f",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370db",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#db7093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#f00",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#fff",whitesmoke:"#f5f5f5",yellow:"#ff0",yellowgreen:"#9acd32"},ab;if((e+"").toLowerCase() in af){e=af[e.toString().toLowerCase()];}if(!e){return{r:0,g:0,b:0,hex:"#000"};}if(e=="none"){return{r:-1,g:-1,b:-1,hex:"none"};}var R,Z,ae,ac=(e+"").match(/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|rgb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\)|hs[bl]\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hs[bl]\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i);if(ac){if(ac[2]){ae=parseInt(ac[2].substring(5),16);Z=parseInt(ac[2].substring(3,5),16);R=parseInt(ac[2].substring(1,3),16);}if(ac[3]){ae=parseInt(ac[3].substring(3)+ac[3].substring(3),16);Z=parseInt(ac[3].substring(2,3)+ac[3].substring(2,3),16);R=parseInt(ac[3].substring(1,2)+ac[3].substring(1,2),16);}if(ac[4]){ac=ac[4].split(/\s*,\s*/);R=parseFloat(ac[0]);Z=parseFloat(ac[1]);ae=parseFloat(ac[2]);}if(ac[5]){ac=ac[5].split(/\s*,\s*/);R=parseFloat(ac[0])*2.55;Z=parseFloat(ac[1])*2.55;ae=parseFloat(ac[2])*2.55;}if(ac[6]){ac=ac[6].split(/\s*,\s*/);R=parseFloat(ac[0]);Z=parseFloat(ac[1]);ae=parseFloat(ac[2]);return f.hsb2rgb(R,Z,ae);}if(ac[7]){ac=ac[7].split(/\s*,\s*/);R=parseFloat(ac[0])*2.55;Z=parseFloat(ac[1])*2.55;ae=parseFloat(ac[2])*2.55;return f.hsb2rgb(R,Z,ae);}ac={r:R,g:Z,b:ae};var i=Math.round(R).toString(16),aa=Math.round(Z).toString(16),ad=Math.round(ae).toString(16);(i.length==1)&&(i="0"+i);(aa.length==1)&&(aa="0"+aa);(ad.length==1)&&(ad="0"+ad);ac.hex="#"+i+aa+ad;ab=ac;}else{ab={r:-1,g:-1,b:-1,hex:"none"};}return ab;},f);f.getColor=function(i){var R=this.getColor.start=this.getColor.start||{h:0,s:1,b:i||0.75},e=this.hsb2rgb(R.h,R.s,R.b);R.h+=0.075;if(R.h>1){R.h=0;R.s-=0.2;if(R.s<=0){this.getColor.start={h:0,s:1,b:R.b};}}return e.hex;};f.getColor.reset=function(){delete this.start;};f.parsePathString=X(function(e){if(!e){return null;}var R={a:7,c:6,h:1,l:2,m:2,q:4,s:4,t:2,v:1,z:0},i=[];if(f.is(e,"array")&&f.is(e[0],"array")){i=t(e);}if(!i.length){(e+"").replace(/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,function(aa,Z,ad){var ac=[],ab=Z.toLowerCase();ad.replace(/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,function(af,ae){ae&&ac.push(+ae);});while(ac.length>=R[ab]){i.push([Z].concat(ac.splice(0,R[ab])));if(!R[ab]){break;}}});}i.toString=f._path2string;return i;});var C=X(function(ag){if(!ag){return{x:0,y:0,width:0,height:0};}ag=O(ag);var ad=0,ac=0,Z=[],R=[];for(var aa=0,af=ag.length;aa<af;aa++){if(ag[aa][0]=="M"){ad=ag[aa][1];ac=ag[aa][2];Z.push(ad);R.push(ac);}else{var ab=J(ad,ac,ag[aa][1],ag[aa][2],ag[aa][3],ag[aa][4],ag[aa][5],ag[aa][6]);Z=Z.concat(ab.min.x,ab.max.x);R=R.concat(ab.min.y,ab.max.y);}}var e=Math.min.apply(0,Z),ae=Math.min.apply(0,R);return{x:e,y:ae,width:Math.max.apply(0,Z)-e,height:Math.max.apply(0,R)-ae};}),t=function(ac){var Z=[];if(!f.is(ac,"array")||!f.is(ac&&ac[0],"array")){ac=f.parsePathString(ac);}for(var R=0,aa=ac.length;R<aa;R++){Z[R]=[];for(var e=0,ab=ac[R].length;e<ab;e++){Z[R][e]=ac[R][e];}}Z.toString=f._path2string;return Z;},c=X(function(aa){if(!f.is(aa,"array")||!f.is(aa&&aa[0],"array")){aa=f.parsePathString(aa);}var ag=[],ai=0,ah=0,al=0,ak=0,Z=0;if(aa[0][0]=="M"){ai=aa[0][1];ah=aa[0][2];al=ai;ak=ah;Z++;ag.push(["M",ai,ah]);}for(var ad=Z,am=aa.length;ad<am;ad++){var e=ag[ad]=[],aj=aa[ad];if(aj[0]!=aj[0].toLowerCase()){e[0]=aj[0].toLowerCase();switch(e[0]){case"a":e[1]=aj[1];e[2]=aj[2];e[3]=aj[3];e[4]=aj[4];e[5]=aj[5];e[6]=+(aj[6]-ai).toFixed(3);e[7]=+(aj[7]-ah).toFixed(3);break;case"v":e[1]=+(aj[1]-ah).toFixed(3);break;case"m":al=aj[1];ak=aj[2];default:for(var ac=1,ae=aj.length;ac<ae;ac++){e[ac]=+(aj[ac]-((ac%2)?ai:ah)).toFixed(3);}}}else{e=ag[ad]=[];if(aj[0]=="m"){al=aj[1]+ai;ak=aj[2]+ah;}for(var ab=0,R=aj.length;ab<R;ab++){ag[ad][ab]=aj[ab];}}var af=ag[ad].length;switch(ag[ad][0]){case"z":ai=al;ah=ak;break;case"h":ai+=+ag[ad][af-1];break;case"v":ah+=+ag[ad][af-1];break;default:ai+=+ag[ad][af-2];ah+=+ag[ad][af-1];}}ag.toString=f._path2string;return ag;},0,t),w=X(function(aa){if(!f.is(aa,"array")||!f.is(aa&&aa[0],"array")){aa=f.parsePathString(aa);}var af=[],ah=0,ag=0,ak=0,aj=0,Z=0;if(aa[0][0]=="M"){ah=+aa[0][1];ag=+aa[0][2];ak=ah;aj=ag;Z++;af[0]=["M",ah,ag];}for(var ad=Z,al=aa.length;ad<al;ad++){var e=af[ad]=[],ai=aa[ad];if(ai[0]!=(ai[0]+"").toUpperCase()){e[0]=(ai[0]+"").toUpperCase();switch(e[0]){case"A":e[1]=ai[1];e[2]=ai[2];e[3]=ai[3];e[4]=ai[4];e[5]=ai[5];e[6]=+(ai[6]+ah);e[7]=+(ai[7]+ag);break;case"V":e[1]=+ai[1]+ag;break;case"H":e[1]=+ai[1]+ah;break;case"M":ak=+ai[1]+ah;aj=+ai[2]+ag;default:for(var ac=1,ae=ai.length;ac<ae;ac++){e[ac]=+ai[ac]+((ac%2)?ah:ag);}}}else{for(var ab=0,R=ai.length;ab<R;ab++){af[ad][ab]=ai[ab];}}switch(e[0]){case"Z":ah=ak;ag=aj;break;case"H":ah=e[1];break;case"V":ag=e[1];break;default:ah=af[ad][af[ad].length-2];ag=af[ad][af[ad].length-1];}}af.toString=f._path2string;return af;},null,t),d=function(i,Z,e,R){return[i,Z,e,R,e,R];},x=function(i,Z,ab,aa,e,R){return[2/3*i+1/3*ab,2/3*Z+1/3*aa,2/3*i+1/3*e,2/3*Z+1/3*R,e,R];},r=function(ak,aP,au,ar,al,af,aa,aj,aO,am){var aq=Math.PI*120/180,e=Math.PI/180*(+al||0),ay=[],av,aL=X(function(aQ,aT,i){var aS=aQ*Math.cos(i)-aT*Math.sin(i),aR=aQ*Math.sin(i)+aT*Math.cos(i);return{x:aS,y:aR};});if(!am){av=aL(ak,aP,-e);ak=av.x;aP=av.y;av=aL(aj,aO,-e);aj=av.x;aO=av.y;var R=Math.cos(Math.PI/180*al),ah=Math.sin(Math.PI/180*al),aA=(ak-aj)/2,az=(aP-aO)/2;au=Math.max(au,Math.abs(aA));ar=Math.max(ar,Math.abs(az));var Z=au*au,aD=ar*ar,aF=(af==aa?-1:1)*Math.sqrt(Math.abs((Z*aD-Z*az*az-aD*aA*aA)/(Z*az*az+aD*aA*aA))),ao=aF*au*az/ar+(ak+aj)/2,an=aF*-ar*aA/au+(aP+aO)/2,ae=Math.asin((aP-an)/ar),ad=Math.asin((aO-an)/ar);ae=ak<ao?Math.PI-ae:ae;ad=aj<ao?Math.PI-ad:ad;ae<0&&(ae=Math.PI*2+ae);ad<0&&(ad=Math.PI*2+ad);if(aa&&ae>ad){ae=ae-Math.PI*2;}if(!aa&&ad>ae){ad=ad-Math.PI*2;}}else{ae=am[0];ad=am[1];ao=am[2];an=am[3];}var ai=ad-ae;if(Math.abs(ai)>aq){var ap=ad,at=aj,ag=aO;ad=ae+aq*(aa&&ad>ae?1:-1);aj=ao+au*Math.cos(ad);aO=an+ar*Math.sin(ad);ay=r(aj,aO,au,ar,al,0,aa,at,ag,[ad,ap,ao,an]);}ai=ad-ae;var ac=Math.cos(ae),aN=Math.sin(ae),ab=Math.cos(ad),aM=Math.sin(ad),aB=Math.tan(ai/4),aE=4/3*au*aB,aC=4/3*ar*aB,aK=[ak,aP],aJ=[ak+aE*aN,aP-aC*ac],aI=[aj+aE*aM,aO-aC*ab],aG=[aj,aO];aJ[0]=2*aK[0]-aJ[0];aJ[1]=2*aK[1]-aJ[1];if(am){return[aJ,aI,aG].concat(ay);}else{ay=[aJ,aI,aG].concat(ay).join(",").split(",");var aw=[];for(var aH=0,ax=ay.length;aH<ax;aH++){aw[aH]=aH%2?aL(ay[aH-1],ay[aH],e).y:aL(ay[aH],ay[aH+1],e).x;}return aw;}},A=X(function(i,e,ao,am,ab,aa,ad,ac,ai){var ag=Math.pow(1-ai,3)*i+Math.pow(1-ai,2)*3*ai*ao+(1-ai)*3*ai*ai*ab+Math.pow(ai,3)*ad,ae=Math.pow(1-ai,3)*e+Math.pow(1-ai,2)*3*ai*am+(1-ai)*3*ai*ai*aa+Math.pow(ai,3)*ac,ak=i+2*ai*(ao-i)+ai*ai*(ab-2*ao+i),aj=e+2*ai*(am-e)+ai*ai*(aa-2*am+e),an=ao+2*ai*(ab-ao)+ai*ai*(ad-2*ab+ao),al=am+2*ai*(aa-am)+ai*ai*(ac-2*aa+am),ah=(1-ai)*i+ai*ao,af=(1-ai)*e+ai*am,Z=(1-ai)*ab+ai*ad,R=(1-ai)*aa+ai*ac;return{x:ag,y:ae,m:{x:ak,y:aj},n:{x:an,y:al},start:{x:ah,y:af},end:{x:Z,y:R}};}),J=X(function(i,e,Z,R,am,al,ai,af){var ak=(am-2*Z+i)-(ai-2*am+Z),ah=2*(Z-i)-2*(am-Z),ae=i-Z,ac=(-ah+Math.sqrt(ah*ah-4*ak*ae))/2/ak,aa=(-ah-Math.sqrt(ah*ah-4*ak*ae))/2/ak,ag=[e,af],aj=[i,ai],ad=A(i,e,Z,R,am,al,ai,af,ac>0&&ac<1?ac:0),ab=A(i,e,Z,R,am,al,ai,af,aa>0&&aa<1?aa:0);aj=aj.concat(ad.x,ab.x);ag=ag.concat(ad.y,ab.y);ak=(al-2*R+e)-(af-2*al+R);ah=2*(R-e)-2*(al-R);ae=e-R;ac=(-ah+Math.sqrt(ah*ah-4*ak*ae))/2/ak;aa=(-ah-Math.sqrt(ah*ah-4*ak*ae))/2/ak;ad=A(i,e,Z,R,am,al,ai,af,ac>0&&ac<1?ac:0);ab=A(i,e,Z,R,am,al,ai,af,aa>0&&aa<1?aa:0);aj=aj.concat(ad.x,ab.x);ag=ag.concat(ad.y,ab.y);return{min:{x:Math.min.apply(Math,aj),y:Math.min.apply(Math,ag)},max:{x:Math.max.apply(Math,aj),y:Math.max.apply(Math,ag)}};}),O=X(function(al,ag){var aa=w(al),ah=ag&&w(ag),ai={x:0,y:0,bx:0,by:0,X:0,Y:0},e={x:0,y:0,bx:0,by:0,X:0,Y:0},ac=function(am,an){var i,ao;if(!am){return["C",an.x,an.y,an.x,an.y,an.x,an.y];}switch(am[0]){case"M":an.X=am[1];an.Y=am[2];break;case"A":am=["C"].concat(r.apply(0,[an.x,an.y].concat(am.slice(1))));break;case"S":i=an.x+(an.x-(an.bx||an.x));ao=an.y+(an.y-(an.by||an.y));am=["C",i,ao].concat(am.slice(1));break;case"T":i=an.x+(an.x-(an.bx||an.x));ao=an.y+(an.y-(an.by||an.y));am=["C"].concat(x(an.x,an.y,i,ao,am[1],am[2]));break;case"Q":am=["C"].concat(x(an.x,an.y,am[1],am[2],am[3],am[4]));break;case"L":am=["C"].concat(d(an.x,an.y,am[1],am[2]));break;case"H":am=["C"].concat(d(an.x,an.y,am[1],an.y));break;case"V":am=["C"].concat(d(an.x,an.y,an.x,am[1]));break;case"Z":am=["C"].concat(d(an.x,an.y,an.X,an.Y));break;}return am;},R=function(am,an){if(am[an].length>7){am[an].shift();var ao=am[an];while(ao.length){am.splice(an++,0,["C"].concat(ao.splice(0,6)));}am.splice(an,1);aj=Math.max(aa.length,ah&&ah.length||0);}},Z=function(aq,ap,an,am,ao){if(aq&&ap&&aq[ao][0]=="M"&&ap[ao][0]!="M"){ap.splice(ao,0,["M",am.x,am.y]);an.bx=0;an.by=0;an.x=aq[ao][1];an.y=aq[ao][2];aj=Math.max(aa.length,ah&&ah.length||0);}};for(var ae=0,aj=Math.max(aa.length,ah&&ah.length||0);ae<aj;ae++){aa[ae]=ac(aa[ae],ai);R(aa,ae);ah&&(ah[ae]=ac(ah[ae],e));ah&&R(ah,ae);Z(aa,ah,ai,e,ae);Z(ah,aa,e,ai,ae);var ad=aa[ae],ak=ah&&ah[ae],ab=ad.length,af=ah&&ak.length;ai.bx=ad[ab-4]||0;ai.by=ad[ab-3]||0;ai.x=ad[ab-2];ai.y=ad[ab-1];e.bx=ah&&(ak[af-4]||0);e.by=ah&&(ak[af-3]||0);e.x=ah&&ak[af-2];e.y=ah&&ak[af-1];}return ah?[aa,ah]:aa;},null,t),n=X(function(ah){if(f.is(ah,"string")){ah=ah.split(/\s*\-\s*/);var Z=ah.shift();if(Z.toLowerCase()=="v"){Z=90;}else{if(Z.toLowerCase()=="h"){Z=0;}else{Z=parseFloat(Z);}}Z=-Z;var af={angle:Z,type:"linear",dots:[],vector:[0,0,Math.cos(Z*Math.PI/180).toFixed(3),Math.sin(Z*Math.PI/180).toFixed(3)]},ag=1/(Math.max(Math.abs(af.vector[2]),Math.abs(af.vector[3]))||1);af.vector[2]*=ag;af.vector[3]*=ag;if(af.vector[2]<0){af.vector[0]=-af.vector[2];af.vector[2]=0;}if(af.vector[3]<0){af.vector[1]=-af.vector[3];af.vector[3]=0;}af.vector[0]=af.vector[0];af.vector[1]=af.vector[1];af.vector[2]=af.vector[2];af.vector[3]=af.vector[3];for(var ac=0,ai=ah.length;ac<ai;ac++){var e={},ae=ah[ac].match(/^([^:]*):?([\d\.]*)/);e.color=f.getRGB(ae[1]).hex;ae[2]&&(e.offset=ae[2]+"%");af.dots.push(e);}for(var ac=1,ai=af.dots.length-1;ac<ai;ac++){if(!af.dots[ac].offset){var R=parseFloat(af.dots[ac-1].offset||0),aa=false;for(var ab=ac+1;ab<ai;ab++){if(af.dots[ab].offset){aa=af.dots[ab].offset;break;}}if(!aa){aa=100;ab=ai;}aa=parseFloat(aa);var ad=(aa-R)/(ab-ac+1);for(;ac<ab;ac++){R+=ad;af.dots[ac].offset=R+"%";}}}return af;}else{return ah;}}),G=function(){var R,i,aa,Z,e;if(f.is(arguments[0],"string")||f.is(arguments[0],"object")){if(f.is(arguments[0],"string")){R=g.getElementById(arguments[0]);}else{R=arguments[0];}if(R.tagName){if(arguments[1]==null){return{container:R,width:R.style.pixelWidth||R.offsetWidth,height:R.style.pixelHeight||R.offsetHeight};}else{return{container:R,width:arguments[1],height:arguments[2]};}}}else{if(f.is(arguments[0],"number")&&arguments.length>3){return{container:1,x:arguments[0],y:arguments[1],width:arguments[2],height:arguments[3]};}}},a=function(e,R){var i=this;for(var Z in R){if(R.hasOwnProperty(Z)&&!(Z in e)){switch(typeof R[Z]){case"function":(function(aa){e[Z]=e===i?aa:function(){return aa.apply(i,arguments);};})(R[Z]);break;case"object":e[Z]=e[Z]||{};a.call(this,e[Z],R[Z]);break;default:e[Z]=R[Z];break;}}}};if(f.svg){b.svgns="http://www.w3.org/2000/svg";b.xlink="http://www.w3.org/1999/xlink";var N=function(e){return +e+(Math.floor(e)==e)*0.5;};var z=function(ab){for(var R=0,Z=ab.length;R<Z;R++){if(ab[R][0].toLowerCase()!="a"){for(var e=1,aa=ab[R].length;e<aa;e++){ab[R][e]=N(ab[R][e]);}}else{ab[R][6]=N(ab[R][6]);ab[R][7]=N(ab[R][7]);}}return ab;};var B=function(R,e){if(e){for(var i in e){if(e.hasOwnProperty(i)){R.setAttribute(i,e[i]);}}}else{return g.createElementNS(b.svgns,R);}};f.toString=function(){return"Your browser supports SVG.\nYou are running Rapha\u00ebl "+this.version;};var W=function(e,Z){var i=B("path");Z.canvas&&Z.canvas.appendChild(i);var R=new m(i,Z);R.type="path";F(R,{fill:"none",stroke:"#000",path:e});return R;};var M=function(ad,ab,ae){ab=n(ab);var aa=B((ab.type||"linear")+"Gradient");aa.id="r"+(f.idGenerator++).toString(36);if(ab.vector&&ab.vector.length){B(aa,{x1:ab.vector[0],y1:ab.vector[1],x2:ab.vector[2],y2:ab.vector[3]});}ae.defs.appendChild(aa);var ac=true;for(var R=0,Z=ab.dots.length;R<Z;R++){var e=B("stop");if(ab.dots[R].offset){ac=false;}B(e,{offset:ab.dots[R].offset?ab.dots[R].offset:(R==0)?"0%":"100%","stop-color":f.getRGB(ab.dots[R].color).hex||"#fff"});aa.appendChild(e);}if(ac&&ab.dots[Z-1].opacity!=null){B(e,{"stop-opacity":ab.dots[Z-1].opacity});}B(ad,{fill:"url(#"+aa.id+")",opacity:1,"fill-opacity":1});ad.style.fill="";ad.style.opacity=1;ad.style.fillOpacity=1;};var s=function(i){var e=i.getBBox();B(i.pattern,{patternTransform:f.format("translate({0},{1})",e.x,e.y)});};var F=function(ah,aq){var ak={"":[0],none:[0],"-":[3,1],".":[1,1],"-.":[3,1,1,1],"-..":[3,1,1,1,1,1],". ":[1,3],"- ":[4,3],"--":[8,3],"- .":[4,3,1,3],"--.":[8,3,1,3],"--..":[8,3,1,3,1,3]},am=ah.node,ai=ah.attrs,ae=ah.attr("rotation"),ab=function(ay,ax){ax=ak[(ax+"").toLowerCase()];if(ax){var av=ay.attrs["stroke-width"]||"1",at={round:av,square:av,butt:0}[ay.attrs["stroke-linecap"]||aq["stroke-linecap"]]||0,aw=[];var au=ax.length;while(au--){aw[au]=ax[au]*av+((au%2)?1:-1)*at;}B(am,{"stroke-dasharray":aw.join(",")});}};parseFloat(ae)&&ah.rotate(0,true);for(var al in aq){if(aq.hasOwnProperty(al)){if(!(al in q)){continue;}var aj=aq[al];ai[al]=aj;switch(al){case"href":case"title":case"target":var ao=am.parentNode;if(ao.tagName.toLowerCase()!="a"){var Z=B("a");ao.insertBefore(Z,am);Z.appendChild(am);ao=Z;}ao.setAttributeNS(ah.paper.xlink,al,aj);break;case"clip-rect":var i=(aj+"").split(Y);if(i.length==4){ah.clip&&ah.clip.parentNode.parentNode.removeChild(ah.clip.parentNode);var R=B("clipPath"),an=B("rect");R.id="r"+(f.idGenerator++).toString(36);B(an,{x:i[0],y:i[1],width:i[2],height:i[3]});R.appendChild(an);ah.paper.defs.appendChild(R);B(am,{"clip-path":"url(#"+R.id+")"});ah.clip=an;}if(!aj){var ap=g.getElementById(am.getAttribute("clip-path").replace(/(^url\(#|\)$)/g,""));ap&&ap.parentNode.removeChild(ap);B(am,{"clip-path":""});delete ah.clip;}break;case"path":if(aj&&ah.type=="path"){ai.path=z(w(aj));B(am,{d:ai.path});}case"width":am.setAttribute(al,aj);if(ai.fx){al="x";aj=ai.x;}else{break;}case"x":if(ai.fx){aj=-ai.x-(ai.width||0);}case"rx":if(al=="rx"&&ah.type=="rect"){break;}case"cx":am.setAttribute(al,aj);ah.pattern&&s(ah);break;case"height":am.setAttribute(al,aj);if(ai.fy){al="y";aj=ai.y;}else{break;}case"y":if(ai.fy){aj=-ai.y-(ai.height||0);}case"ry":if(al=="ry"&&ah.type=="rect"){break;}case"cy":am.setAttribute(al,aj);ah.pattern&&s(ah);break;case"r":if(ah.type=="rect"){B(am,{rx:aj,ry:aj});}else{am.setAttribute(al,aj);}break;case"src":if(ah.type=="image"){am.setAttributeNS(ah.paper.xlink,"href",aj);}break;case"stroke-width":am.style.strokeWidth=aj;am.setAttribute(al,aj);if(ai["stroke-dasharray"]){ab(ah,ai["stroke-dasharray"]);}break;case"stroke-dasharray":ab(ah,aj);break;case"rotation":ae=aj;ah.rotate(aj,true);break;case"translation":var ac=(aj+"").split(Y);ah.translate((+ac[0]+1||2)-1,(+ac[1]+1||2)-1);break;case"scale":var ac=(aj+"").split(Y);ah.scale(+ac[0]||1,+ac[1]||+ac[0]||1,+ac[2]||null,+ac[3]||null);break;case"fill":var aa=(aj+"").match(/^url\(['"]?([^\)]+)['"]?\)$/i);if(aa){var R=B("pattern"),ag=B("image");R.id="r"+(f.idGenerator++).toString(36);B(R,{x:0,y:0,patternUnits:"userSpaceOnUse"});B(ag,{x:0,y:0});ag.setAttributeNS(ah.paper.xlink,"href",aa[1]);R.appendChild(ag);var ar=g.createElement("img");ar.style.position="absolute";ar.style.top="-9999em";ar.style.left="-9999em";ar.onload=function(){B(R,{width:this.offsetWidth,height:this.offsetHeight});B(ag,{width:this.offsetWidth,height:this.offsetHeight});g.body.removeChild(this);b.safari();};g.body.appendChild(ar);ar.src=aa[1];ah.paper.defs.appendChild(R);am.style.fill="url(#"+R.id+")";B(am,{fill:"url(#"+R.id+")"});ah.pattern=R;ah.pattern&&s(ah);break;}delete aq.gradient;delete ai.gradient;if(!f.is(ai.opacity,"undefined")&&f.is(aq.opacity,"undefined")){am.style.opacity=ai.opacity;B(am,{opacity:ai.opacity});}if(!f.is(ai["fill-opacity"],"undefined")&&f.is(aq["fill-opacity"],"undefined")){am.style.fillOpacity=ai["fill-opacity"];B(am,{"fill-opacity":ai["fill-opacity"]});}case"stroke":am.style[al]=f.getRGB(aj).hex;am.setAttribute(al,f.getRGB(aj).hex);break;case"gradient":M(am,aj,ah.paper);break;case"opacity":case"fill-opacity":if(ai.gradient){var e=g.getElementById(am.getAttribute("fill").replace(/^url\(#|\)$/g,""));if(e){var ad=e.getElementsByTagName("stop");ad[ad.length-1].setAttribute("stop-opacity",aj);}break;}default:al=="font-size"&&(aj=parseInt(aj,10)+"px");var af=al.replace(/(\-.)/g,function(at){return at.substring(1).toUpperCase();});am.style[af]=aj;am.setAttribute(al,aj);break;}}}T(ah,aq);parseInt(ae,10)&&ah.rotate(ae,true);};var K=1.2;var T=function(e,aa){if(e.type!="text"||!("text" in aa||"font" in aa||"font-size" in aa||"x" in aa||"y" in aa)){return;}var af=e.attrs,R=e.node,ah=R.firstChild?parseInt(g.defaultView.getComputedStyle(R.firstChild,"").getPropertyValue("font-size"),10):10;if("text" in aa){while(R.firstChild){R.removeChild(R.firstChild);}var Z=(aa.text+"").split("\n");for(var ab=0,ag=Z.length;ab<ag;ab++){var ad=B("tspan");ab&&B(ad,{dy:ah*K,x:af.x});ad.appendChild(g.createTextNode(Z[ab]));R.appendChild(ad);}}else{var Z=R.getElementsByTagName("tspan");for(var ab=0,ag=Z.length;ab<ag;ab++){ab&&B(Z[ab],{dy:ah*K,x:af.x});}}B(R,{y:af.y});var ac=e.getBBox(),ae=af.y-(ac.y+ac.height/2);ae&&B(R,{y:af.y+ae});};var m=function(i,e){var Z=0,R=0;this[0]=i;this.node=i;this.paper=e;this.attrs=this.attrs||{};this.transformations=[];this._={tx:0,ty:0,rt:{deg:0,cx:0,cy:0},sx:1,sy:1};};m.prototype.rotate=function(i,e,Z){if(i==null){if(this._.rt.cx){return[this._.rt.deg,this._.rt.cx,this._.rt.cy].join(" ");}return this._.rt.deg;}var R=this.getBBox();i=(i+"").split(Y);if(i.length-1){e=parseFloat(i[1]);Z=parseFloat(i[2]);}i=parseFloat(i[0]);if(e!=null){this._.rt.deg=i;}else{this._.rt.deg+=i;}(Z==null)&&(e=null);this._.rt.cx=e;this._.rt.cy=Z;e=e==null?R.x+R.width/2:e;Z=Z==null?R.y+R.height/2:Z;if(this._.rt.deg){this.transformations[0]=f.format("rotate({0} {1} {2})",this._.rt.deg,e,Z);this.clip&&B(this.clip,{transform:f.format("rotate({0} {1} {2})",-this._.rt.deg,e,Z)});}else{this.transformations[0]="";this.clip&&B(this.clip,{transform:""});}B(this.node,{transform:this.transformations.join(" ")});return this;};m.prototype.hide=function(){this.node.style.display="none";return this;};m.prototype.show=function(){this.node.style.display="block";return this;};m.prototype.remove=function(){this.node.parentNode.removeChild(this.node);};m.prototype.getBBox=function(){if(this.type=="path"){return C(this.attrs.path);}if(this.node.style.display=="none"){this.show();var Z=true;}var ad={};try{ad=this.node.getBBox();}catch(ab){}finally{ad=ad||{};}if(this.type=="text"){ad={x:ad.x,y:Infinity,width:ad.width,height:0};for(var R=0,aa=this.node.getNumberOfChars();R<aa;R++){var ac=this.node.getExtentOfChar(R);(ac.y<ad.y)&&(ad.y=ac.y);(ac.y+ac.height-ad.y>ad.height)&&(ad.height=ac.y+ac.height-ad.y);}}Z&&this.hide();return ad;};m.prototype.attr=function(){if(arguments.length==1&&f.is(arguments[0],"string")){if(arguments[0]=="translation"){return this.translate();}if(arguments[0]=="rotation"){return this.rotate();}if(arguments[0]=="scale"){return this.scale();}return this.attrs[arguments[0]];}if(arguments.length==1&&f.is(arguments[0],"array")){var e={};for(var i in arguments[0]){if(arguments[0].hasOwnProperty(i)){e[arguments[0][i]]=this.attrs[arguments[0][i]];}}return e;}if(arguments.length==2){var R={};R[arguments[0]]=arguments[1];F(this,R);}else{if(arguments.length==1&&f.is(arguments[0],"object")){F(this,arguments[0]);}}return this;};m.prototype.toFront=function(){this.node.parentNode.appendChild(this.node);return this;};m.prototype.toBack=function(){if(this.node.parentNode.firstChild!=this.node){this.node.parentNode.insertBefore(this.node,this.node.parentNode.firstChild);}return this;};m.prototype.insertAfter=function(e){if(e.node.nextSibling){e.node.parentNode.insertBefore(this.node,e.node.nextSibling);}else{e.node.parentNode.appendChild(this.node);}return this;};m.prototype.insertBefore=function(e){var i=e.node;i.parentNode.insertBefore(this.node,i);return this;};m.prototype.blur=function(e){if(e!="none"){var i=B("filter"),R=B("feGaussianBlur");i.id="r"+(f.idGenerator++).toString(36);B(R,{stdDeviation:+e||1.5});i.appendChild(R);this.paper.defs.appendChild(i);this._blur=i;B(this.node,{filter:"url(#"+i.id+")"});}else{if(this._blur){this._blur.parentNode.removeChild(this._blur);delete this._blur;}this.node.removeAttribute("filter");}};var D=function(i,e,ab,aa){e=N(e);ab=N(ab);var Z=B("circle");i.canvas&&i.canvas.appendChild(Z);var R=new m(Z,i);R.attrs={cx:e,cy:ab,r:aa,fill:"none",stroke:"#000"};R.type="circle";B(Z,R.attrs);return R;};var I=function(R,e,ad,i,ab,ac){e=N(e);ad=N(ad);var aa=B("rect");R.canvas&&R.canvas.appendChild(aa);var Z=new m(aa,R);Z.attrs={x:e,y:ad,width:i,height:ab,r:ac||0,rx:ac||0,ry:ac||0,fill:"none",stroke:"#000"};Z.type="rect";B(aa,Z.attrs);return Z;};var h=function(i,e,ac,ab,aa){e=N(e);ac=N(ac);var Z=B("ellipse");i.canvas&&i.canvas.appendChild(Z);var R=new m(Z,i);R.attrs={cx:e,cy:ac,rx:ab,ry:aa,fill:"none",stroke:"#000"};R.type="ellipse";B(Z,R.attrs);return R;};var p=function(R,ac,e,ad,i,ab){var aa=B("image");B(aa,{x:e,y:ad,width:i,height:ab,preserveAspectRatio:"none"});aa.setAttributeNS(R.xlink,"href",ac);R.canvas&&R.canvas.appendChild(aa);var Z=new m(aa,R);Z.attrs={x:e,y:ad,width:i,height:ab,src:ac};Z.type="image";return Z;};var H=function(i,e,ab,aa){var Z=B("text");B(Z,{x:e,y:ab,"text-anchor":"middle"});i.canvas&&i.canvas.appendChild(Z);var R=new m(Z,i);R.attrs={x:e,y:ab,"text-anchor":"middle",text:aa,font:q.font,stroke:"none",fill:"#000"};R.type="text";F(R,R.attrs);return R;};var E=function(i,e){this.width=i||this.width;this.height=e||this.height;this.canvas.setAttribute("width",this.width);this.canvas.setAttribute("height",this.height);return this;};var l=function(){var aa=G.apply(null,arguments),R=aa.container,ac=aa.x,ab=aa.y,Z=aa.width,ad=aa.height;if(!R){throw new Error("SVG container not found.");}b.canvas=B("svg");var e=b.canvas,ae=e.style;e.setAttribute("width",Z||512);b.width=Z||512;e.setAttribute("height",ad||342);b.height=ad||342;if(R==1){g.body.appendChild(e);ae.position="absolute";ae.left=ac+"px";ae.top=ab+"px";}else{if(R.firstChild){R.insertBefore(e,R.firstChild);}else{R.appendChild(e);}}R={canvas:e,clear:function(){while(this.canvas.firstChild){this.canvas.removeChild(this.canvas.firstChild);}this.desc=B("desc");this.defs=B("defs");this.desc.appendChild(g.createTextNode("Created with Rapha\u00ebl"));this.canvas.appendChild(this.desc);this.canvas.appendChild(this.defs);}};for(var i in b){if(b.hasOwnProperty(i)){if(i!="create"){R[i]=b[i];}}}a.call(R,R,f.fn);R.clear();R.raphael=f;return R;};b.remove=function(){this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas);};if({"Apple Computer, Inc.":1,"Google Inc.":1}[navigator.vendor]){b.safari=function(){var e=this.rect(-99,-99,this.width+99,this.height+99);setTimeout(function(){e.remove();});};}else{b.safari=function(){};}}if(f.vml){var y=function(ac){var aa=O(ac);for(var R=0,Z=aa.length;R<Z;R++){aa[R][0]=(aa[R][0]+"").toLowerCase();aa[R][0]=="z"&&(aa[R][0]="x");for(var e=1,ab=aa[R].length;e<ab;e++){aa[R][e]=Math.round(aa[R][e]);}}return(aa+"");};f.toString=function(){return"Your browser doesn\u2019t support SVG. Assuming it is Internet Explorer and falling down to VML.\nYou are running Rapha\u00ebl "+this.version;};var W=function(e,ab){var Z=V("group"),ac=Z.style;ac.position="absolute";ac.left=0;ac.top=0;ac.width=ab.width+"px";ac.height=ab.height+"px";Z.coordsize=ab.coordsize;Z.coordorigin=ab.coordorigin;var R=V("shape"),i=R.style;i.width=ab.width+"px";i.height=ab.height+"px";R.path="";R.coordsize=this.coordsize;R.coordorigin=this.coordorigin;Z.appendChild(R);var aa=new m(R,Z,ab);aa.isAbsolute=true;aa.type="path";aa.path=[];aa.Path="";if(e){aa.attrs.path=f.parsePathString(e);aa.node.path=y(aa.attrs.path);}F(aa,{fill:"none",stroke:"#000"});aa.setBox();ab.canvas.appendChild(Z);return aa;};var F=function(af,aj){af.attrs=af.attrs||{};var ah=af.node,ak=af.attrs,ac=ah.style,Z,ao=af;for(var ad in aj){if(aj.hasOwnProperty(ad)){ak[ad]=aj[ad];}}aj.href&&(ah.href=aj.href);aj.title&&(ah.title=aj.title);aj.target&&(ah.target=aj.target);if(aj.path&&af.type=="path"){ak.path=f.parsePathString(aj.path);ah.path=y(ak.path);}if(aj.rotation!=null){af.rotate(aj.rotation,true);}if(aj.translation){Z=(aj.translation+"").split(Y);af.translate(Z[0],Z[1]);}if(aj.scale){Z=(aj.scale+"").split(Y);af.scale(+Z[0]||1,+Z[1]||+Z[0]||1,+Z[2]||null,+Z[3]||null);}if("clip-rect" in aj){var e=(aj["clip-rect"]+"").split(Y);if(e.length==4){e[2]=+e[2]+(+e[0]);e[3]=+e[3]+(+e[1]);var ae=ah.clipRect||g.createElement("div"),an=ae.style,ab=ah.parentNode;an.clip=f.format("rect({0}px {2}px {3}px {1}px)",e);if(!ah.clipRect){an.position="absolute";an.top=0;an.left=0;an.width=af.paper.width+"px";an.height=af.paper.height+"px";ab.parentNode.insertBefore(ae,ab);ae.appendChild(ab);ah.clipRect=ae;}}if(!aj["clip-rect"]){ah.clipRect&&(ah.clipRect.style.clip="");}}if(af.type=="image"&&aj.src){ah.src=aj.src;}if(af.type=="image"&&aj.opacity){ah.filterOpacity=" progid:DXImageTransform.Microsoft.Alpha(opacity="+(aj.opacity*100)+")";ac.filter=(ah.filterMatrix||"")+(ah.filterOpacity||"");}aj.font&&(ac.font=aj.font);aj["font-family"]&&(ac.fontFamily='"'+aj["font-family"].split(",")[0].replace(/^['"]+|['"]+$/g,"")+'"');aj["font-size"]&&(ac.fontSize=aj["font-size"]);aj["font-weight"]&&(ac.fontWeight=aj["font-weight"]);aj["font-style"]&&(ac.fontStyle=aj["font-style"]);if(aj.opacity!=null||aj["stroke-width"]!=null||aj.fill!=null||aj.stroke!=null||aj["stroke-width"]!=null||aj["stroke-opacity"]!=null||aj["fill-opacity"]!=null||aj["stroke-dasharray"]!=null||aj["stroke-miterlimit"]!=null||aj["stroke-linejoin"]!=null||aj["stroke-linecap"]!=null){ah=af.shape||ah;var ai=(ah.getElementsByTagName("fill")&&ah.getElementsByTagName("fill")[0]),al=false;!ai&&(al=ai=V("fill"));if("fill-opacity" in aj||"opacity" in aj){var i=((+ak["fill-opacity"]+1||2)-1)*((+ak.opacity+1||2)-1);i<0&&(i=0);i>1&&(i=1);ai.opacity=i;}aj.fill&&(ai.on=true);if(ai.on==null||aj.fill=="none"){ai.on=false;}if(ai.on&&aj.fill){var R=aj.fill.match(/^url\(([^\)]+)\)$/i);if(R){ai.src=R[1];ai.type="tile";}else{ai.color=f.getRGB(aj.fill).hex;ai.src="";ai.type="solid";}}al&&ah.appendChild(ai);var aa=(ah.getElementsByTagName("stroke")&&ah.getElementsByTagName("stroke")[0]),am=false;!aa&&(am=aa=V("stroke"));if((aj.stroke&&aj.stroke!="none")||aj["stroke-width"]||aj["stroke-opacity"]!=null||aj["stroke-dasharray"]||aj["stroke-miterlimit"]||aj["stroke-linejoin"]||aj["stroke-linecap"]){aa.on=true;}(aj.stroke=="none"||aa.on==null||aj.stroke==0||aj["stroke-width"]==0)&&(aa.on=false);aa.on&&aj.stroke&&(aa.color=f.getRGB(aj.stroke).hex);var i=((+ak["stroke-opacity"]+1||2)-1)*((+ak.opacity+1||2)-1);i<0&&(i=0);i>1&&(i=1);aa.opacity=i;aj["stroke-linejoin"]&&(aa.joinstyle=aj["stroke-linejoin"]||"miter");aa.miterlimit=aj["stroke-miterlimit"]||8;aj["stroke-linecap"]&&(aa.endcap={butt:"flat",square:"square",round:"round"}[aj["stroke-linecap"]]||"miter");aj["stroke-width"]&&(aa.weight=(parseFloat(aj["stroke-width"])||1)*12/16);if(aj["stroke-dasharray"]){var ag={"-":"shortdash",".":"shortdot","-.":"shortdashdot","-..":"shortdashdotdot",". ":"dot","- ":"dash","--":"longdash","- .":"dashdot","--.":"longdashdot","--..":"longdashdotdot"};aa.dashstyle=ag[aj["stroke-dasharray"]]||"";}am&&ah.appendChild(aa);}if(ao.type=="text"){var ac=b.span.style;ak.font&&(ac.font=ak.font);ak["font-family"]&&(ac.fontFamily=ak["font-family"]);ak["font-size"]&&(ac.fontSize=ak["font-size"]);ak["font-weight"]&&(ac.fontWeight=ak["font-weight"]);ak["font-style"]&&(ac.fontStyle=ak["font-style"]);b.span.innerHTML=ao.node.string.replace(/</g,"&#60;").replace(/&/g,"&#38;").replace(/\n/g,"<br>");ao.W=ak.w=b.span.offsetWidth;ao.H=ak.h=b.span.offsetHeight;ao.X=ak.x;ao.Y=ak.y+Math.round(ao.H/2);switch(ak["text-anchor"]){case"start":ao.node.style["v-text-align"]="left";ao.bbx=Math.round(ao.W/2);break;case"end":ao.node.style["v-text-align"]="right";ao.bbx=-Math.round(ao.W/2);break;default:ao.node.style["v-text-align"]="center";break;}}};var o=function(i,e,aa,Z){var R=Math.round(Math.atan((parseFloat(aa)-parseFloat(i))/(parseFloat(Z)-parseFloat(e)))*57.29)||0;if(!R&&parseFloat(i)<parseFloat(e)){R=180;}R-=180;if(R<0){R+=360;}return R;};var M=function(ad,ac){ac=n(ac);ad.attrs=ad.attrs||{};var R=ad.attrs,ab=ad.node.getElementsByTagName("fill");ad.attrs.gradient=ac;ad=ad.shape||ad.node;if(ab.length){ab=ab[0];}else{ab=V("fill");}if(ac.dots.length){ab.on=true;ab.method="none";ab.type=((ac.type+"").toLowerCase()=="radial")?"gradientTitle":"gradient";if(!f.is(ac.dots[0].color,"undefined")){ab.color=f.getRGB(ac.dots[0].color).hex;}if(!f.is(ac.dots[ac.dots.length-1].color,"undefined")){ab.color2=f.getRGB(ac.dots[ac.dots.length-1].color).hex;}var ae=[];for(var Z=0,aa=ac.dots.length;Z<aa;Z++){if(ac.dots[Z].offset){ae.push(ac.dots[Z].offset+" "+f.getRGB(ac.dots[Z].color).hex);}}var e=f.is(ac.dots[ac.dots.length-1].opacity,"undefined")?(f.is(R.opacity,"undefined")?1:R.opacity):ac.dots[ac.dots.length-1].opacity;if(ae.length){ab.colors.value=ae.join(",");e=f.is(R.opacity,"undefined")?1:R.opacity;}else{ab.colors&&(ab.colors.value="0% "+ab.color);}ab.opacity=e;if(!f.is(ac.angle,"undefined")){ab.angle=(-ac.angle+270)%360;}else{if(ac.vector){ab.angle=o.apply(null,ac.vector);}}if((ac.type+"").toLowerCase()=="radial"){ab.focus="100%";ab.focusposition="0.5 0.5";}}};var m=function(aa,ac,e){var ab=0,R=0,i=0,Z=1;this[0]=aa;this.node=aa;this.X=0;this.Y=0;this.attrs={};this.Group=ac;this.paper=e;this._={tx:0,ty:0,rt:{deg:0},sx:1,sy:1};};m.prototype.rotate=function(i,e,R){if(i==null){if(this._.rt.cx){return[this._.rt.deg,this._.rt.cx,this._.rt.cy].join(" ");}return this._.rt.deg;}i=(i+"").split(Y);if(i.length-1){e=parseFloat(i[1]);R=parseFloat(i[2]);}i=parseFloat(i[0]);if(e!=null){this._.rt.deg=i;}else{this._.rt.deg+=i;}(R==null)&&(e=null);this._.rt.cx=e;this._.rt.cy=R;this.setBox(this.attrs,e,R);this.Group.style.rotation=this._.rt.deg;return this;};m.prototype.setBox=function(ab,ac,aa){var R=this.Group.style,ad=(this.shape&&this.shape.style)||this.node.style;ab=ab||{};for(var ae in ab){if(ab.hasOwnProperty(ae)){this.attrs[ae]=ab[ae];}}ac=ac||this._.rt.cx;aa=aa||this._.rt.cy;var ah=this.attrs,ak,aj,al,ag;switch(this.type){case"circle":ak=ah.cx-ah.r;aj=ah.cy-ah.r;al=ag=ah.r*2;break;case"ellipse":ak=ah.cx-ah.rx;aj=ah.cy-ah.ry;al=ah.rx*2;ag=ah.ry*2;break;case"rect":case"image":ak=ah.x;aj=ah.y;al=ah.width||0;ag=ah.height||0;break;case"text":this.textpath.v=["m",Math.round(ah.x),", ",Math.round(ah.y-2),"l",Math.round(ah.x)+1,", ",Math.round(ah.y-2)].join("");ak=ah.x-Math.round(this.W/2);aj=ah.y-this.H/2;al=this.W;ag=this.H;break;case"path":if(!this.attrs.path){ak=0;aj=0;al=this.paper.width;ag=this.paper.height;}else{var af=C(this.attrs.path);ak=af.x;aj=af.y;al=af.width;ag=af.height;}break;default:ak=0;aj=0;al=this.paper.width;ag=this.paper.height;break;}ac=(ac==null)?ak+al/2:ac;aa=(aa==null)?aj+ag/2:aa;var Z=ac-this.paper.width/2,ai=aa-this.paper.height/2;if(this.type=="path"||this.type=="text"){(R.left!=Z+"px")&&(R.left=Z+"px");(R.top!=ai+"px")&&(R.top=ai+"px");this.X=this.type=="text"?ak:-Z;this.Y=this.type=="text"?aj:-ai;this.W=al;this.H=ag;(ad.left!=-Z+"px")&&(ad.left=-Z+"px");(ad.top!=-ai+"px")&&(ad.top=-ai+"px");}else{(R.left!=Z+"px")&&(R.left=Z+"px");(R.top!=ai+"px")&&(R.top=ai+"px");this.X=ak;this.Y=aj;this.W=al;this.H=ag;(R.width!=this.paper.width+"px")&&(R.width=this.paper.width+"px");(R.height!=this.paper.height+"px")&&(R.height=this.paper.height+"px");(ad.left!=ak-Z+"px")&&(ad.left=ak-Z+"px");(ad.top!=aj-ai+"px")&&(ad.top=aj-ai+"px");(ad.width!=al+"px")&&(ad.width=al+"px");(ad.height!=ag+"px")&&(ad.height=ag+"px");var am=(+ab.r||0)/(Math.min(al,ag));if(this.type=="rect"&&this.arcsize!=am&&(am||this.arcsize)){var e=V(am?"roundrect":"rect");e.arcsize=am;this.Group.appendChild(e);this.node.parentNode.removeChild(this.node);this.node=e;this.arcsize=am;F(this,this.attrs);this.setBox(this.attrs);}}};m.prototype.hide=function(){this.Group.style.display="none";return this;};m.prototype.show=function(){this.Group.style.display="block";return this;};m.prototype.getBBox=function(){if(this.type=="path"){return C(this.attrs.path);}return{x:this.X+(this.bbx||0),y:this.Y,width:this.W,height:this.H};};m.prototype.remove=function(){this[0].parentNode.removeChild(this[0]);this.Group.parentNode.removeChild(this.Group);this.shape&&this.shape.parentNode.removeChild(this.shape);};m.prototype.attr=function(){if(arguments.length==1&&f.is(arguments[0],"string")){if(arguments[0]=="translation"){return this.translate();}if(arguments[0]=="rotation"){return this.rotate();}if(arguments[0]=="scale"){return this.scale();}return this.attrs[arguments[0]];}if(this.attrs&&arguments.length==1&&f.is(arguments[0],"array")){var e={};for(var R=0,Z=arguments[0].length;R<Z;R++){e[arguments[0][R]]=this.attrs[arguments[0][R]];}return e;}var aa;if(arguments.length==2){aa={};aa[arguments[0]]=arguments[1];}if(arguments.length==1&&f.is(arguments[0],"object")){aa=arguments[0];}if(aa){if(aa.gradient){M(this,aa.gradient);}if(aa.text&&this.type=="text"){this.node.string=aa.text;}F(this,aa);this.setBox(this.attrs);}return this;};m.prototype.toFront=function(){this.Group.parentNode.appendChild(this.Group);return this;};m.prototype.toBack=function(){if(this.Group.parentNode.firstChild!=this.Group){this.Group.parentNode.insertBefore(this.Group,this.Group.parentNode.firstChild);}return this;};m.prototype.insertAfter=function(e){if(e.Group.nextSibling){e.Group.parentNode.insertBefore(this.Group,e.Group.nextSibling);}else{e.Group.parentNode.appendChild(this.Group);}return this;};m.prototype.insertBefore=function(e){e.Group.parentNode.insertBefore(this.Group,e.Group);return this;};m.prototype.blur=function(e){var i=this.node.style,R=i.filter;R=R.replace(/progid:DXImageTransform\.Microsoft\.Blur\(pixelradius\=[^\)]+\)/g,"");if(e!="none"){i.filter=R+" progid:DXImageTransform.Microsoft.Blur(pixelradius="+(+e||1.5)+")";i.margin=f.format("-{0}px 0 0 -{0}px",Math.round(+e||1.5));}else{i.filter=R;i.margin=0;}};var D=function(i,ae,ad,e){var aa=V("group"),Z=aa.style,R=V("oval"),ac=R.style;Z.position="absolute";Z.left=0;Z.top=0;Z.width=i.width+"px";Z.height=i.height+"px";aa.coordsize=i.coordsize;aa.coordorigin=i.coordorigin;aa.appendChild(R);var ab=new m(R,aa,i);ab.type="circle";F(ab,{stroke:"#000",fill:"none"});ab.attrs.cx=ae;ab.attrs.cy=ad;ab.attrs.r=e;ab.setBox({x:ae-e,y:ad-e,width:e*2,height:e*2});i.canvas.appendChild(aa);return ab;};var I=function(i,ae,ad,af,aa,e){var ab=V("group"),Z=ab.style,R=V(e?"roundrect":"rect"),ag=(+e||0)/(Math.min(af,aa));R.arcsize=ag;Z.position="absolute";Z.left=0;Z.top=0;Z.width=i.width+"px";Z.height=i.height+"px";ab.coordsize=i.coordsize;ab.coordorigin=i.coordorigin;ab.appendChild(R);var ac=new m(R,ab,i);ac.type="rect";F(ac,{stroke:"#000"});ac.arcsize=ag;ac.setBox({x:ae,y:ad,width:af,height:aa,r:+e});i.canvas.appendChild(ab);return ac;};var h=function(e,af,ae,R,i){var ab=V("group"),aa=ab.style,Z=V("oval"),ad=Z.style;aa.position="absolute";aa.left=0;aa.top=0;aa.width=e.width+"px";aa.height=e.height+"px";ab.coordsize=e.coordsize;ab.coordorigin=e.coordorigin;ab.appendChild(Z);var ac=new m(Z,ab,e);ac.type="ellipse";F(ac,{stroke:"#000"});ac.attrs.cx=af;ac.attrs.cy=ae;ac.attrs.rx=R;ac.attrs.ry=i;ac.setBox({x:af-R,y:ae-i,width:R*2,height:i*2});e.canvas.appendChild(ab);return ac;};var p=function(i,e,af,ae,ag,aa){var ab=V("group"),Z=ab.style,R=V("image"),ad=R.style;Z.position="absolute";Z.left=0;Z.top=0;Z.width=i.width+"px";Z.height=i.height+"px";ab.coordsize=i.coordsize;ab.coordorigin=i.coordorigin;R.src=e;ab.appendChild(R);var ac=new m(R,ab,i);ac.type="image";ac.attrs.src=e;ac.attrs.x=af;ac.attrs.y=ae;ac.attrs.w=ag;ac.attrs.h=aa;ac.setBox({x:af,y:ae,width:ag,height:aa});i.canvas.appendChild(ab);return ac;};var H=function(i,af,ae,ag){var ab=V("group"),aa=ab.style,Z=V("shape"),ad=Z.style,ah=V("path"),e=ah.style,R=V("textpath");aa.position="absolute";aa.left=0;aa.top=0;aa.width=i.width+"px";aa.height=i.height+"px";ab.coordsize=i.coordsize;ab.coordorigin=i.coordorigin;ah.v=["m",Math.round(af),", ",Math.round(ae),"l",Math.round(af)+1,", ",Math.round(ae)].join("");ah.textpathok=true;ad.width=i.width;ad.height=i.height;aa.position="absolute";aa.left=0;aa.top=0;aa.width=i.width;aa.height=i.height;R.string=ag;R.on=true;Z.appendChild(R);Z.appendChild(ah);ab.appendChild(Z);var ac=new m(R,ab,i);ac.shape=Z;ac.textpath=ah;ac.type="text";ac.attrs.text=ag;ac.attrs.x=af;ac.attrs.y=ae;ac.attrs.w=1;ac.attrs.h=1;F(ac,{font:q.font,stroke:"none",fill:"#000"});ac.setBox();i.canvas.appendChild(ab);return ac;};var E=function(R,e){var i=this.canvas.style;this.width=parseFloat(R||this.width);this.height=parseFloat(e||this.height);i.width=this.width+"px";i.height=this.height+"px";i.clip="rect(0 "+this.width+"px "+this.height+"px 0)";this.coordsize=this.width+" "+this.height;return this;};g.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)");try{!g.namespaces.rvml&&g.namespaces.add("rvml","urn:schemas-microsoft-com:vml");var V=function(e){return g.createElement("<rvml:"+e+' class="rvml">');};}catch(U){var V=function(e){return g.createElement("<"+e+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');};}var l=function(){var Z=G.apply(null,arguments),i=Z.container,ae=Z.height,af,R=Z.width,ad=Z.x,ac=Z.y;if(!i){throw new Error("VML container not found.");}var ab=b.canvas=g.createElement("div"),aa=ab.style;R=parseFloat(R)||"512px";ae=parseFloat(ae)||"342px";b.width=R;b.height=ae;b.coordsize=R+" "+ae;b.coordorigin="0 0";b.span=g.createElement("span");af=b.span.style;ab.appendChild(b.span);af.position="absolute";af.left="-99999px";af.top="-99999px";af.padding=0;af.margin=0;af.lineHeight=1;af.display="inline";aa.width=R+"px";aa.height=ae+"px";aa.position="absolute";aa.clip="rect(0 "+R+"px "+ae+"px 0)";if(i==1){g.body.appendChild(ab);aa.left=ad+"px";aa.top=ac+"px";i={style:{width:R,height:ae}};}else{i.style.width=R;i.style.height=ae;if(i.firstChild){i.insertBefore(ab,i.firstChild);}else{i.appendChild(ab);}}for(var e in b){if(b.hasOwnProperty(e)){i[e]=b[e];}}a.call(i,i,f.fn);i.clear=function(){while(ab.firstChild){ab.removeChild(ab.firstChild);}};i.raphael=f;return i;};b.remove=function(){this.canvas.parentNode.removeChild(this.canvas);};b.safari=function(){};}var j=(function(){if(g.addEventListener){return function(aa,R,i,e){var Z=function(ab){return i.call(e,ab);};aa.addEventListener(R,Z,false);return function(){aa.removeEventListener(R,Z,false);return true;};};}else{if(g.attachEvent){return function(ab,Z,R,i){var aa=function(ac){return R.call(i,ac||L.event);};ab.attachEvent("on"+Z,aa);var e=function(){ab.detachEvent("on"+Z,aa);return true;};if(Z=="mouseover"){ab.attachEvent("onmouseenter",aa);return function(){ab.detachEvent("onmouseenter",aa);return e();};}else{if(Z=="mouseout"){ab.attachEvent("onmouseleave",aa);return function(){ab.detachEvent("onmouseleave",aa);return e();};}}return e;};}}})();for(var Q=v.length;Q--;){(function(e){m.prototype[e]=function(i){if(f.is(i,"function")){this.events=this.events||{};this.events[e]=this.events[e]||{};this.events[e][i]=this.events[e][i]||[];this.events[e][i].push(j(this.shape||this.node,e,i,this));}return this;};m.prototype["un"+e]=function(i){this.events&&this.events[e]&&this.events[e][i]&&this.events[e][i].length&&this.events[e][i].shift()()&&!this.events[e][i].length&&delete this.events[e][i];};})(v[Q]);}b.circle=function(e,R,i){return D(this,e,R,i);};b.rect=function(e,aa,i,R,Z){return I(this,e,aa,i,R,Z);};b.ellipse=function(e,Z,R,i){return h(this,e,Z,R,i);};b.path=function(e){e&&!f.is(e,"string")&&!f.is(e[0],"array")&&(e+="");return W(f.format.apply(f,arguments),this);};b.image=function(Z,e,aa,i,R){return p(this,Z,e,aa,i,R);};b.text=function(e,R,i){return H(this,e,R,i);};b.set=function(e){arguments.length>1&&(e=Array.prototype.splice.call(arguments,0,arguments.length));return new k(e);};b.setSize=E;m.prototype.stop=function(){clearTimeout(this.animation_in_progress);return this;};m.prototype.scale=function(aj,ai,Z,R){if(aj==null&&ai==null){return{x:this._.sx,y:this._.sy,toString:function(){return this.x+" "+this.y;}};}ai=ai||aj;!+ai&&(ai=aj);var an,al,am,ak,aA=this.attrs;if(aj!=0){var ah=this.getBBox(),ae=ah.x+ah.width/2,ab=ah.y+ah.height/2,az=aj/this._.sx,ay=ai/this._.sy;Z=(+Z||Z==0)?Z:ae;R=(+R||R==0)?R:ab;var ag=Math.round(aj/Math.abs(aj)),ad=Math.round(ai/Math.abs(ai)),aq=this.node.style,aC=Z+(ae-Z)*ag*az,aB=R+(ab-R)*ad*ay;switch(this.type){case"rect":case"image":var af=aA.width*ag*az,ap=aA.height*ad*ay,ac=aC-af/2,aa=aB-ap/2;this.attr({width:af,height:ap,x:ac,y:aa});break;case"circle":case"ellipse":this.attr({rx:aA.rx*az,ry:aA.ry*ay,r:aA.r*az,cx:aC,cy:aB});break;case"path":var at=c(aA.path),au=true;for(var aw=0,ao=at.length;aw<ao;aw++){var ar=at[aw];if(ar[0].toUpperCase()=="M"&&au){continue;}else{au=false;}if(f.svg&&ar[0].toUpperCase()=="A"){ar[at[aw].length-2]*=az;ar[at[aw].length-1]*=ay;ar[1]*=az;ar[2]*=ay;ar[5]=+(ag+ad?!!+ar[5]:!+ar[5]);}else{for(var av=1,ax=ar.length;av<ax;av++){ar[av]*=(av%2)?az:ay;}}}var e=C(at),an=aC-e.x-e.width/2,al=aB-e.y-e.height/2;at=c(at);at[0][1]+=an;at[0][2]+=al;this.attr({path:at.join(" ")});break;}if(this.type in {text:1,image:1}&&(ag!=1||ad!=1)){if(this.transformations){this.transformations[2]="scale(".concat(ag,",",ad,")");this.node.setAttribute("transform",this.transformations.join(" "));an=(ag==-1)?-aA.x-(af||0):aA.x;al=(ad==-1)?-aA.y-(ap||0):aA.y;this.attr({x:an,y:al});aA.fx=ag-1;aA.fy=ad-1;}else{this.node.filterMatrix=" progid:DXImageTransform.Microsoft.Matrix(M11=".concat(ag,", M12=0, M21=0, M22=",ad,", Dx=0, Dy=0, sizingmethod='auto expand', filtertype='bilinear')");aq.filter=(this.node.filterMatrix||"")+(this.node.filterOpacity||"");}}else{if(this.transformations){this.transformations[2]="";this.node.setAttribute("transform",this.transformations.join(" "));aA.fx=0;aA.fy=0;}else{this.node.filterMatrix="";aq.filter=(this.node.filterMatrix||"")+(this.node.filterOpacity||"");}}aA.scale=[aj,ai,Z,R].join(" ");this._.sx=aj;this._.sy=ai;}return this;};f.easing_formulas={linear:function(e){return e;},"<":function(e){return Math.pow(e,3);},">":function(e){return Math.pow(e-1,3)+1;},"<>":function(e){e=e*2;if(e<1){return Math.pow(e,3)/2;}e-=2;return(Math.pow(e,3)+2)/2;},backIn:function(i){var e=1.70158;return i*i*((e+1)*i-e);},backOut:function(i){i=i-1;var e=1.70158;return i*i*((e+1)*i+e)+1;},elastic:function(R){if(R==0||R==1){return R;}var i=0.3,e=i/4;return Math.pow(2,-10*R)*Math.sin((R-e)*(2*Math.PI)/i)+1;},bounce:function(Z){var i=7.5625,R=2.75,e;if(Z<(1/R)){e=i*Z*Z;}else{if(Z<(2/R)){Z-=(1.5/R);e=i*Z*Z+0.75;}else{if(Z<(2.5/R)){Z-=(2.25/R);e=i*Z*Z+0.9375;}else{Z-=(2.625/R);e=i*Z*Z+0.984375;}}}return e;}};m.prototype.animate=function(at,aj,ai,aa){clearTimeout(this.animation_in_progress);if(f.is(ai,"function")||!ai){aa=ai||null;}var am={},R={},ag={},af={x:0,y:0};for(var ak in at){if(at.hasOwnProperty(ak)){if(ak in u){am[ak]=this.attr(ak);(am[ak]==null)&&(am[ak]=q[ak]);R[ak]=at[ak];switch(u[ak]){case"number":ag[ak]=(R[ak]-am[ak])/aj;break;case"colour":am[ak]=f.getRGB(am[ak]);var al=f.getRGB(R[ak]);ag[ak]={r:(al.r-am[ak].r)/aj,g:(al.g-am[ak].g)/aj,b:(al.b-am[ak].b)/aj};break;case"path":var ab=O(am[ak],R[ak]);am[ak]=ab[0];R[ak]=ab[1];ag[ak]=[];for(var ao=0,ae=am[ak].length;ao<ae;ao++){ag[ak][ao]=[0];for(var an=1,aq=am[ak][ao].length;an<aq;an++){ag[ak][ao][an]=(R[ak][ao][an]-am[ak][ao][an])/aj;}}break;case"csv":var e=(at[ak]+"").split(Y),ad=(am[ak]+"").split(Y);switch(ak){case"translation":am[ak]=[0,0];ag[ak]=[e[0]/aj,e[1]/aj];break;case"rotation":am[ak]=(ad[1]==e[1]&&ad[2]==e[2])?ad:[0,e[1],e[2]];ag[ak]=[(e[0]-am[ak][0])/aj,0,0];break;case"scale":at[ak]=e;am[ak]=(am[ak]+"").split(Y);ag[ak]=[(e[0]-am[ak][0])/aj,(e[1]-am[ak][1])/aj,0,0];break;case"clip-rect":am[ak]=(am[ak]+"").split(Y);ag[ak]=[];var ao=4;while(ao--){ag[ak][ao]=(e[ao]-am[ak][ao])/aj;}break;}R[ak]=e;}}}}var Z=+new Date,ah=0,ar=function(i){return +i>255?255:+i;},ac=this;(function ap(){var av=new Date-Z,aD={},au;if(av<aj){var aB=f.easing_formulas[ai]?f.easing_formulas[ai](av/aj):av/aj;for(var az in am){if(am.hasOwnProperty(az)){switch(u[az]){case"number":au=+am[az]+aB*aj*ag[az];break;case"colour":au="rgb("+[ar(Math.round(am[az].r+aB*aj*ag[az].r)),ar(Math.round(am[az].g+aB*aj*ag[az].g)),ar(Math.round(am[az].b+aB*aj*ag[az].b))].join(",")+")";break;case"path":au=[];for(var ax=0,aE=am[az].length;ax<aE;ax++){au[ax]=[am[az][ax][0]];for(var aw=1,ay=am[az][ax].length;aw<ay;aw++){au[ax][aw]=+am[az][ax][aw]+aB*aj*ag[az][ax][aw];}au[ax]=au[ax].join(" ");}au=au.join(" ");break;case"csv":switch(az){case"translation":var aC=ag[az][0]*(av-ah),aA=ag[az][1]*(av-ah);af.x+=aC;af.y+=aA;au=[aC,aA].join(" ");break;case"rotation":au=+am[az][0]+aB*aj*ag[az][0];am[az][1]&&(au+=","+am[az][1]+","+am[az][2]);break;case"scale":au=[+am[az][0]+aB*aj*ag[az][0],+am[az][1]+aB*aj*ag[az][1],(2 in at[az]?at[az][2]:""),(3 in at[az]?at[az][3]:"")].join(" ");break;case"clip-rect":au=[];var ax=4;while(ax--){au[ax]=+am[az][ax]+aB*aj*ag[az][ax];}break;}break;}aD[az]=au;}}ac.attr(aD);ac.animation_in_progress=setTimeout(ap);f.svg&&b.safari();}else{(af.x||af.y)&&ac.translate(-af.x,-af.y);ac.attr(at);clearTimeout(ac.animation_in_progress);f.svg&&b.safari();(f.is(aa,"function"))&&aa.call(ac);}ah=av;})();return this;};m.prototype.translate=function(e,R){if(e==null){return{x:this._.tx,y:this._.ty};}this._.tx+=+e;this._.ty+=+R;switch(this.type){case"circle":case"ellipse":this.attr({cx:+e+this.attrs.cx,cy:+R+this.attrs.cy});break;case"rect":case"image":case"text":this.attr({x:+e+this.attrs.x,y:+R+this.attrs.y});break;case"path":var i=c(this.attrs.path);i[0][1]+=+e;i[0][2]+=+R;this.attr({path:i});break;}return this;};var k=function(e){this.items=[];this.length=0;if(e){for(var R=0,Z=e.length;R<Z;R++){if(e[R]&&(e[R].constructor==m||e[R].constructor==k)){this[this.items.length]=this.items[this.items.length]=e[R];this.length++;}}}};k.prototype.push=function(){var aa,e;for(var R=0,Z=arguments.length;R<Z;R++){aa=arguments[R];if(aa&&(aa.constructor==m||aa.constructor==k)){e=this.items.length;this[e]=this.items[e]=aa;this.length++;}}return this;};k.prototype.pop=function(){delete this[this.length--];return this.items.pop();};for(var S in m.prototype){if(m.prototype.hasOwnProperty(S)){k.prototype[S]=(function(e){return function(){for(var R=0,Z=this.items.length;R<Z;R++){this.items[R][e].apply(this.items[R],arguments);}return this;};})(S);}}k.prototype.attr=function(R,ac){if(R&&f.is(R,"array")&&f.is(R[0],"object")){for(var e=0,ab=R.length;e<ab;e++){this.items[e].attr(R[e]);}}else{for(var Z=0,aa=this.items.length;Z<aa;Z++){this.items[Z].attr.apply(this.items[Z],arguments);}}return this;};k.prototype.getBBox=function(){var e=[],ac=[],R=[],aa=[];for(var Z=this.items.length;Z--;){var ab=this.items[Z].getBBox();e.push(ab.x);ac.push(ab.y);R.push(ab.x+ab.width);aa.push(ab.y+ab.height);}e=Math.min.apply(Math,e);ac=Math.min.apply(Math,ac);return{x:e,y:ac,width:Math.max.apply(Math,R)-e,height:Math.max.apply(Math,aa)-ac};};f.registerFont=function(i){if(!i.face){return i;}this.fonts=this.fonts||{};var Z={w:i.w,face:{},glyphs:{}},R=i.face["font-family"];for(var ac in i.face){if(i.face.hasOwnProperty(ac)){Z.face[ac]=i.face[ac];}}if(this.fonts[R]){this.fonts[R].push(Z);}else{this.fonts[R]=[Z];}if(!i.svg){Z.face["units-per-em"]=parseInt(i.face["units-per-em"],10);for(var aa in i.glyphs){if(i.glyphs.hasOwnProperty(aa)){var ab=i.glyphs[aa];Z.glyphs[aa]={w:ab.w,k:{},d:ab.d&&"M"+ab.d.replace(/[mlcxtrv]/g,function(ad){return{l:"L",c:"C",x:"z",t:"m",r:"l",v:"c"}[ad]||"M";})+"z"};if(ab.k){for(var e in ab.k){if(ab.khasOwnProperty(e)){Z.glyphs[aa].k[e]=ab.k[e];}}}}}}return i;};b.getFont=function(ae,af,R,aa){aa=aa||"normal";R=R||"normal";af=+af||{normal:400,bold:700,lighter:300,bolder:800}[af]||400;var ab=f.fonts[ae];if(!ab){var Z=new RegExp("(^|\\s)"+ae.replace(/[^\w\d\s+!~.:_-]/g,"")+"(\\s|$)","i");for(var e in f.fonts){if(f.fonts.hasOwnProperty(e)){if(Z.test(e)){ab=f.fonts[e];break;}}}}var ac;if(ab){for(var ad=0,ag=ab.length;ad<ag;ad++){ac=ab[ad];if(ac.face["font-weight"]==af&&(ac.face["font-style"]==R||!ac.face["font-style"])&&ac.face["font-stretch"]==aa){break;}}}return ac;};b.print=function(ag,af,ad,R,ak){var ab=this.set(),ae=(ad+"").split(""),e=0,aj="",aa;f.is(R,"string")&&(R=this.getFont(R));if(R){aa=(ak||16)/R.face["units-per-em"];for(var ac=0,ah=ae.length;ac<ah;ac++){var Z=ac&&R.glyphs[ae[ac-1]]||{},ai=R.glyphs[ae[ac]];e+=ac?(Z.w||R.w)+(Z.k&&Z.k[ae[ac]]||0):0;ai&&ai.d&&ab.push(this.path(ai.d).attr({fill:"#000",stroke:"none",translation:[e,0]}));}ab.scale(aa,aa,0,af).translate(ag,(ak||16)/2);}return ab;};f.format=function(i){var e=f.is(arguments[1],"array")?[0].concat(arguments[1]):arguments;i&&f.is(i,"string")&&e.length-1&&(i=i.replace(/\{(\d+)\}/g,function(Z,R){return e[++R]==null?"":e[R];}));return i;};f.ninja=function(){var R=window.Raphael,i;if(P.was){window.Raphael=P.is;}else{try{delete window.Raphael;}catch(Z){window.Raphael=i;}}return R;};f.el=m.prototype;return f;})();
\ No newline at end of file
diff --git a/js/updateDoc.sh b/js/updateDoc.sh
index 6a1f15f..6a1f15f 100644..100755
--- a/js/updateDoc.sh
+++ b/js/updateDoc.sh
diff --git a/utils/jsdoc-toolkit/README.txt b/utils/jsdoc-toolkit/README.txt
index 44575d3..44575d3 100644..100755
--- a/utils/jsdoc-toolkit/README.txt
+++ b/utils/jsdoc-toolkit/README.txt
diff --git a/utils/jsdoc-toolkit/app/frame.js b/utils/jsdoc-toolkit/app/frame.js
index 1beb405..1beb405 100644..100755
--- a/utils/jsdoc-toolkit/app/frame.js
+++ b/utils/jsdoc-toolkit/app/frame.js
diff --git a/utils/jsdoc-toolkit/app/frame/Chain.js b/utils/jsdoc-toolkit/app/frame/Chain.js
index 506469d..506469d 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/Chain.js
+++ b/utils/jsdoc-toolkit/app/frame/Chain.js
diff --git a/utils/jsdoc-toolkit/app/frame/Dumper.js b/utils/jsdoc-toolkit/app/frame/Dumper.js
index d8b007b..d8b007b 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/Dumper.js
+++ b/utils/jsdoc-toolkit/app/frame/Dumper.js
diff --git a/utils/jsdoc-toolkit/app/frame/Hash.js b/utils/jsdoc-toolkit/app/frame/Hash.js
index 62cfad6..62cfad6 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/Hash.js
+++ b/utils/jsdoc-toolkit/app/frame/Hash.js
diff --git a/utils/jsdoc-toolkit/app/frame/Link.js b/utils/jsdoc-toolkit/app/frame/Link.js
index ef5dc0a..ef5dc0a 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/Link.js
+++ b/utils/jsdoc-toolkit/app/frame/Link.js
diff --git a/utils/jsdoc-toolkit/app/frame/Namespace.js b/utils/jsdoc-toolkit/app/frame/Namespace.js
index fa1e41d..fa1e41d 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/Namespace.js
+++ b/utils/jsdoc-toolkit/app/frame/Namespace.js
diff --git a/utils/jsdoc-toolkit/app/frame/Opt.js b/utils/jsdoc-toolkit/app/frame/Opt.js
index 352f159..352f159 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/Opt.js
+++ b/utils/jsdoc-toolkit/app/frame/Opt.js
diff --git a/utils/jsdoc-toolkit/app/frame/Reflection.js b/utils/jsdoc-toolkit/app/frame/Reflection.js
index 0968f1c..0968f1c 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/Reflection.js
+++ b/utils/jsdoc-toolkit/app/frame/Reflection.js
diff --git a/utils/jsdoc-toolkit/app/frame/String.js b/utils/jsdoc-toolkit/app/frame/String.js
index c183c27..c183c27 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/String.js
+++ b/utils/jsdoc-toolkit/app/frame/String.js
diff --git a/utils/jsdoc-toolkit/app/frame/Testrun.js b/utils/jsdoc-toolkit/app/frame/Testrun.js
index db7ecc8..db7ecc8 100644..100755
--- a/utils/jsdoc-toolkit/app/frame/Testrun.js
+++ b/utils/jsdoc-toolkit/app/frame/Testrun.js
diff --git a/utils/jsdoc-toolkit/app/handlers/FOODOC.js b/utils/jsdoc-toolkit/app/handlers/FOODOC.js
index b208f55..b208f55 100644..100755
--- a/utils/jsdoc-toolkit/app/handlers/FOODOC.js
+++ b/utils/jsdoc-toolkit/app/handlers/FOODOC.js
diff --git a/utils/jsdoc-toolkit/app/handlers/XMLDOC.js b/utils/jsdoc-toolkit/app/handlers/XMLDOC.js
index 40f87b3..40f87b3 100644..100755
--- a/utils/jsdoc-toolkit/app/handlers/XMLDOC.js
+++ b/utils/jsdoc-toolkit/app/handlers/XMLDOC.js
diff --git a/utils/jsdoc-toolkit/app/handlers/XMLDOC/DomReader.js b/utils/jsdoc-toolkit/app/handlers/XMLDOC/DomReader.js
index 240563d..240563d 100644..100755
--- a/utils/jsdoc-toolkit/app/handlers/XMLDOC/DomReader.js
+++ b/utils/jsdoc-toolkit/app/handlers/XMLDOC/DomReader.js
diff --git a/utils/jsdoc-toolkit/app/handlers/XMLDOC/XMLDoc.js b/utils/jsdoc-toolkit/app/handlers/XMLDOC/XMLDoc.js
index e9b3e3c..e9b3e3c 100644..100755
--- a/utils/jsdoc-toolkit/app/handlers/XMLDOC/XMLDoc.js
+++ b/utils/jsdoc-toolkit/app/handlers/XMLDOC/XMLDoc.js
diff --git a/utils/jsdoc-toolkit/app/handlers/XMLDOC/XMLParse.js b/utils/jsdoc-toolkit/app/handlers/XMLDOC/XMLParse.js
index 78e8f45..78e8f45 100644..100755
--- a/utils/jsdoc-toolkit/app/handlers/XMLDOC/XMLParse.js
+++ b/utils/jsdoc-toolkit/app/handlers/XMLDOC/XMLParse.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC.js b/utils/jsdoc-toolkit/app/lib/JSDOC.js
index 2dbc0a3..2dbc0a3 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/DocComment.js b/utils/jsdoc-toolkit/app/lib/JSDOC/DocComment.js
index c6c8d7d..c6c8d7d 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/DocComment.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/DocComment.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/DocTag.js b/utils/jsdoc-toolkit/app/lib/JSDOC/DocTag.js
index 77ec07c..77ec07c 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/DocTag.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/DocTag.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/JsDoc.js b/utils/jsdoc-toolkit/app/lib/JSDOC/JsDoc.js
index 2c4bfb8..2c4bfb8 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/JsDoc.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/JsDoc.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/JsPlate.js b/utils/jsdoc-toolkit/app/lib/JSDOC/JsPlate.js
index 79ac61f..79ac61f 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/JsPlate.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/JsPlate.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/Lang.js b/utils/jsdoc-toolkit/app/lib/JSDOC/Lang.js
index 62919d7..62919d7 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/Lang.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/Lang.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/Parser.js b/utils/jsdoc-toolkit/app/lib/JSDOC/Parser.js
index f407dd1..f407dd1 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/Parser.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/Parser.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js b/utils/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js
index 9c91193..9c91193 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/Symbol.js b/utils/jsdoc-toolkit/app/lib/JSDOC/Symbol.js
index c5b76a8..c5b76a8 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/Symbol.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/Symbol.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/SymbolSet.js b/utils/jsdoc-toolkit/app/lib/JSDOC/SymbolSet.js
index 82657e4..82657e4 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/SymbolSet.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/SymbolSet.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/TextStream.js b/utils/jsdoc-toolkit/app/lib/JSDOC/TextStream.js
index ccc48a8..ccc48a8 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/TextStream.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/TextStream.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/Token.js b/utils/jsdoc-toolkit/app/lib/JSDOC/Token.js
index fb7f9d9..fb7f9d9 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/Token.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/Token.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/TokenReader.js b/utils/jsdoc-toolkit/app/lib/JSDOC/TokenReader.js
index 9f658fb..9f658fb 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/TokenReader.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/TokenReader.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/TokenStream.js b/utils/jsdoc-toolkit/app/lib/JSDOC/TokenStream.js
index 1eeb44c..1eeb44c 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/TokenStream.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/TokenStream.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/Util.js b/utils/jsdoc-toolkit/app/lib/JSDOC/Util.js
index 6d7edb3..6d7edb3 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/Util.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/Util.js
diff --git a/utils/jsdoc-toolkit/app/lib/JSDOC/Walker.js b/utils/jsdoc-toolkit/app/lib/JSDOC/Walker.js
index befec4d..befec4d 100644..100755
--- a/utils/jsdoc-toolkit/app/lib/JSDOC/Walker.js
+++ b/utils/jsdoc-toolkit/app/lib/JSDOC/Walker.js
diff --git a/utils/jsdoc-toolkit/app/main.js b/utils/jsdoc-toolkit/app/main.js
index 9b78182..9b78182 100644..100755
--- a/utils/jsdoc-toolkit/app/main.js
+++ b/utils/jsdoc-toolkit/app/main.js
diff --git a/utils/jsdoc-toolkit/app/plugins/commentSrcJson.js b/utils/jsdoc-toolkit/app/plugins/commentSrcJson.js
index e826b57..e826b57 100644..100755
--- a/utils/jsdoc-toolkit/app/plugins/commentSrcJson.js
+++ b/utils/jsdoc-toolkit/app/plugins/commentSrcJson.js
diff --git a/utils/jsdoc-toolkit/app/plugins/frameworkPrototype.js b/utils/jsdoc-toolkit/app/plugins/frameworkPrototype.js
index 9c41751..9c41751 100644..100755
--- a/utils/jsdoc-toolkit/app/plugins/frameworkPrototype.js
+++ b/utils/jsdoc-toolkit/app/plugins/frameworkPrototype.js
diff --git a/utils/jsdoc-toolkit/app/plugins/functionCall.js b/utils/jsdoc-toolkit/app/plugins/functionCall.js
index 6f87705..6f87705 100644..100755
--- a/utils/jsdoc-toolkit/app/plugins/functionCall.js
+++ b/utils/jsdoc-toolkit/app/plugins/functionCall.js
diff --git a/utils/jsdoc-toolkit/app/plugins/publishSrcHilite.js b/utils/jsdoc-toolkit/app/plugins/publishSrcHilite.js
index 65514f2..65514f2 100644..100755
--- a/utils/jsdoc-toolkit/app/plugins/publishSrcHilite.js
+++ b/utils/jsdoc-toolkit/app/plugins/publishSrcHilite.js
diff --git a/utils/jsdoc-toolkit/app/plugins/symbolLink.js b/utils/jsdoc-toolkit/app/plugins/symbolLink.js
index c87f1ca..c87f1ca 100644..100755
--- a/utils/jsdoc-toolkit/app/plugins/symbolLink.js
+++ b/utils/jsdoc-toolkit/app/plugins/symbolLink.js
diff --git a/utils/jsdoc-toolkit/app/plugins/tagParamConfig.js b/utils/jsdoc-toolkit/app/plugins/tagParamConfig.js
index 3ea8a1b..3ea8a1b 100644..100755
--- a/utils/jsdoc-toolkit/app/plugins/tagParamConfig.js
+++ b/utils/jsdoc-toolkit/app/plugins/tagParamConfig.js
diff --git a/utils/jsdoc-toolkit/app/plugins/tagSynonyms.js b/utils/jsdoc-toolkit/app/plugins/tagSynonyms.js
index 49a874f..49a874f 100644..100755
--- a/utils/jsdoc-toolkit/app/plugins/tagSynonyms.js
+++ b/utils/jsdoc-toolkit/app/plugins/tagSynonyms.js
diff --git a/utils/jsdoc-toolkit/app/run.js b/utils/jsdoc-toolkit/app/run.js
index 1f875cd..1f875cd 100644..100755
--- a/utils/jsdoc-toolkit/app/run.js
+++ b/utils/jsdoc-toolkit/app/run.js
diff --git a/utils/jsdoc-toolkit/app/t/TestDoc.js b/utils/jsdoc-toolkit/app/t/TestDoc.js
index c0768b7..c0768b7 100644..100755
--- a/utils/jsdoc-toolkit/app/t/TestDoc.js
+++ b/utils/jsdoc-toolkit/app/t/TestDoc.js
diff --git a/utils/jsdoc-toolkit/app/t/runner.js b/utils/jsdoc-toolkit/app/t/runner.js
index 3f9fb4c..3f9fb4c 100644..100755
--- a/utils/jsdoc-toolkit/app/t/runner.js
+++ b/utils/jsdoc-toolkit/app/t/runner.js
diff --git a/utils/jsdoc-toolkit/app/test.js b/utils/jsdoc-toolkit/app/test.js
index 787d84f..787d84f 100644..100755
--- a/utils/jsdoc-toolkit/app/test.js
+++ b/utils/jsdoc-toolkit/app/test.js
diff --git a/utils/jsdoc-toolkit/app/test/addon.js b/utils/jsdoc-toolkit/app/test/addon.js
index 8886205..8886205 100644..100755
--- a/utils/jsdoc-toolkit/app/test/addon.js
+++ b/utils/jsdoc-toolkit/app/test/addon.js
diff --git a/utils/jsdoc-toolkit/app/test/anon_inner.js b/utils/jsdoc-toolkit/app/test/anon_inner.js
index 227eeee..227eeee 100644..100755
--- a/utils/jsdoc-toolkit/app/test/anon_inner.js
+++ b/utils/jsdoc-toolkit/app/test/anon_inner.js
diff --git a/utils/jsdoc-toolkit/app/test/augments.js b/utils/jsdoc-toolkit/app/test/augments.js
index 12e706e..12e706e 100644..100755
--- a/utils/jsdoc-toolkit/app/test/augments.js
+++ b/utils/jsdoc-toolkit/app/test/augments.js
diff --git a/utils/jsdoc-toolkit/app/test/augments2.js b/utils/jsdoc-toolkit/app/test/augments2.js
index e8388f0..e8388f0 100644..100755
--- a/utils/jsdoc-toolkit/app/test/augments2.js
+++ b/utils/jsdoc-toolkit/app/test/augments2.js
diff --git a/utils/jsdoc-toolkit/app/test/borrows.js b/utils/jsdoc-toolkit/app/test/borrows.js
index a5d8ea4..a5d8ea4 100644..100755
--- a/utils/jsdoc-toolkit/app/test/borrows.js
+++ b/utils/jsdoc-toolkit/app/test/borrows.js
diff --git a/utils/jsdoc-toolkit/app/test/borrows2.js b/utils/jsdoc-toolkit/app/test/borrows2.js
index c0d5ea2..c0d5ea2 100644..100755
--- a/utils/jsdoc-toolkit/app/test/borrows2.js
+++ b/utils/jsdoc-toolkit/app/test/borrows2.js
diff --git a/utils/jsdoc-toolkit/app/test/config.js b/utils/jsdoc-toolkit/app/test/config.js
index 0748a21..0748a21 100644..100755
--- a/utils/jsdoc-toolkit/app/test/config.js
+++ b/utils/jsdoc-toolkit/app/test/config.js
diff --git a/utils/jsdoc-toolkit/app/test/constructs.js b/utils/jsdoc-toolkit/app/test/constructs.js
index cca5dbd..cca5dbd 100644..100755
--- a/utils/jsdoc-toolkit/app/test/constructs.js
+++ b/utils/jsdoc-toolkit/app/test/constructs.js
diff --git a/utils/jsdoc-toolkit/app/test/encoding.js b/utils/jsdoc-toolkit/app/test/encoding.js
index ba64219..ba64219 100644..100755
--- a/utils/jsdoc-toolkit/app/test/encoding.js
+++ b/utils/jsdoc-toolkit/app/test/encoding.js
diff --git a/utils/jsdoc-toolkit/app/test/encoding_other.js b/utils/jsdoc-toolkit/app/test/encoding_other.js
index b144da4..b144da4 100644..100755
--- a/utils/jsdoc-toolkit/app/test/encoding_other.js
+++ b/utils/jsdoc-toolkit/app/test/encoding_other.js
diff --git a/utils/jsdoc-toolkit/app/test/event.js b/utils/jsdoc-toolkit/app/test/event.js
index 7e41d6f..7e41d6f 100644..100755
--- a/utils/jsdoc-toolkit/app/test/event.js
+++ b/utils/jsdoc-toolkit/app/test/event.js
diff --git a/utils/jsdoc-toolkit/app/test/exports.js b/utils/jsdoc-toolkit/app/test/exports.js
index 63a87cb..63a87cb 100644..100755
--- a/utils/jsdoc-toolkit/app/test/exports.js
+++ b/utils/jsdoc-toolkit/app/test/exports.js
diff --git a/utils/jsdoc-toolkit/app/test/functions_anon.js b/utils/jsdoc-toolkit/app/test/functions_anon.js
index e9dd6c1..e9dd6c1 100644..100755
--- a/utils/jsdoc-toolkit/app/test/functions_anon.js
+++ b/utils/jsdoc-toolkit/app/test/functions_anon.js
diff --git a/utils/jsdoc-toolkit/app/test/functions_nested.js b/utils/jsdoc-toolkit/app/test/functions_nested.js
index f044faf..f044faf 100644..100755
--- a/utils/jsdoc-toolkit/app/test/functions_nested.js
+++ b/utils/jsdoc-toolkit/app/test/functions_nested.js
diff --git a/utils/jsdoc-toolkit/app/test/global.js b/utils/jsdoc-toolkit/app/test/global.js
index 5ea4894..5ea4894 100644..100755
--- a/utils/jsdoc-toolkit/app/test/global.js
+++ b/utils/jsdoc-toolkit/app/test/global.js
diff --git a/utils/jsdoc-toolkit/app/test/globals.js b/utils/jsdoc-toolkit/app/test/globals.js
index 3f83fb1..3f83fb1 100644..100755
--- a/utils/jsdoc-toolkit/app/test/globals.js
+++ b/utils/jsdoc-toolkit/app/test/globals.js
diff --git a/utils/jsdoc-toolkit/app/test/ignore.js b/utils/jsdoc-toolkit/app/test/ignore.js
index d3fac9e..d3fac9e 100644..100755
--- a/utils/jsdoc-toolkit/app/test/ignore.js
+++ b/utils/jsdoc-toolkit/app/test/ignore.js
diff --git a/utils/jsdoc-toolkit/app/test/inner.js b/utils/jsdoc-toolkit/app/test/inner.js
index 37cfa9d..37cfa9d 100644..100755
--- a/utils/jsdoc-toolkit/app/test/inner.js
+++ b/utils/jsdoc-toolkit/app/test/inner.js
diff --git a/utils/jsdoc-toolkit/app/test/jsdoc_test.js b/utils/jsdoc-toolkit/app/test/jsdoc_test.js
index 0817712..0817712 100644..100755
--- a/utils/jsdoc-toolkit/app/test/jsdoc_test.js
+++ b/utils/jsdoc-toolkit/app/test/jsdoc_test.js
diff --git a/utils/jsdoc-toolkit/app/test/lend.js b/utils/jsdoc-toolkit/app/test/lend.js
index 92b15d5..92b15d5 100644..100755
--- a/utils/jsdoc-toolkit/app/test/lend.js
+++ b/utils/jsdoc-toolkit/app/test/lend.js
diff --git a/utils/jsdoc-toolkit/app/test/memberof.js b/utils/jsdoc-toolkit/app/test/memberof.js
index 883bbde..883bbde 100644..100755
--- a/utils/jsdoc-toolkit/app/test/memberof.js
+++ b/utils/jsdoc-toolkit/app/test/memberof.js
diff --git a/utils/jsdoc-toolkit/app/test/memberof_constructor.js b/utils/jsdoc-toolkit/app/test/memberof_constructor.js
index 80fde73..80fde73 100644..100755
--- a/utils/jsdoc-toolkit/app/test/memberof_constructor.js
+++ b/utils/jsdoc-toolkit/app/test/memberof_constructor.js
diff --git a/utils/jsdoc-toolkit/app/test/module.js b/utils/jsdoc-toolkit/app/test/module.js
index 5b3fe42..5b3fe42 100644..100755
--- a/utils/jsdoc-toolkit/app/test/module.js
+++ b/utils/jsdoc-toolkit/app/test/module.js
diff --git a/utils/jsdoc-toolkit/app/test/name.js b/utils/jsdoc-toolkit/app/test/name.js
index e88a51a..e88a51a 100644..100755
--- a/utils/jsdoc-toolkit/app/test/name.js
+++ b/utils/jsdoc-toolkit/app/test/name.js
diff --git a/utils/jsdoc-toolkit/app/test/namespace_nested.js b/utils/jsdoc-toolkit/app/test/namespace_nested.js
index 46cafa2..46cafa2 100644..100755
--- a/utils/jsdoc-toolkit/app/test/namespace_nested.js
+++ b/utils/jsdoc-toolkit/app/test/namespace_nested.js
diff --git a/utils/jsdoc-toolkit/app/test/nocode.js b/utils/jsdoc-toolkit/app/test/nocode.js
index 1cf99bc..1cf99bc 100644..100755
--- a/utils/jsdoc-toolkit/app/test/nocode.js
+++ b/utils/jsdoc-toolkit/app/test/nocode.js
diff --git a/utils/jsdoc-toolkit/app/test/oblit_anon.js b/utils/jsdoc-toolkit/app/test/oblit_anon.js
index 8d9e941..8d9e941 100644..100755
--- a/utils/jsdoc-toolkit/app/test/oblit_anon.js
+++ b/utils/jsdoc-toolkit/app/test/oblit_anon.js
diff --git a/utils/jsdoc-toolkit/app/test/overview.js b/utils/jsdoc-toolkit/app/test/overview.js
index 1dfc09b..1dfc09b 100644..100755
--- a/utils/jsdoc-toolkit/app/test/overview.js
+++ b/utils/jsdoc-toolkit/app/test/overview.js
diff --git a/utils/jsdoc-toolkit/app/test/param_inline.js b/utils/jsdoc-toolkit/app/test/param_inline.js
index 09845b2..09845b2 100644..100755
--- a/utils/jsdoc-toolkit/app/test/param_inline.js
+++ b/utils/jsdoc-toolkit/app/test/param_inline.js
diff --git a/utils/jsdoc-toolkit/app/test/params_optional.js b/utils/jsdoc-toolkit/app/test/params_optional.js
index 18bf598..18bf598 100644..100755
--- a/utils/jsdoc-toolkit/app/test/params_optional.js
+++ b/utils/jsdoc-toolkit/app/test/params_optional.js
diff --git a/utils/jsdoc-toolkit/app/test/prototype.js b/utils/jsdoc-toolkit/app/test/prototype.js
index 1147008..1147008 100644..100755
--- a/utils/jsdoc-toolkit/app/test/prototype.js
+++ b/utils/jsdoc-toolkit/app/test/prototype.js
diff --git a/utils/jsdoc-toolkit/app/test/prototype_nested.js b/utils/jsdoc-toolkit/app/test/prototype_nested.js
index e8ca1ce..e8ca1ce 100644..100755
--- a/utils/jsdoc-toolkit/app/test/prototype_nested.js
+++ b/utils/jsdoc-toolkit/app/test/prototype_nested.js
diff --git a/utils/jsdoc-toolkit/app/test/prototype_oblit.js b/utils/jsdoc-toolkit/app/test/prototype_oblit.js
index 6cfc39c..6cfc39c 100644..100755
--- a/utils/jsdoc-toolkit/app/test/prototype_oblit.js
+++ b/utils/jsdoc-toolkit/app/test/prototype_oblit.js
diff --git a/utils/jsdoc-toolkit/app/test/prototype_oblit_constructor.js b/utils/jsdoc-toolkit/app/test/prototype_oblit_constructor.js
index 9248248..9248248 100644..100755
--- a/utils/jsdoc-toolkit/app/test/prototype_oblit_constructor.js
+++ b/utils/jsdoc-toolkit/app/test/prototype_oblit_constructor.js
diff --git a/utils/jsdoc-toolkit/app/test/public.js b/utils/jsdoc-toolkit/app/test/public.js
index 35d34f6..35d34f6 100644..100755
--- a/utils/jsdoc-toolkit/app/test/public.js
+++ b/utils/jsdoc-toolkit/app/test/public.js
diff --git a/utils/jsdoc-toolkit/app/test/scripts/code.js b/utils/jsdoc-toolkit/app/test/scripts/code.js
index e9d7ed2..e9d7ed2 100644..100755
--- a/utils/jsdoc-toolkit/app/test/scripts/code.js
+++ b/utils/jsdoc-toolkit/app/test/scripts/code.js
diff --git a/utils/jsdoc-toolkit/app/test/scripts/notcode.txt b/utils/jsdoc-toolkit/app/test/scripts/notcode.txt
index fcd737e..fcd737e 100644..100755
--- a/utils/jsdoc-toolkit/app/test/scripts/notcode.txt
+++ b/utils/jsdoc-toolkit/app/test/scripts/notcode.txt
diff --git a/utils/jsdoc-toolkit/app/test/shared.js b/utils/jsdoc-toolkit/app/test/shared.js
index e1c277a..e1c277a 100644..100755
--- a/utils/jsdoc-toolkit/app/test/shared.js
+++ b/utils/jsdoc-toolkit/app/test/shared.js
diff --git a/utils/jsdoc-toolkit/app/test/shared2.js b/utils/jsdoc-toolkit/app/test/shared2.js
index 3f7736a..3f7736a 100644..100755
--- a/utils/jsdoc-toolkit/app/test/shared2.js
+++ b/utils/jsdoc-toolkit/app/test/shared2.js
diff --git a/utils/jsdoc-toolkit/app/test/shortcuts.js b/utils/jsdoc-toolkit/app/test/shortcuts.js
index f738f1e..f738f1e 100644..100755
--- a/utils/jsdoc-toolkit/app/test/shortcuts.js
+++ b/utils/jsdoc-toolkit/app/test/shortcuts.js
diff --git a/utils/jsdoc-toolkit/app/test/static_this.js b/utils/jsdoc-toolkit/app/test/static_this.js
index 9407b20..9407b20 100644..100755
--- a/utils/jsdoc-toolkit/app/test/static_this.js
+++ b/utils/jsdoc-toolkit/app/test/static_this.js
diff --git a/utils/jsdoc-toolkit/app/test/synonyms.js b/utils/jsdoc-toolkit/app/test/synonyms.js
index 09066b9..09066b9 100644..100755
--- a/utils/jsdoc-toolkit/app/test/synonyms.js
+++ b/utils/jsdoc-toolkit/app/test/synonyms.js
diff --git a/utils/jsdoc-toolkit/app/test/tosource.js b/utils/jsdoc-toolkit/app/test/tosource.js
index 706d476..706d476 100644..100755
--- a/utils/jsdoc-toolkit/app/test/tosource.js
+++ b/utils/jsdoc-toolkit/app/test/tosource.js
diff --git a/utils/jsdoc-toolkit/app/test/variable_redefine.js b/utils/jsdoc-toolkit/app/test/variable_redefine.js
index 2c07da0..2c07da0 100644..100755
--- a/utils/jsdoc-toolkit/app/test/variable_redefine.js
+++ b/utils/jsdoc-toolkit/app/test/variable_redefine.js
diff --git a/utils/jsdoc-toolkit/changes.txt b/utils/jsdoc-toolkit/changes.txt
index 35ee299..35ee299 100644..100755
--- a/utils/jsdoc-toolkit/changes.txt
+++ b/utils/jsdoc-toolkit/changes.txt
diff --git a/utils/jsdoc-toolkit/conf/sample.conf b/utils/jsdoc-toolkit/conf/sample.conf
index ad0f08e..ad0f08e 100644..100755
--- a/utils/jsdoc-toolkit/conf/sample.conf
+++ b/utils/jsdoc-toolkit/conf/sample.conf
diff --git a/utils/jsdoc-toolkit/java/build.xml b/utils/jsdoc-toolkit/java/build.xml
index bb845ce..bb845ce 100644..100755
--- a/utils/jsdoc-toolkit/java/build.xml
+++ b/utils/jsdoc-toolkit/java/build.xml
diff --git a/utils/jsdoc-toolkit/java/build_1.4.xml b/utils/jsdoc-toolkit/java/build_1.4.xml
index ab408a4..ab408a4 100644..100755
--- a/utils/jsdoc-toolkit/java/build_1.4.xml
+++ b/utils/jsdoc-toolkit/java/build_1.4.xml
diff --git a/utils/jsdoc-toolkit/java/classes/js.jar b/utils/jsdoc-toolkit/java/classes/js.jar
index 0352cb1..0352cb1 100644..100755
--- a/utils/jsdoc-toolkit/java/classes/js.jar
+++ b/utils/jsdoc-toolkit/java/classes/js.jar
Binary files differ
diff --git a/utils/jsdoc-toolkit/java/src/JsDebugRun.java b/utils/jsdoc-toolkit/java/src/JsDebugRun.java
index 319a5c6..319a5c6 100644..100755
--- a/utils/jsdoc-toolkit/java/src/JsDebugRun.java
+++ b/utils/jsdoc-toolkit/java/src/JsDebugRun.java
diff --git a/utils/jsdoc-toolkit/java/src/JsRun.java b/utils/jsdoc-toolkit/java/src/JsRun.java
index 25f519a..25f519a 100644..100755
--- a/utils/jsdoc-toolkit/java/src/JsRun.java
+++ b/utils/jsdoc-toolkit/java/src/JsRun.java
diff --git a/utils/jsdoc-toolkit/jsdebug.jar b/utils/jsdoc-toolkit/jsdebug.jar
index a0ac7da..a0ac7da 100644..100755
--- a/utils/jsdoc-toolkit/jsdebug.jar
+++ b/utils/jsdoc-toolkit/jsdebug.jar
Binary files differ
diff --git a/utils/jsdoc-toolkit/jsrun.jar b/utils/jsdoc-toolkit/jsrun.jar
index 49c03f4..49c03f4 100644..100755
--- a/utils/jsdoc-toolkit/jsrun.jar
+++ b/utils/jsdoc-toolkit/jsrun.jar
Binary files differ
diff --git a/utils/jsdoc-toolkit/jsrun.sh b/utils/jsdoc-toolkit/jsrun.sh
index 74ca79c..74ca79c 100644..100755
--- a/utils/jsdoc-toolkit/jsrun.sh
+++ b/utils/jsdoc-toolkit/jsrun.sh
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/allclasses.tmpl b/utils/jsdoc-toolkit/templates/jsdoc/allclasses.tmpl
index 32f4358..32f4358 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/allclasses.tmpl
+++ b/utils/jsdoc-toolkit/templates/jsdoc/allclasses.tmpl
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/allfiles.tmpl b/utils/jsdoc-toolkit/templates/jsdoc/allfiles.tmpl
index 86c7590..86c7590 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/allfiles.tmpl
+++ b/utils/jsdoc-toolkit/templates/jsdoc/allfiles.tmpl
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/class.tmpl b/utils/jsdoc-toolkit/templates/jsdoc/class.tmpl
index e51f1d3..e51f1d3 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/class.tmpl
+++ b/utils/jsdoc-toolkit/templates/jsdoc/class.tmpl
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/index.tmpl b/utils/jsdoc-toolkit/templates/jsdoc/index.tmpl
index a5dc115..a5dc115 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/index.tmpl
+++ b/utils/jsdoc-toolkit/templates/jsdoc/index.tmpl
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/publish.js b/utils/jsdoc-toolkit/templates/jsdoc/publish.js
index 446c92b..446c92b 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/publish.js
+++ b/utils/jsdoc-toolkit/templates/jsdoc/publish.js
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/static/default.css b/utils/jsdoc-toolkit/templates/jsdoc/static/default.css
index 97e021e..97e021e 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/static/default.css
+++ b/utils/jsdoc-toolkit/templates/jsdoc/static/default.css
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/static/header.html b/utils/jsdoc-toolkit/templates/jsdoc/static/header.html
index 353b735..353b735 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/static/header.html
+++ b/utils/jsdoc-toolkit/templates/jsdoc/static/header.html
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/static/index.html b/utils/jsdoc-toolkit/templates/jsdoc/static/index.html
index 661f6f6..661f6f6 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/static/index.html
+++ b/utils/jsdoc-toolkit/templates/jsdoc/static/index.html
diff --git a/utils/jsdoc-toolkit/templates/jsdoc/symbol.tmpl b/utils/jsdoc-toolkit/templates/jsdoc/symbol.tmpl
index f8f4bd1..f8f4bd1 100644..100755
--- a/utils/jsdoc-toolkit/templates/jsdoc/symbol.tmpl
+++ b/utils/jsdoc-toolkit/templates/jsdoc/symbol.tmpl
--
cgit v0.9.1