add back quotes if they were removed following w3c#259

Author: ylafon

org/w3c/css/values/CssURL.java

@@ -57,6 +57,7 @@ public final int getType() {
 
     String value;
     String full = null;
+    private boolean addQuotes = false;
 
     URL base;
     URL urlValue = null;
@@ -89,17 +90,22 @@ public void set(String s, ApplContext ac, URL base)
         this.base = base;
 
         urlname = urlname.trim();
-        if (urlname.isEmpty()){
-        	// okay, no further modifications needed
-        }else if (urlname.charAt(0)=='"' || urlname.charAt(0)=='\''){
-        	final int l = urlname.length()-1;
-        	if (urlname.charAt(0)==urlname.charAt(l)){
-        		urlname = urlname.substring(1, l);
-        	}else{
-                throw new InvalidParamException("url", s, ac);
-        	}
+        if (urlname.isEmpty()) {
+            // okay, no further modifications needed
+        } else {
+            char firstc = urlname.charAt(0);
+
+            if (firstc == '"' || firstc == '\'') {
+                final int l = urlname.length() - 1;
+                if (firstc == urlname.charAt(l)) {
+                    urlname = urlname.substring(1, l);
+                    addQuotes = true;
+                } else {
+                    throw new InvalidParamException("url", s, ac);
+                }
+            }
         }
-        
+
         value = filterURLData(urlname);
         full = null;
         if (!urlHeading.startsWith("url"))
@@ -165,7 +171,11 @@ public String toString() {
             return full;
         }
         StringBuilder sb = new StringBuilder("url(");
-        sb.append(value).append(')');
+        if (addQuotes) {
+            sb.append('"').append(value).append("\")");
+        } else {
+            sb.append(value).append(')');
+        }
         return full = sb.toString();
     }