changes from css-writing-modes-3 REC to css-writing-modes-4 CR

Author: ylafon

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

@@ -9,18 +9,24 @@
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
 import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssOperator;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
 
 /**
- * @spec https://www.w3.org/TR/2019/REC-css-writing-modes-3-20191210/#propdef-text-combine-upright
+ * @spec https://www.w3.org/TR/2019/CR-css-writing-modes-4-20190730/#propdef-text-combine-upright
  */
 public class CssTextCombineUpright extends org.w3c.css.properties.css.CssTextCombineUpright {
 
     public static final CssIdent[] allowed_values;
+    public static final CssIdent digits;
 
     static {
-        String[] _allowed_values = {"all", "none"};
+        digits = CssIdent.getIdent("digits");
+        String[] _allowed_values = {"all", "none", "digits"};
         allowed_values = new CssIdent[_allowed_values.length];
         int i = 0;
         for (String s : _allowed_values) {
@@ -54,13 +60,12 @@ public CssTextCombineUpright() {
      * Creates a new CssTextCombineUpright
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssTextCombineUpright(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
 
-        if (check && expression.getCount() > 1) {
+        if (check && expression.getCount() > 2) {
             throw new InvalidParamException("unrecognize", ac);
         }
 
@@ -79,6 +84,34 @@ public CssTextCombineUpright(ApplContext ac, CssExpression expression, boolean c
                 throw new InvalidParamException("value", expression.getValue(),
                         getPropertyName(), ac);
             }
+            if ((digits != value) && (expression.getCount() > 1)) {
+                throw new InvalidParamException("unrecognize", ac);
+            }
+            if (digits == value) {
+                if (expression.getCount() > 1) {
+                    char op = expression.getOperator();
+                    if (op != CssOperator.SPACE) {
+                        throw new InvalidParamException("operator",
+                                Character.toString(op), ac);
+                    }
+                    expression.next();
+                    val = expression.getValue();
+                    if (val.getType() != CssTypes.CSS_NUMBER) {
+                        throw new InvalidParamException("value", expression.getValue(),
+                                getPropertyName(), ac);
+                    }
+                    // we got a number.
+                    val.getCheckableValue().checkInteger(ac, this);
+                    val.getCheckableValue().checkStrictPositiveness(ac, this);
+                    // in fact the restricted set of values is smaller than that.
+                    // TODO check the interval.
+                    // now rewrite the value
+                    ArrayList<CssValue> v = new ArrayList<>();
+                    v.add(value);
+                    v.add(val);
+                    value = new CssValueList(v);
+                }
+            }
         }
         expression.next();
     }

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

@@ -13,14 +13,15 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2019/REC-css-writing-modes-3-20191210/#propdef-writing-mode
+ * @spec https://www.w3.org/TR/2019/CR-css-writing-modes-4-20190730/#propdef-writing-mode
  */
 public class CssWritingMode extends org.w3c.css.properties.css.CssWritingMode {
 
     public static final CssIdent[] allowed_values;
 
     static {
-        String[] _allowed_values = {"horizontal-tb", "vertical-rl", "vertical-lr"};
+        String[] _allowed_values = {"horizontal-tb", "vertical-rl", "vertical-lr",
+                "sideways-rl", "sideways-lr"};
         allowed_values = new CssIdent[_allowed_values.length];
         int i = 0;
         for (String s : _allowed_values) {
@@ -48,8 +49,7 @@ public CssWritingMode() {
      * Creates a new CssWritingMode
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssWritingMode(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {