mark properly a copied expression as having a variable if what we add is indeed one, apply that to Color

Author: ylafon

org/w3c/css/properties/css3/CssColor.java

@@ -69,7 +69,7 @@ public CssColor(ApplContext ac, CssExpression expression, boolean check)
                 color = val;
                 break;
             case CssTypes.CSS_FUNCTION:
-                 CssFunction attr = val.getFunction();
+                CssFunction attr = val.getFunction();
                 CssExpression params = attr.getParameters();
                 String fname = attr.getName();
 
@@ -100,8 +100,10 @@ public CssColor(ApplContext ac, CssExpression expression, boolean check)
                 }
                 break;
             default:
-                throw new InvalidParamException("value", expression.getValue(),
-                        getPropertyName(), ac);
+                if (!expression.hasCssVariable()) {
+                    throw new InvalidParamException("value", expression.getValue(),
+                            getPropertyName(), ac);
+                }
         }
         expression.next();
     }

org/w3c/css/values/CssExpression.java

@@ -47,7 +47,7 @@ public boolean hasCssVariable() {
     public void markCssVariable() {
         css_variable = true;
     }
-    
+
     /**
      * mark the current position, it can be set to this
      * position later by using reset
@@ -75,8 +75,13 @@ public void reset() {
      * @param value The value to append
      */
     public void addValue(CssValue value) {
-        items.add(new ValueOperator(value));
-        count++;
+        if (value != null) {
+            if (value.getRawType() == CssTypes.CSS_VARIABLE) {
+                markCssVariable();
+            }
+            items.add(new ValueOperator(value));
+            count++;
+        }
     }
 
     /**
@@ -137,7 +142,7 @@ public CssValue getLastValue() {
         }
     }
 
-	/* Modified by Sijtsche de Jong */
+    /* Modified by Sijtsche de Jong */
 
     /**
      * Returns the operator <strong>after</strong> the current value