remove improper casts and toString for variable handling, See w3c#336, need to fix other SVG properties

Author: ylafon

org/w3c/css/properties/svg/CssFill.java

@@ -79,31 +79,32 @@ static CssValue parsePaint(ApplContext ac, CssExpression expression,
 
             switch (val.getType()) {
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val)) {
-                        value = inherit;
+                    CssIdent id = val.getIdent();
+                    if (CssIdent.isCssWide(id)) {
+                        value = val;
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value",
                                     val.toString(),
                                     property.getPropertyName(), ac);
                         }
                         break;
                     }
-                    if (none.equals(val)) {
+                    if (none.equals(id)) {
                         if ((expression.getCount() > 1 && !gotFuncIRI) || (expression.getCount() > 2 && gotFuncIRI)) {
                             throw new InvalidParamException("value",
                                     val.toString(),
                                     property.getPropertyName(), ac);
                         }
-                        values.add(none);
+                        values.add(val);
                         break;
                     }
-                    if (currentColor.equals(val)) {
+                    if (currentColor.equals(id)) {
                         if ((expression.getCount() > 1 && !gotFuncIRI) || (expression.getCount() > 2 && gotFuncIRI)) {
                             throw new InvalidParamException("value",
                                     val.toString(),
                                     property.getPropertyName(), ac);
                         }
-                        values.add(currentColor);
+                        values.add(val);
                         gotColor = true;
                         break;
                     }
@@ -144,9 +145,9 @@ static CssValue parsePaint(ApplContext ac, CssExpression expression,
                                 property.getPropertyName(), ac);
                     }
                     CssColor c = new CssColor();
-                    c.setShortRGBColor(ac, val.toString());
+                    c.setShortRGBColor(ac, val.getHashIdent().toString());
                     gotColor = true;
-                    values.add(c);
+                    values.add(val);
                     break;
                 case CssTypes.CSS_COLOR:
                     if (gotColor) {