Remove the automatic canonicalisation of escapes, it is now forced only to remove padded escapes

like in gr\65 en -> gr\000065en to avoid the space (example is bad as it is modified as 'green')
This fixes #130

Author: ylafon

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

@@ -8580,10 +8580,13 @@ final public boolean prio() throws ParseException {
   String convertStringIndex(String s, int start, int len, boolean escapeFirst) throws ParseException {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);
@@ -8596,11 +8599,7 @@ final public boolean prio() throws ParseException {
                 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);
-                    int count = 1;
-                    if (maxCount == 0) {
-                        maxCount = ((ac.getCssVersion() == CssVersion.CSS1) ?
-                                    4 : 6);
-                    }
+                    count = 1;
                     while (index + 1 < len) {
                         c = s.charAt(index+1);
                         t = Character.digit(c, 16);
@@ -8612,8 +8611,10 @@ final public boolean prio() throws ParseException {
                                 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') {
@@ -8637,8 +8638,15 @@ final public boolean prio() throws ParseException {
                         buf.append((char) numValue);
                         break;
                     }
-                    char b[] = new char[maxCount];
-                    t = maxCount;
+                    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;

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

@@ -3949,10 +3949,13 @@ 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);
@@ -3965,11 +3968,7 @@ String convertStringIndex(String s, int start, int len, boolean escapeFirst) {
 		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);
-		    int count = 1;
-		    if (maxCount == 0) {
-			maxCount = ((ac.getCssVersion() == CssVersion.CSS1) ?
-				    4 : 6);
-		    }
+		    count = 1;
 		    while (index + 1 < len) {
 			c = s.charAt(index+1);
 			t = Character.digit(c, 16);
@@ -3981,8 +3980,10 @@ String convertStringIndex(String s, int start, int len, boolean escapeFirst) {
 				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') {
@@ -4006,8 +4007,15 @@ String convertStringIndex(String s, int start, int len, boolean escapeFirst) {
 			buf.append((char) numValue);
 			break;
 		    }
-		    char b[] = new char[maxCount];
-		    t = maxCount;
+		    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;