proper check for css-wide idents (cont.)

Author: ylafon

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

@@ -67,7 +67,7 @@ public CssTextJustify(ApplContext ac, CssExpression expression, boolean check)
         // ident, so inherit, or allowed value
         CssIdent id = val.getIdent();
 
-        if (!inherit.equals(id) && (getMatchingIdent(id) == null)) {
+        if (!CssIdent.isCssWide(id) && (getMatchingIdent(id) == null)) {
             throw new InvalidParamException("value",
                     expression.getValue(),
                     getPropertyName(), ac);

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

@@ -65,7 +65,7 @@ public CssTextOrientation(ApplContext ac, CssExpression expression, boolean chec
                     getPropertyName(), ac);
         }
         CssIdent id = val.getIdent();
-        if (!inherit.equals(id) && (getAllowedIdent(id) == null)) {
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
             throw new InvalidParamException("value", expression.getValue(),
                     getPropertyName(), ac);
         }

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

@@ -69,7 +69,7 @@ public CssTextOverflow(ApplContext ac, CssExpression expression, boolean check)
                     getPropertyName(), ac);
         }
         CssIdent id = val.getIdent();
-        if (!inherit.equals(id) && (getAllowedIdent(id) == null)) {
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
             throw new InvalidParamException("value",
                     val.toString(),
                     getPropertyName(), ac);

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

@@ -9,6 +9,7 @@
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssCheckableValue;
 import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssLayerList;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
@@ -53,8 +54,9 @@ public CssTextShadow(ApplContext ac, CssExpression expression, boolean check)
         while (!expression.end()) {
             val = expression.getValue();
             op = expression.getOperator();
-            
-            if ((val.getType() == CssTypes.CSS_IDENT) && none.equals(val.getIdent())) {
+
+            if ((val.getType() == CssTypes.CSS_IDENT) &&
+                    (none.equals(val.getIdent()) || CssIdent.isCssWide(val.getIdent()))) {
                 if (expression.getCount() > 1) {
                     throw new InvalidParamException("value", val,
                             getPropertyName(), ac);

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

@@ -69,7 +69,7 @@ public CssTextSizeAdjust(ApplContext ac, CssExpression expression,
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
                 CssIdent id = val.getIdent();
-                if (inherit.equals(id)) {
+                if (CssIdent.isCssWide(id)) {
                     value = val;
                     break;
                 } else {

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

@@ -85,26 +85,26 @@ public CssTextTransform(ApplContext ac, CssExpression expression, boolean check)
                         getPropertyName(), ac);
             }
             // ident, so inherit, or allowed value
-            if (inherit.equals(val.getIdent())) {
+            if (CssIdent.isCssWide(val.getIdent())) {
                 if (expression.getCount() > 1) {
                     throw new InvalidParamException("value",
                             expression.getValue(),
                             getPropertyName(), ac);
                 }
-                values.add(inherit);
+                values.add(val);
             } else if (none.equals(val.getIdent())) {
                 if (expression.getCount() > 1) {
                     throw new InvalidParamException("value",
                             expression.getValue(),
                             getPropertyName(), ac);
                 }
-                values.add(none);
+                values.add(val);
             } else if (fullWidth.equals(val.getIdent()) && !got_full_width) {
                 got_full_width = true;
-                values.add(fullWidth);
+                values.add(val);
             } else if (fullSizeKana.equals(val.getIdent()) && !got_full_size_kana) {
                 got_full_size_kana = true;
-                values.add(fullSizeKana);
+                values.add(val);
             } else if (!got_action) {
                 if (getMatchingActionIdent(val.getIdent()) == null) {
                     throw new InvalidParamException("value",

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

@@ -65,7 +65,7 @@ public CssTextUnderlineOffset(ApplContext ac, CssExpression expression, boolean
                 value = val;
                 break;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = val;
                     break;
                 }

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

@@ -105,7 +105,7 @@ public CssTextUnderlinePosition(ApplContext ac, CssExpression expression, boolea
         }
 
         CssIdent ident = val.getIdent();
-        if (inherit.equals(ident)) {
+        if (CssIdent.isCssWide(ident)) {
             value = val;
             if (check && expression.getCount() != 1) {
                 throw new InvalidParamException("value",

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

@@ -123,7 +123,7 @@ public CssTouchAction(ApplContext ac, CssExpression expression,
                         getPropertyName(), ac);
             }
             id = val.getIdent();
-            if (id.equals(inherit)) {
+            if (CssIdent.isCssWide(id)) {
                 if (expression.getCount() > 1) {
                     throw new InvalidParamException("value",
                             expression.getValue(),