prepare rgb() and rgba() for the 'modern' syntax of css-color-4

Author: ylafon

org/w3c/css/values/RGB.java

@@ -16,6 +16,7 @@ public class RGB {
 
     private String output = null;
     private boolean percent = false;
+    boolean isCss3 = false;
 
     CssValue vr, vg, vb;
 
@@ -70,6 +71,7 @@ public static final CssValue filterValue(ApplContext ac, CssValue val)
     public final void setRed(ApplContext ac, CssValue val)
             throws InvalidParamException {
         output = null;
+        isCss3 = (ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0);
         vr = filterValue(ac, val);
     }
 
@@ -142,9 +144,13 @@ protected void setRepresentationString(String s) {
     public String toString() {
         if (output == null) {
             StringBuilder sb = new StringBuilder(functionname).append('(');
-            sb.append(vr).append(", ");
-            sb.append(vg).append(", ");
-            sb.append(vb).append(')');
+            if (isCss3) {
+                sb.append(vr).append(' ').append(vg).append(' ').append(vb).append(')');
+            } else {
+                sb.append(vr).append(", ");
+                sb.append(vg).append(", ");
+                sb.append(vb).append(')');
+            }
             output = sb.toString();
         }
         return output;

org/w3c/css/values/RGBA.java

@@ -121,11 +121,19 @@ public RGBA(int r, int g, int b, float a) {
     public String toString() {
         if (output == null) {
             StringBuilder sb = new StringBuilder();
-            sb.append(fname).append('(');
-            sb.append(vr).append(", ");
-            sb.append(vg).append(", ");
-            sb.append(vb).append(", ");
-            sb.append(va).append(')');
+            if (isCss3) {
+                sb.append(RGB.functionname).append('(');
+                sb.append(vr).append(' ');
+                sb.append(vg).append(' ');
+                sb.append(vb).append(" / ");
+                sb.append(va).append(')');
+            } else {
+                sb.append(fname).append('(');
+                sb.append(vr).append(", ");
+                sb.append(vg).append(", ");
+                sb.append(vb).append(", ");
+                sb.append(va).append(')');
+            }
             output = sb.toString();
         }
         return output;