Allow more than just word characters in IRI references.

yWorks · Dec 21, 2016 · 2c9f7d2 · 2c9f7d2
1 parent a317199
commit 2c9f7d2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "svg2pdf.js",
   "description": "A javascript-only SVG to PDF conversion utility that runs in the browser leveraging jsPDF",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/svg2pdf.min.js",
   "authors": [{
     "name": "yFiles for HTML Support Team",

diff --git a/dist/svg2pdf.js b/dist/svg2pdf.js
@@ -1735,7 +1735,7 @@ function RGBColor(color_string)
 
 }
 if (typeof define === "function" && define.amd) {
-  define([],function () {
+  define(function () {
     return RGBColor;
   });
 } else if (typeof module !== "undefined" && module.exports) {

diff --git a/dist/svg2pdf.min.js b/dist/svg2pdf.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svg2pdf.js",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A javascript-only SVG to PDF conversion utility that runs in the browser leveraging jsPDF",
   "main": "src/svg2pdf.js",
   "files": [

diff --git a/src/svg2pdf.js b/src/svg2pdf.js
@@ -40,6 +40,9 @@ SOFTWARE.
 
   var cToQ = 2 / 3; // ratio to convert quadratic bezier curves to cubic ones
 
+  var iriReference = /url\(#([^)]+)\)/;
+
+
   // pathSegList is marked deprecated in chrome, so parse the d attribute manually if necessary
   var getPathSegList = function (node) {
     var pathSegList = node.pathSegList;
@@ -833,13 +836,13 @@ SOFTWARE.
         var markerElement;
         switch (marker.type) {
           case "start":
-            markerElement = svgIdPrefix.get() + /url\(#(\w+)\)/.exec(markerStart)[1];
+            markerElement = svgIdPrefix.get() + iriReference.exec(markerStart)[1];
             break;
           case "end":
-            markerElement = svgIdPrefix.get() + /url\(#(\w+)\)/.exec(markerEnd)[1];
+            markerElement = svgIdPrefix.get() + iriReference.exec(markerEnd)[1];
             break;
           case "mid":
-            markerElement = svgIdPrefix.get() + /url\(#(\w+)\)/.exec(markerMid)[1];
+            markerElement = svgIdPrefix.get() + iriReference.exec(markerMid)[1];
             break;
         }
         _pdf.doFormObject(markerElement, marker.tf);
@@ -1192,7 +1195,7 @@ SOFTWARE.
 
       var fillColor = getAttribute(node, "fill");
       if (fillColor) {
-        var url = /url\(#(\w+)\)/.exec(fillColor);
+        var url = iriReference.exec(fillColor);
         if (url) {
           // probably a gradient (or something unsupported)
           fillUrl = svgIdPrefix.get() + url[1];