Changeset 14331 in josm for trunk/src/com/kitfox/svg/xml/XMLParseUtil.java

Timestamp:

2018-10-14T17:02:51+02:00 (6 years ago)

Author:

Don-vip

Message:

see #14319, see #16838 - fix regressions introduced in svgSalamander 1.1.2

see ​https://github.com/blackears/svgSalamander/issues/29

File:

• trunk/src/com/kitfox/svg/xml/XMLParseUtil.java (modified) (2 diffs)

trunk/src/com/kitfox/svg/xml/XMLParseUtil.java

@@ -56 +56 @@
     static final Matcher fpMatch = Pattern.compile("([-+]?((\\d*\\.\\d+)|(\\d+))([eE][+-]?\\d+)?)(\\%|in|cm|mm|pt|pc|px|em|ex)?").matcher("");
     static final Matcher intMatch = Pattern.compile("[-+]?\\d+").matcher("");
+    static final Matcher quoteMatch = Pattern.compile("^'|'$").matcher("");
 
     /** Creates a new instance of XMLParseUtil */
@@ -320 +321 @@
 
             String key = styles[i].substring(0, colon).trim();
-            String value = styles[i].substring(colon + 1).trim();
+            String value = quoteMatch.reset(styles[i].substring(colon + 1).trim()).replaceAll("");
 
             map.put(key, new StyleAttribute(key, value));