Merge pull request #260 from Handig-Eekhoorn/fix-font-family-escape

FontFamily.convertString() double-escapes already escaped strings

Author: ylafon

org/w3c/css/properties/css2/font/FontFamily.java

@@ -143,13 +143,23 @@ public String toString() {
     }
 
     String convertString(String value) {
-        if (value.indexOf('"') != -1) {
-            return '\'' + value + '\'';
-        } else if (value.indexOf('\'') != -1) {
-            return '"' + value + '"';
-        } else {
-            return value;
-        }
+    	char cfirst = value.charAt(0);
+    	char clast  = value.charAt(value.length()-1);
+    	
+    	if (cfirst == clast
+    			&& (cfirst == '\'' || cfirst=='"')
+    	){
+    		// is already well escaped
+    		return value;
+    	}
+    	
+    	if (value.indexOf('"') != -1) {
+    		return '\'' + value + '\'';
+    	} else if (value.indexOf('\'') != -1) {
+    		return '"' + value + '"';
+    	} else {
+    		return value;
+    	}
     }
 
     /**