rewrote dominant-baseline per http://www.w3.org/TR/2015/WD-css-inline-3-20150917/#dominant-baseline-property

Author: ylafon

org/w3c/css/properties/CSS3Properties.properties

@@ -257,14 +257,14 @@ ruby-position:                          org.w3c.css.properties.css3.CssRubyPosit
 ruby-align:                             org.w3c.css.properties.css3.CssRubyAlign
 ruby-overhang:                          org.w3c.css.properties.css3.CssRubyOverhang
 writing-mode:                           org.w3c.css.properties.css3.CssWritingMode
-dominant-baseline:                      org.w3c.css.properties.css3.CssDominantBaseLine
 alignment-baseline:                     org.w3c.css.properties.css3.CssAlignmentBaseLine
 alignment-adjust:                       org.w3c.css.properties.css3.CssAlignmentAdjust
 fit:                                    org.w3c.css.properties.css3.CssFit
 handheld.background-clip:               org.w3c.css.properties.css3.CssBackgroundClip
 
 # CSS Inline
 baseline-shift:                         org.w3c.css.properties.css3.CssBaselineShift
+dominant-baseline:                      org.w3c.css.properties.css3.CssDominantBaseline
 
 # CSS Multi-column Layout Module
 # http://www.w3.org/TR/css3-multicol/

org/w3c/css/properties/css/CssDominantBaseline.java

@@ -0,0 +1,115 @@
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2015.
+// 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.css3.Css3Style;
+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 CSS3
+ */
+public class CssDominantBaseline extends CssProperty {
+
+	public CssValue value;
+
+	/**
+	 * Create a new CssDominantBaseline
+	 */
+	public CssDominantBaseline() {
+	}
+
+	/**
+	 * Creates a new CssDominantBaseline
+	 *
+	 * @param expression The expression for this property
+	 * @throws org.w3c.css.util.InvalidParamException
+	 *          Expressions are incorrect
+	 */
+	public CssDominantBaseline(ApplContext ac, CssExpression expression, boolean check)
+			throws InvalidParamException {
+		throw new InvalidParamException("value",
+				expression.getValue().toString(),
+				getPropertyName(), ac);
+	}
+
+	public CssDominantBaseline(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 "dominant-baseline";
+	}
+
+	/**
+	 * 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) {
+		Css3Style s = (Css3Style) style;
+		if (s.cssDominantBaseline != null) {
+			style.addRedefinitionWarning(ac, this);
+		}
+		s.cssDominantBaseline = this;
+	}
+
+
+	/**
+	 * Compares two properties for equality.
+	 *
+	 * @param property The other property.
+	 */
+	public boolean equals(CssProperty property) {
+		return (property instanceof CssDominantBaseline &&
+				value.equals(((CssDominantBaseline) 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 ((Css3Style) style).getDominantBaseline();
+		} else {
+			return ((Css3Style) style).cssDominantBaseline;
+		}
+	}
+}
+

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

@@ -45,6 +45,7 @@
 import org.w3c.css.properties.css.CssColumnSpan;
 import org.w3c.css.properties.css.CssColumnWidth;
 import org.w3c.css.properties.css.CssColumns;
+import org.w3c.css.properties.css.CssDominantBaseline;
 import org.w3c.css.properties.css.CssFilter;
 import org.w3c.css.properties.css.CssFlex;
 import org.w3c.css.properties.css.CssFlexBasis;
@@ -153,10 +154,10 @@ public class Css3Style extends ATSCStyle {
 	CssWritingMode cssWritingMode;
 	CssGlyphOrVert cssGlyphOrVert;
 	CssGlyphHor cssGlyphHor;
-	CssDominantBaseLine cssDominantBaseLine;
 	CssAlignmentBaseLine cssAlignmentBaseLine;
 	CssAlignmentAdjust cssAlignmentAdjust;
 	public CssBaselineShift cssBaselineShift;
+	public CssDominantBaseline cssDominantBaseline;
 	CssFit cssFit;
 
 	public CssOpacity cssOpacity;
@@ -399,13 +400,13 @@ public CssTextAlignLast getTextAlignLast() {
 		return cssTextAlignLast;
 	}
 
-	public CssDominantBaseLine getDominantBaseLine() {
-		if (cssDominantBaseLine == null) {
-			cssDominantBaseLine =
-					(CssDominantBaseLine) style.CascadingOrder(
-							new CssDominantBaseLine(), style, selector);
+	public CssDominantBaseline getDominantBaseline() {
+		if (cssDominantBaseline == null) {
+			cssDominantBaseline =
+					(CssDominantBaseline) style.CascadingOrder(
+							new CssDominantBaseline(), style, selector);
 		}
-		return cssDominantBaseLine;
+		return cssDominantBaseline;
 	}
 
 	public CssAlignmentBaseLine getAlignmentBaseLine() {