redone mask per <http://www.w3.org/TR/2011/REC-SVG11-20110816/masking.html#MaskProperty>

Author: ylafon

org/w3c/css/properties/CSS3SVGProperties.properties

@@ -22,6 +22,7 @@ kerning:                                org.w3c.css.properties.svg.CssKerning
 writing-mode:                           org.w3c.css.properties.svg.CssWritingMode
 clip-path:                              org.w3c.css.properties.svg.CssClipPath
 clip-rule:                              org.w3c.css.properties.svg.CssClipRule
+mask:                                   org.w3c.css.properties.svg.CssMask
 
 # CSS3 Properties
 font-style:                             org.w3c.css.properties.css3.CssFontStyle

org/w3c/css/properties/SVGBasicProperties.properties

@@ -30,7 +30,7 @@ glyph-orientation-vertical:     org.w3c.css.properties.css3.CssGlyphOrVert
 image-rendering:                org.w3c.css.properties.svg.CssImageRendering
 kerning:                        org.w3c.css.properties.svg.CssKerning
 letter-spacing:                 org.w3c.css.properties.css21.CssLetterSpacing
-mask:                           org.w3c.css.properties.svg.Mask
+mask:                           org.w3c.css.properties.svg.CssMask
 opacity:                        org.w3c.css.properties.css3.CssOpacity
 overflow:                       org.w3c.css.properties.css2.CssOverflow
 pointer-events:                 org.w3c.css.properties.svg.PointerEvents

org/w3c/css/properties/SVGProperties.properties

@@ -34,7 +34,7 @@ filter:                         org.w3c.css.properties.css3.CssFilter
 fill-rule:                      org.w3c.css.properties.svg.CssFillRule
 fill-opacity:                   org.w3c.css.properties.svg.CssFillOpacity
 image-rendering:                org.w3c.css.properties.svg.CssImageRendering
-mask:                           org.w3c.css.properties.svg.Mask
+mask:                           org.w3c.css.properties.svg.CssMask
 stop-opacity:                   org.w3c.css.properties.svg.StopOpacity
 projection.stop-opacity:        org.w3c.css.properties.svg.StopOpacity
 kerning:                        org.w3c.css.properties.svg.CssKerning

org/w3c/css/properties/css/CssMask.java

@@ -0,0 +1,116 @@
+//
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2016.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.svg.SVGBasicStyle;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @since SVG
+ */
+public class CssMask extends CssProperty {
+
+	public CssValue value;
+
+	/**
+	 * Create a new CssMask
+	 */
+	public CssMask() {
+	}
+
+	/**
+	 * Creates a new CssMask
+	 *
+	 * @param expression The expression for this property
+	 * @throws org.w3c.css.util.InvalidParamException
+	 *          Expressions are incorrect
+	 */
+	public CssMask(ApplContext ac, CssExpression expression, boolean check)
+			throws InvalidParamException {
+		throw new InvalidParamException("value",
+				expression.getValue().toString(),
+				getPropertyName(), ac);
+	}
+
+	public CssMask(ApplContext ac, CssExpression expression)
+			throws InvalidParamException {
+		this(ac, expression, false);
+	}
+
+	/**
+	 * Returns the value of this property
+	 */
+	public Object get() {
+		return value;
+	}
+
+
+	/**
+	 * Returns the name of this property
+	 */
+	public final String getPropertyName() {
+		return "mask";
+	}
+
+	/**
+	 * Returns true if this property is "softly" inherited
+	 * e.g. his value is equals to inherit
+	 */
+	public boolean isSoftlyInherited() {
+		return value.equals(inherit);
+	}
+
+	/**
+	 * Returns a string representation of the object.
+	 */
+	public String toString() {
+		return value.toString();
+	}
+
+	/**
+	 * Add this property to the CssStyle.
+	 *
+	 * @param style The CssStyle
+	 */
+	public void addToStyle(ApplContext ac, CssStyle style) {
+		SVGBasicStyle s = (SVGBasicStyle) style;
+		if (s.cssMask != null) {
+			style.addRedefinitionWarning(ac, this);
+		}
+		s.cssMask = this;
+	}
+
+
+	/**
+	 * Compares two properties for equality.
+	 *
+	 * @param property The other property.
+	 */
+	public boolean equals(CssProperty property) {
+		return (property instanceof CssMask &&
+				value.equals(((CssMask) property).value));
+	}
+
+
+	/**
+	 * Get this property in the style.
+	 *
+	 * @param style   The style where the property is
+	 * @param resolve if true, resolve the style to find this property
+	 */
+	public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+		if (resolve) {
+			return ((SVGBasicStyle) style).getMask();
+		} else {
+			return ((SVGBasicStyle) style).cssMask;
+		}
+	}
+}
+

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

@@ -0,0 +1,73 @@
+//
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2016.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.svg;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec http://www.w3.org/TR/2011/REC-SVG11-20110816/masking.html#MaskProperty
+ */
+public class CssMask extends org.w3c.css.properties.css.CssMask {
+
+	/**
+	 * Create a new CssKerning
+	 */
+	public CssMask() {
+		value = initial;
+	}
+
+	/**
+	 * Creates a new CssKerning
+	 *
+	 * @param expression The expression for this property
+	 * @throws org.w3c.css.util.InvalidParamException
+	 *          Expressions are incorrect
+	 */
+	public CssMask(ApplContext ac, CssExpression expression, boolean check)
+			throws InvalidParamException {
+		if (check && expression.getCount() > 1) {
+			throw new InvalidParamException("unrecognize", ac);
+		}
+		setByUser();
+
+		CssValue val;
+		char op;
+
+		val = expression.getValue();
+		op = expression.getOperator();
+
+		switch (val.getType()) {
+			case CssTypes.CSS_URL:
+				value = val;
+				break;
+			case CssTypes.CSS_IDENT:
+				if (inherit.equals(val)) {
+					value = inherit;
+					break;
+				}
+				if (none.equals(val)) {
+					value = none;
+					break;
+				}
+			default:
+				throw new InvalidParamException("value",
+						val.toString(),
+						getPropertyName(), ac);
+		}
+		expression.next();
+	}
+
+	public CssMask(ApplContext ac, CssExpression expression)
+			throws InvalidParamException {
+		this(ac, expression, false);
+	}
+
+}
+