Added XML entity resolution (closes svg-sprite#118)

desigens · May 14, 2016 · 1b8eec6 · 1b8eec6
1 parent da02456
commit 1b8eec6
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/lib/svg-sprite/shape.js b/lib/svg-sprite/shape.js
@@ -311,13 +311,36 @@ SVGShape.prototype.setSVG = function(svg) {
 SVGShape.prototype._initSVG = function() {
 
 	// Basic check for basic SVG file structure
-	if (!this.svg.current.match(/<svg(?:\s+[a-z0-9-]+=("|').*?\1)*\s*(\/)|(>[^]*<\/svg)>/i)) {
+	var svgStart			= this.svg.current.match(/<svg(?:\s+[a-z0-9-\:]+=("|').*?\1)*\s*(?:(\/)|(>[^]*<\/svg))>/i);
+	if (!svgStart) {
 		var e				= new Error('Invalid SVG file');
 		e.name				= 'ArgumentError';
 		e.errno				= 1429395394;
 		throw e;
 	}
-
+
+	// Resolve XML entities
+	var entityRegExp		= /<!ENTITY\s+([^\s]+)\s+("|')(.+)(?:\2)>/i;
+	var entityStart			= 0;
+	var entities			= 0;
+	var entityMap			= {};
+	var entity;
+	do {
+		entity				= entityRegExp.exec(this.svg.current.substr(entityStart));
+		if (entity) {
+			++entities;
+			entityStart		+= entity.index + entity[0].length;
+			entityMap[entity[1]] = entity[3];
+		}
+	} while(entity);
+	if (entities) {
+		var svg				= this.svg.current.substr(svgStart.index);
+		for (entity in entityMap) {
+			svg				= svg.replace('&' + entity + ';', entityMap[entity]);
+		}
+		this.svg.current	= this.svg.current.substr(0, svgStart.index) + svg;
+	}
+
 	// Parse the XML
 	this.dom				= new DOMParser({
 		locator				: {},

diff --git a/test/fixture/svg/special/with-entity.svg b/test/fixture/svg/special/with-entity.svg