escaping url(

Author: ylafon

org/w3c/css/parser/analyzer/CssParser.jj

@@ -56,10 +56,11 @@ import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.CssProfile;
 import org.w3c.css.util.CssVersion;
 import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.util.StringUtils;
 import org.w3c.css.util.Util;
 import org.w3c.css.util.WarningParamException;
-import org.w3c.css.values.CssAngle;
 import org.w3c.css.values.CssANPlusB;
+import org.w3c.css.values.CssAngle;
 import org.w3c.css.values.CssAttr;
 import org.w3c.css.values.CssBracket;
 import org.w3c.css.values.CssCalc;
@@ -93,6 +94,8 @@ import org.w3c.css.values.CssValue;
 import org.w3c.css.values.CssVariable;
 import org.w3c.css.values.CssVolume;
 
+import static org.w3c.css.util.StringUtils.convertIdent;
+
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -528,6 +531,9 @@ SPECIAL_TOKEN :
 { 
     < #H          : ["0"-"9", "a"-"f"] > 
   | < #NONASCII   : ["\u0080"-"\uFFFF"] >
+  | < #__U        : "u" | ( "\\" ( "0" )? ( "0" )? ( "0" )? ( "0" )? ( "55" | "75" ) ( "\r\n" | [ " ", "\t" , "\n" , "\r", "\f" ] )? ) >
+  | < #__R        : "r" | ( "\\" ( "0" )? ( "0" )? ( "0" )? ( "0" )? ( "52" | "72" ) ( "\r\n" | [ " ", "\t" , "\n" , "\r", "\f" ] )? ) >
+  | < #__L        : "l" | ( "\\" ( "0" )? ( "0" )? ( "0" )? ( "0" )? ( "4c" | "6c" ) ( "\r\n" | [ " ", "\t" , "\n" , "\r", "\f" ] )? ) >
   | < #UNICODE    : "\\" <H> ( <H> )? ( <H> )? ( <H> )? ( <H> )? ( <H> )?
 	            ( "\r\n" | [ " ", "\t" , "\n" , "\r", "\f" ] )? >
   | < #ESCAPE     : <UNICODE> | ( "\\" ~[ "\r", "\n", "\f", "0"-"9", "a"-"f" ] ) >
@@ -546,6 +552,7 @@ SPECIAL_TOKEN :
   | < #_S         : ( [ " ", "\t" , "\n" , "\r", "\f" ] ) ( <COMMENT> | [ " ", "\t" , "\n" , "\r", "\f" ] )*  >
   | < #_W         : ( <_S> )? >
   | < #NL         : ( "\n" | "\r\n" | "\r" | "\f" ) >
+  | < URLPREFIX   : <__U> <__R> <__L> "(" >
 }
 /*
  * The _S definition is not  ( [ " ", "\t" , "\n" , "\r", "\f" ] ) + as we need to add support
@@ -638,7 +645,7 @@ TOKEN :
 <DEFAULT>
 TOKEN [IGNORE_CASE] :
 {
-  < URL         : "url(" ( <S> )* ( <STRING> | <_URL>  ) ( <S> )* <RPAREN> >
+  < URL         : <URLPREFIX> ( <S> )* ( <STRING> | <_URL>  ) ( <S> )* <RPAREN> >
 }
 
 <DEFAULT>
@@ -3949,134 +3956,39 @@ void skipAfterExpression(Exception e) {
 }
 
 JAVACODE
-String convertStringIndex(String s, int start, int len, boolean escapeFirst) {
-    int index = start;
-    int t;
-    int maxCount = 0;
-    boolean gotWhiteSpace = false;
-    int count = 0;
-    if ((start == 0) && (len == s.length()) && (s.indexOf('\\') == -1)) {
-	return s;
-    }
-    StringBuilder buf = new StringBuilder(len);
-    maxCount = ((ac.getCssVersion() == CssVersion.CSS1) ?  4 : 6);
-
-    while (index < len) {
-	char c = s.charAt(index);
-	if (c == '\\') {
-	    if (++index < len) {
-		c = s.charAt(index);
-		switch (c) {
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-		case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-		case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		    int numValue = Character.digit(c, 16);
-		    count = 1;
-		    while (index + 1 < len) {
-			c = s.charAt(index+1);
-			t = Character.digit(c, 16);
-			if (t != -1 && count++ < maxCount) {
-			    numValue = (numValue<<4) | t;
-			    index++;
-			} else {
-			    if (c == ' ' || c == '\t' || 
-				c == '\n' || c == '\f' ) {
-				// skip the latest white space
-				index++;
-				gotWhiteSpace = true;
-			    } else if ( c == '\r' ) {
-				index++;
-				gotWhiteSpace = true;
-				// special case for \r\n
-				if (index+1 < len) {
-				    if (s.charAt(index + 1) == '\n') {
-					index++;
-				    }
-				}
-			    }
-			    break;
-			}
-		    }
-		    if (!escapeFirst && numValue < 255 && numValue>31) { 
-			if (! ( (numValue>96 && numValue<123) // [a-z]
-				|| (numValue>64 && numValue<91) // [A-Z]
-				|| (numValue>47 && numValue<58) // [0-9]
-				|| (numValue == 95) // _
-				|| (numValue == 45) // -
-				)
-			    ) {
-			    buf.append('\\');
-			}
-			buf.append((char) numValue);
-			break;
-		    }
-		    char b[];
-		    // we fully escape when we have a space
-		    if (gotWhiteSpace) {
-			b  = new char[maxCount];
-			t = maxCount;
-		    } else {
-			b = new char[count];
-			t = count;
-		    }
-		    while (t > 0) {
-			b[--t] = hexdigits[numValue & 0xF];
-			numValue >>>= 4;
-		    }
-		    buf.append('\\').append(b);
-		    break;
-		case '\n':
-		case '\f':
-		    break;
-		case '\r':
-		    if (index + 1 < len) {
-			if (s.charAt(index + 1) == '\n') {
-			    index ++;
-			}
-		    }
-		    break;
-		case '-' : case '_' : case 'g' : case 'G' :
-		case 'h' : case 'H' : case 'i' : case 'I' :
-		case 'j' : case 'J' : case 'k' : case 'K' :
-		case 'l' : case 'L' : case 'm' : case 'M' :
-		case 'n' : case 'N' : case 'o' : case 'O' :
-		case 'p' : case 'P' : case 'q' : case 'Q' :
-		case 'r' : case 'R' : case 's' : case 'S' :
-		case 't' : case 'T' : case 'u' : case 'U' :
-		case 'v' : case 'V' : case 'w' : case 'W' :
-		case 'x' : case 'X' : case 'y' : case 'Y' :
-		case 'z' : case 'Z' : 
-		    buf.append(c);
-		    break;
-		default:
-		    buf.append('\\').append(c);
-		}
-	    } else {
+public String convertStringIndex(String s, int start, int len, boolean escapeFirst) {
+	try {
+		return StringUtils.convertStringIndex(s, start, len, escapeFirst, ac);
+	} catch (InvalidParamException nex) {
 		throw new ParseException("invalid string");
-	    }
-	} else {
-	    buf.append(c);
 	}
-	escapeFirst = false;
-	index++;
-    }
-    return buf.toString();
 }
 
 JAVACODE
-String convertIdent(String s) {
-    return convertStringIndex(s, 0, s.length(), false);
+String convertIdent(String s) throws ParseException {
+	try {
+		return StringUtils.convertIdent(s, ac);
+	} catch (InvalidParamException nex) {
+		throw new ParseException("invalid string");
+	}
 }
 
 JAVACODE
 String convertClassIdent(String s) {
-    return convertStringIndex(s, 0, s.length(), true);
+	try {
+                return StringUtils.convertClassIdent(s, ac);
+        } catch (InvalidParamException nex) {
+                throw new ParseException("invalid string");
+        }
 }
 
 JAVACODE
 String convertString(String s) {
-    return convertStringIndex(s, 0, s.length(), false);
+	try {
+                return StringUtils.convertString(s, ac);
+        } catch (InvalidParamException nex) {
+                throw new ParseException("invalid string");
+        }
 }
 
 JAVACODE