@​font-face line-gap-override per https://www.w3.org/TR/2021/WD-css-f…

…onts-4-20210729/#descdef-font-face-line-gap-override

org/w3c/css/properties/css/fontface/CssLineGapOverride.java

@@ -0,0 +1,118 @@
+//
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2021.
+// Please first read the full copyright statement in file COPYRIGHT.html
+
+package org.w3c.css.properties.css.fontface;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
+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 CssLineGapOverride extends CssProperty {
+
+    public CssValue value;
+
+    /**
+     * Create a new CssLineGapOverride
+     */
+    public CssLineGapOverride() {
+    }
+
+    /**
+     * Creates a new CssLineGapOverride
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssLineGapOverride(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssLineGapOverride(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 "line-gap-override";
+    }
+
+    /**
+     * 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.fontFaceCssLineGapOverride != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.fontFaceCssLineGapOverride = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssLineGapOverride &&
+                value.equals(((CssLineGapOverride) 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).getFontFaceCssLineGapOverride();
+        } else {
+            return ((Css3Style) style).fontFaceCssLineGapOverride;
+        }
+    }
+}
+

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

@@ -307,6 +307,7 @@
 import org.w3c.css.properties.css.fontface.CssFontStretch;
 import org.w3c.css.properties.css.fontface.CssFontStyle;
 import org.w3c.css.properties.css.fontface.CssFontWeight;
+import org.w3c.css.properties.css.fontface.CssLineGapOverride;
 import org.w3c.css.properties.css.viewport.CssMaxZoom;
 import org.w3c.css.properties.css.viewport.CssMinZoom;
 import org.w3c.css.properties.css.viewport.CssOrientation;
@@ -590,6 +591,7 @@ public class Css3Style extends ATSCStyle {
     public CssFontNamedInstance fontFaceCssFontNamedInstance;
     public CssAscentOverride fontFaceCssAscentOverride;
     public CssDescentOverride fontFaceCssDescentOverride;
+    public CssLineGapOverride fontFaceCssLineGapOverride;
 
     public CssColorAdjust cssColorAdjust;
     public CssForcedColorAdjust cssForcedColorAdjust;
@@ -1309,7 +1311,16 @@ public CssDescentOverride getFontFaceCssDescentOverride() {
         }
         return fontFaceCssDescentOverride;
     }
-
+
+    public CssLineGapOverride getFontFaceCssLineGapOverride() {
+        if (fontFaceCssLineGapOverride == null) {
+            fontFaceCssLineGapOverride =
+                    (CssLineGapOverride) style.CascadingOrder(new CssLineGapOverride(),
+                            style, selector);
+        }
+        return fontFaceCssLineGapOverride;
+    }
+
     public CssFontNamedInstance getFontFaceCssFontNamedInstance() {
         if (fontFaceCssFontNamedInstance == null) {
             fontFaceCssFontNamedInstance =

org/w3c/css/properties/css3/fontface/CssLineGapOverride.java

@@ -0,0 +1,90 @@
+//
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2018.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3.fontface;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2021/WD-css-fonts-4-20210729/#descdef-font-face-line-gap-override
+ */
+public class CssLineGapOverride extends org.w3c.css.properties.css.fontface.CssLineGapOverride {
+
+    public static final CssIdent[] allowed_values;
+
+    static {
+        String[] _allowed_values = {"normal"};
+        allowed_values = new CssIdent[_allowed_values.length];
+        int i = 0;
+        for (String s : _allowed_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssLineGapOverride
+     */
+    public CssLineGapOverride() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssLineGapOverride
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssLineGapOverride(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        setByUser();
+
+        char op;
+        CssValue val;
+
+        val = expression.getValue();
+        op = expression.getOperator();
+
+        switch (val.getType()) {
+            case CssTypes.CSS_PERCENTAGE:
+                value = val;
+                break;
+            case CssTypes.CSS_IDENT:
+                if (getAllowedIdent(val.getIdent()) != null) {
+                    value = val;
+                    break;
+                }
+            default:
+                throw new InvalidParamException("value",
+                        val.toString(),
+                        getPropertyName(), ac);
+        }
+        expression.next();
+    }
+
+    public CssLineGapOverride(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+