changed font embedding

editor/svg-editor.js

@@ -1812,29 +1812,33 @@
 				var last_x = null, last_y = null, w_area = workarea[0], 
 					panning = false, keypan = false;
 				
-				$('#svgcanvas').bind('mousemove mouseup touchend', function(evt) {
-					if(panning === false) return;
-					w_area.scrollLeft -= (evt.clientX - last_x);
-					w_area.scrollTop -= (evt.clientY - last_y);
-					
-					last_x = evt.clientX;
-					last_y = evt.clientY;
-					
-					if(evt.type === 'mouseup' || evt.type === 'touchend') panning = false;
-					return false;
-				})
-				.on("mousedown touchmove", function(evt) {
-					if(evt.button === 1 || keypan === true || (evt.originalEvent.touches && evt.originalEvent.touches.length >= 2)) {
-						panning = true;
-						last_x = evt.clientX;
-						last_y = evt.clientY;
-						return false;
-					}
-				});
+				var move_pan = function(evt) {    
+  					if(panning === false) return;
+
+  				  w_area.scrollLeft -= (evt.clientX - last_x);
+  					w_area.scrollTop -= (evt.clientY - last_y);
+  					last_x = evt.clientX;
+  					last_y = evt.clientY;
+
+  					if(evt.type === 'mouseup' || evt.type === 'touchend') panning = false;
+  					return false;
+  			}
+  			
+  			var start_pan = function(evt) {
+  				if(evt.button === 1 || keypan === true || (evt.originalEvent.touches && evt.originalEvent.touches.length >= 2)) {
+  					panning = true;
+  					last_x = evt.clientX;
+  					last_y = evt.clientY;
+  					return false;
+  				}
+			  }
+				
+				$('#svgcanvas')
+				  .on('mousemove mouseup touchend', move_pan)
+				  .on("mousedown touchmove", start_pan)
 				
 				$(window).mouseup(function() {
 					panning = false;
-					$('body').removeClass('dragging')
 				});
 				
 				$(document).bind('keydown', 'space', function(evt) {
@@ -3752,19 +3756,10 @@
 			}
 			
 			function updateRulers(scanvas, zoom) {
-			  var ruler_x_cursor = document.getElementById("ruler_x_cursor");
-			  var ruler_y_cursor = document.getElementById("ruler_y_cursor");
 			  var workarea = document.getElementById("workarea");
 			  var title_show = document.getElementById("title_show");
 			  var offset_x = 66;
 			  var offset_y = 48;
-			  if (svgedit.browser.isTouch()) {
-  			  $("#workarea").unbind("mousemove.rulers").bind("mousemove.rulers", function(e){
-  			    e.stopPropagation();
-            ruler_x_cursor.style.left = (e.pageX-offset_x+workarea.scrollLeft) + "px";
-            ruler_y_cursor.style.top = (e.pageY-offset_y+workarea.scrollTop) + "px";
-          })
-        }
 				if(!zoom) zoom = svgCanvas.getZoom();
 				if(!scanvas) scanvas = $("#svgcanvas");
 				

editor/test.html

@@ -0,0 +1,17 @@
+
+<svg width="400px" height="300px" version="1.1"
+ xmlns = 'http://www.w3.org/2000/svg'>  
+  <defs>
+    <style type="text/css">
+			@font-face {
+			  font-family: Arvo;
+			  src: url('/font-files/arvo-regular-webfont.woff') format('woff');
+			  font-weight: normal;
+			  font-style: normal;
+			}
+   </style>
+  </defs>
+  <text x="100" y="100"
+           style="font-family: 'Arvo'; font-weight:normal;
+                  font-style: normal">Text using CSS @font-face</text>
+</svg>

method-draw/index.html

@@ -324,11 +324,11 @@
 			<input id="font_family" data-title="Change Font Family" size="12" type="hidden" />
 			<select id="font_family_dropdown">
 				  <option value="Helvetica, Arial, sans-serif" selected>Helvetica</option>
-					<option value="Arvo">Arvo</option>
-					<option value="Euphoria">Euphoria</option>
-					<option value="Oswald">Oswald</option>
-					<option value="'Shadows Into Light'">Shadows Into Light</option>
-					<option value="Simonetta">Simonetta</option>
+					<option value="Arvo, sans-serif">Arvo</option>
+					<option value="Euphoria, sans-serif">Euphoria</option>
+					<option value="Oswald, sans-serif">Oswald</option>
+					<option value="'Shadows Into Light', serif">Shadows Into Light</option>
+					<option value="'Simonetta', serif">Simonetta</option>
 					<option value="Georgia, Times, 'Times New Roman', serif">Georgia</option>
 					<option value="'Palatino Linotype', 'Book Antiqua', Palatino, serif">Palatino</option>
 					<option value="'Times New Roman', Times, serif">Times</option>

method-draw/svg-editor.js

@@ -1812,29 +1812,33 @@
 				var last_x = null, last_y = null, w_area = workarea[0], 
 					panning = false, keypan = false;
 				
-				$('#svgcanvas').bind('mousemove mouseup touchend', function(evt) {
-					if(panning === false) return;
-					w_area.scrollLeft -= (evt.clientX - last_x);
-					w_area.scrollTop -= (evt.clientY - last_y);
-					
-					last_x = evt.clientX;
-					last_y = evt.clientY;
-					
-					if(evt.type === 'mouseup' || evt.type === 'touchend') panning = false;
-					return false;
-				})
-				.on("mousedown touchmove", function(evt) {
-					if(evt.button === 1 || keypan === true || (evt.originalEvent.touches && evt.originalEvent.touches.length >= 2)) {
-						panning = true;
-						last_x = evt.clientX;
-						last_y = evt.clientY;
-						return false;
-					}
-				});
+				var move_pan = function(evt) {    
+  					if(panning === false) return;
+
+  				  w_area.scrollLeft -= (evt.clientX - last_x);
+  					w_area.scrollTop -= (evt.clientY - last_y);
+  					last_x = evt.clientX;
+  					last_y = evt.clientY;
+
+  					if(evt.type === 'mouseup' || evt.type === 'touchend') panning = false;
+  					return false;
+  			}
+  			
+  			var start_pan = function(evt) {
+  				if(evt.button === 1 || keypan === true || (evt.originalEvent.touches && evt.originalEvent.touches.length >= 2)) {
+  					panning = true;
+  					last_x = evt.clientX;
+  					last_y = evt.clientY;
+  					return false;
+  				}
+			  }
+				
+				$('#svgcanvas')
+				  .on('mousemove mouseup touchend', move_pan)
+				  .on("mousedown touchmove", start_pan)
 				
 				$(window).mouseup(function() {
 					panning = false;
-					$('body').removeClass('dragging')
 				});
 				
 				$(document).bind('keydown', 'space', function(evt) {
@@ -3752,19 +3756,10 @@
 			}
 			
 			function updateRulers(scanvas, zoom) {
-			  var ruler_x_cursor = document.getElementById("ruler_x_cursor");
-			  var ruler_y_cursor = document.getElementById("ruler_y_cursor");
 			  var workarea = document.getElementById("workarea");
 			  var title_show = document.getElementById("title_show");
 			  var offset_x = 66;
 			  var offset_y = 48;
-			  if (svgedit.browser.isTouch()) {
-  			  $("#workarea").unbind("mousemove.rulers").bind("mousemove.rulers", function(e){
-  			    e.stopPropagation();
-            ruler_x_cursor.style.left = (e.pageX-offset_x+workarea.scrollLeft) + "px";
-            ruler_y_cursor.style.top = (e.pageY-offset_y+workarea.scrollTop) + "px";
-          })
-        }
 				if(!zoom) zoom = svgCanvas.getZoom();
 				if(!scanvas) scanvas = $("#svgcanvas");
 				

method-draw/test.html

@@ -0,0 +1,17 @@
+
+<svg width="400px" height="300px" version="1.1"
+ xmlns = 'http://www.w3.org/2000/svg'>  
+  <defs>
+    <style type="text/css">
+			@font-face {
+			  font-family: Arvo;
+			  src: url('/font-files/arvo-regular-webfont.woff') format('woff');
+			  font-weight: normal;
+			  font-style: normal;
+			}
+   </style>
+  </defs>
+  <text x="100" y="100"
+           style="font-family: 'Arvo'; font-weight:normal;
+                  font-style: normal">Text using CSS @font-face</text>
+</svg>