ident check was using the wronge equality check, this fixes #343

Author: ylafon

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

@@ -80,13 +80,14 @@ public CssMargin(ApplContext ac, CssExpression expression,
                     v.add(val);
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val)) {
-                        v.add(inherit);
+                    CssIdent id = val.getIdent();
+                    if (CssIdent.isCssWide(id)) {
+                        v.add(val);
                         gotInherit = true;
                         break;
                     }
-                    if (auto.equals(val)) {
-                        v.add(auto);
+                    if (auto.equals(id)) {
+                        v.add(val);
                         break;
                     }
                     // if not inherit, or not an ident
@@ -113,11 +114,11 @@ public CssMargin(ApplContext ac, CssExpression expression,
             if (v.size() > 1) {
                 throw new InvalidParamException("unrecognize", ac);
             }
-            value = inherit;
-            marginBottom.value = inherit;
-            marginTop.value = inherit;
-            marginLeft.value = inherit;
-            marginRight.value = inherit;
+            value = v.get(0);
+            marginBottom.value = value;
+            marginTop.value = value;
+            marginLeft.value = value;
+            marginRight.value = value;
         } else {
             switch (v.size()) {
                 case 1:
@@ -174,13 +175,14 @@ protected static CssValue parseMargin(ApplContext ac,
                 expression.next();
                 return val;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val)) {
+                CssIdent id = val.getIdent();
+                if (CssIdent.isCssWide(id)) {
                     expression.next();
-                    return inherit;
+                    return val;
                 }
-                if (auto.equals(val)) {
+                if (auto.equals(id)) {
                     expression.next();
-                    return auto;
+                    return val;
                 }
                 // if not inherit, or not an ident
                 // let it flow to the exception

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

@@ -11,6 +11,7 @@
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
 import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
 import org.w3c.css.values.CssValueList;
@@ -82,15 +83,16 @@ public CssTransform(ApplContext ac, CssExpression expression, boolean check)
                     values.add(val);
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val.getIdent())) {
+                    CssIdent id = val.getIdent();
+                    if (CssIdent.isCssWide(id)) {
                         singleVal = true;
-                        sValue = inherit;
-                        values.add(inherit);
+                        sValue = val;
+                        values.add(val);
                         break;
-                    } else if (none.equals(val)) {
+                    } else if (none.equals(id)) {
                         singleVal = true;
-                        sValue = none;
-                        values.add(none);
+                        sValue = val;
+                        values.add(val);
                         break;
                     }
                     // if not recognized, let it fail