Merge branch 'master' of https://github.com/ElinamLLC/SharpVectors

ElinamLLC · Sep 20, 2019 · a30be58 · a30be58
2 parents a7cb2a6 + 442cc56
commit a30be58
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git a/Output/SharpVectors.Core.dll b/Output/SharpVectors.Core.dll
diff --git a/Output/SharpVectors.Dom.dll b/Output/SharpVectors.Dom.dll
diff --git a/Output/SharpVectors.Runtime.Wpf.dll b/Output/SharpVectors.Runtime.Wpf.dll
diff --git a/Source/SharpVectorModel/BasicTypes/SvgElement.cs b/Source/SharpVectorModel/BasicTypes/SvgElement.cs
@@ -232,7 +232,7 @@ public ISvgElementInstance ElementInstance
 
         public string ResolveUri(string uri)
         {
-            uri = uri.Trim();
+            uri = uri.Trim().Trim(new char[] { '\"', '\'' });
             if (uri.StartsWith("#", StringComparison.OrdinalIgnoreCase))
             {
                 return uri;

diff --git a/Source/SharpVectorModel/BasicTypes/SvgUriReference.cs b/Source/SharpVectorModel/BasicTypes/SvgUriReference.cs
@@ -38,7 +38,7 @@ public string AbsoluteUri
                     if (_ownerElement.HasAttribute("href", SvgDocument.XLinkNamespace) ||
                         _ownerElement.HasAttribute("href"))
                     {
-                        string href = Href.AnimVal.Trim();
+                        string href = Href.AnimVal.Trim().Trim(new char[] { '\"', '\'' });
 
                         if (href.StartsWith("#", StringComparison.OrdinalIgnoreCase))
                         {

diff --git a/Source/SharpVectorModel/DocumentStructure/SvgDocument.cs b/Source/SharpVectorModel/DocumentStructure/SvgDocument.cs
@@ -751,7 +751,7 @@ public XmlNode GetNodeByUri(string absoluteUrl)
                 return null;
             }
 
-            absoluteUrl = absoluteUrl.Trim();
+            absoluteUrl = absoluteUrl.Trim().Trim(new char[] { '\"', '\'' });
             if (absoluteUrl.StartsWith("#", StringComparison.OrdinalIgnoreCase))
             {
                 return GetElementById(absoluteUrl.Substring(1));

diff --git a/Source/SharpVectorRenderingWpf/Wpf/WpfRendering.cs b/Source/SharpVectorRenderingWpf/Wpf/WpfRendering.cs
@@ -248,6 +248,7 @@ private static WpfRendering CreateRendering(SvgElement svgElement)
         /// </returns>
         public static WpfRendering CreateByUri(SvgDocument document, string baseUri, string url)
         {
+            url = url.Trim().Trim(new char[] { '\"', '\'' });
             if (url.StartsWith("#", StringComparison.OrdinalIgnoreCase))
             {
                 // do nothing