more Css variable support

org/w3c/css/css/DocumentParser.java

@@ -51,7 +51,7 @@ public DocumentParser(ApplContext ac, Reader reader, String urlString, MimeType
             mediatype = MimeType.TEXT_CSS;
         }
         if (mediatype.match(MimeType.TEXT_CSS) == MimeType.MATCH_SPECIFIC_SUBTYPE) {
-            StyleSheetParser csshandler = new StyleSheetParser();
+            StyleSheetParser csshandler = new StyleSheetParser(ac);
             csshandler.parseStyleSheet(ac, reader, htmlURL);
             style = csshandler.getStyleSheet();
         } else if (mediatype.match(MimeType.TEXT_HTML) == MimeType.MATCH_SPECIFIC_SUBTYPE) {
@@ -88,7 +88,7 @@ public DocumentParser(ApplContext ac, String urlString) throws Exception {
 
         if (!"http".equals(urlProtocol) && !"https".equals(urlProtocol)) {
             if (urlLower.endsWith(".css")) {
-                StyleSheetParser parser = new StyleSheetParser();
+                StyleSheetParser parser = new StyleSheetParser(ac);
                 parser.parseURL(ac, htmlURL, null, null, media, StyleSheetOrigin.AUTHOR);
                 style = parser.getStyleSheet();
             } else if (urlLower.endsWith(".html") || urlLower.endsWith(".htm") ||
@@ -157,7 +157,7 @@ public DocumentParser(ApplContext ac, String urlString) throws Exception {
                         style.setType("text/html");
                     }
                 } else if (contentType.match(MimeType.TEXT_CSS) == MimeType.MATCH_SPECIFIC_SUBTYPE) {
-                    StyleSheetParser parser = new StyleSheetParser();
+                    StyleSheetParser parser = new StyleSheetParser(ac);
                     parser.parseURL(ac, htmlURL, null, null, media, StyleSheetOrigin.AUTHOR);
                     style = parser.getStyleSheet();
                 } else if ((contentType.match(MimeType.TEXT_XML) == MimeType.MATCH_SPECIFIC_SUBTYPE)

org/w3c/css/css/HTMLParserStyleSheetHandler.java

@@ -68,7 +68,7 @@ public class HTMLParserStyleSheetHandler implements ContentHandler, LexicalHandl
     boolean isHTML5;
 
     //  StyleSheet styleSheet = new StyleSheet();
-    StyleSheetParser styleSheetParser = new StyleSheetParser();
+    StyleSheetParser styleSheetParser = null;
 
     boolean inStyle = false;
     String media = null;
@@ -88,6 +88,7 @@ public HTMLParserStyleSheetHandler(URL baseURI, ApplContext ac) {
         this.documentURI = baseURI;
         this.baseURI = baseURI;
         this.ac = ac;
+        this.styleSheetParser = new StyleSheetParser(ac);
     }
 
     public void setDocumentLocator(Locator locator) {

org/w3c/css/css/StyleSheet.java

@@ -11,6 +11,7 @@
 import org.w3c.css.parser.CssSelectors;
 import org.w3c.css.parser.CssStyle;
 import org.w3c.css.parser.Errors;
+import org.w3c.css.properties.css.CssCustomProperty;
 import org.w3c.css.properties.css.CssProperty;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.Util;
@@ -37,16 +38,18 @@ public class StyleSheet {
     private boolean doNotAddRule;
     private boolean doNotAddAtRule;
     private static final boolean debug = false;
+    private HashMap<String, CssCustomProperty> customProperties;
 
     /**
      * Create a new StyleSheet.
      */
     public StyleSheet() {
-        rules = new HashMap<String, CssSelectors>();
+        rules = new HashMap<>();
         errors = new Errors();
         warnings = new Warnings();
         cascading = new CssCascadingOrder();
-        atRuleList = new ArrayList<CssRuleList>();
+        atRuleList = new ArrayList<>();
+        customProperties = new HashMap<>();
     }
 
     public void setWarningLevel(int warningLevel) {
@@ -94,6 +97,23 @@ public void addProperty(CssSelectors selector, CssProperty property) {
         getContext(selector).addProperty(property, warnings);
     }
 
+    /**
+     * lookup a custom property
+     * @param s, the name of the property
+     * @return a CssCustomProperty or null if not found
+     */
+    public CssCustomProperty getCustomProperty(String s) {
+        return customProperties.get(s);
+    }
+
+    // we are not adding custom property in addProperty, as we want to be
+    public CssCustomProperty addCustomProperty(String s, CssCustomProperty p, boolean force) {
+        if (force) {
+            return customProperties.put(s, p);
+        }
+        return customProperties.putIfAbsent(s, p);
+    }
+
     public void remove(CssSelectors selector) {
         rules.remove(selector);
     }

org/w3c/css/css/StyleSheetParser.java

@@ -61,6 +61,10 @@ public final class StyleSheetParser
     CssFouffa cssFouffa;
     StyleSheet style = new StyleSheet();
 
+    public StyleSheetParser(ApplContext ac) {
+        ac.setStyleSheet(getStyleSheet());
+    }
+
     public void reInit() {
         style = new StyleSheet();
     }

org/w3c/css/css/TagSoupStyleSheetHandler.java

@@ -64,8 +64,7 @@ public class TagSoupStyleSheetHandler implements ContentHandler, LexicalHandler,
     URL documentURI = null;
     URL baseURI = null;
 
-    //  StyleSheet styleSheet = new StyleSheet();
-    StyleSheetParser styleSheetParser = new StyleSheetParser();
+    StyleSheetParser styleSheetParser = null;
 
     boolean inStyle = false;
     String media = null;
@@ -85,6 +84,7 @@ public TagSoupStyleSheetHandler(URL baseURI, ApplContext ac) {
         this.documentURI = baseURI;
         this.baseURI = baseURI;
         this.ac = ac;
+        this.styleSheetParser = new StyleSheetParser(ac);
     }
 
     public void setDocumentLocator(Locator locator) {

org/w3c/css/css/XMLStyleSheetHandler.java

@@ -67,7 +67,7 @@ public class XMLStyleSheetHandler implements ContentHandler, LexicalHandler,
     URL baseURI = null;
 
     // StyleSheet styleSheet = new StyleSheet();
-    StyleSheetParser styleSheetParser = new StyleSheetParser();
+    StyleSheetParser styleSheetParser = null;
 
     boolean inStyle = false;
 
@@ -90,6 +90,7 @@ public XMLStyleSheetHandler(URL baseURI, ApplContext ac) {
         this.documentURI = baseURI;
         this.baseURI = baseURI;
         this.ac = ac;
+        this.styleSheetParser = new StyleSheetParser(ac);
     }
 
     public void setDocumentLocator(Locator locator) {

org/w3c/css/parser/analyzer/CssParser.java

@@ -429,10 +429,14 @@ private void setValue(CssValue v, CssExpression expr,
 
             if (n.kind == CssParserConstants.IDENT) {
                 String s = convertIdent(val);
-            if ('-' == s.charAt(0)) {
-                expr.markVendorExtension();
-            }
-                    v.set(convertIdent(val), ac);
+                if ('-' == s.charAt(0)) {
+                        expr.markVendorExtension();
+                }
+                if (v.getRawType() == CssTypes.CSS_IDENT) {
+                        v = CssIdent.getIdent(s); // might be in the setValue call
+                } else {
+                        v.set(s, ac);
+                }
             } else if (n.kind == CssParserConstants.STRING) {
                     v.set(val, ac);
             } else {
@@ -7940,14 +7944,6 @@ private boolean jj_2_15(int xla)
     finally { jj_save(14, xla); }
   }
 
-  private boolean jj_3R_320()
- {
-    if (jj_3R_195()) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(NUMBER)) return true;
-    return false;
-  }
-
   private boolean jj_3R_205()
  {
     if (jj_3R_222()) return true;
@@ -9663,6 +9659,14 @@ private boolean jj_3R_292()
     return false;
   }
 
+  private boolean jj_3R_320()
+ {
+    if (jj_3R_195()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(NUMBER)) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public CssParserTokenManager token_source;
   SimpleCharStream jj_input_stream;

org/w3c/css/parser/analyzer/CssParser.jj

@@ -448,10 +448,14 @@ public abstract class CssParser {
 
 	    if (n.kind == CssParserConstants.IDENT) {
 	        String s = convertIdent(val);
-            if ('-' == s.charAt(0)) {
-                expr.markVendorExtension();
-            }
-		    v.set(convertIdent(val), ac);
+		if ('-' == s.charAt(0)) {
+			expr.markVendorExtension();
+		}
+		if (v.getRawType() == CssTypes.CSS_IDENT) {
+			v = CssIdent.getIdent(s); // might be in the setValue call
+		} else {
+			v.set(s, ac);
+		}
 	    } else if (n.kind == CssParserConstants.STRING) {
 		    v.set(val, ac);
 	    } else {

org/w3c/css/properties/CSS3Properties.properties

@@ -12,16 +12,22 @@ font-feature-settings:                  org.w3c.css.properties.css3.CssFontFeatu
 font-kerning:                           org.w3c.css.properties.css3.CssFontKerning
 font-language-override:                 org.w3c.css.properties.css3.CssFontLanguageOverride
 font-synthesis:                         org.w3c.css.properties.css3.CssFontSynthesis
+font-synthesis-small-caps:              org.w3c.css.properties.css3.CssFontSynthesisSmallCaps
+font-synthesis-style:                   org.w3c.css.properties.css3.CssFontSynthesisStyle
+font-synthesis-weight:                  org.w3c.css.properties.css3.CssFontSynthesisWeight
 font-variant-caps:                      org.w3c.css.properties.css3.CssFontVariantCaps
 font-variant-position:                  org.w3c.css.properties.css3.CssFontVariantPosition
 font-variant-east-asian:                org.w3c.css.properties.css3.CssFontVariantEastAsian
+font-variant-emoji:                     org.w3c.css.properties.css3.CssFontVariantEmoji
 font-variant-ligatures:                 org.w3c.css.properties.css3.CssFontVariantLigatures
 font-variant-numeric:                   org.w3c.css.properties.css3.CssFontVariantNumeric
 font-variant-alternates:                org.w3c.css.properties.css3.CssFontVariantAlternates
+font-variation-settings:                org.w3c.css.properties.css3.CssFontVariationSettings
 
 color:                                  org.w3c.css.properties.css3.CssColor
 
 color-adjust:                           org.w3c.css.properties.css3.CssColorAdjust
+print-color-adjust:                     org.w3c.css.properties.css3.CssPrintColorAdjust
 forced-color-adjust:                    org.w3c.css.properties.css3.CssForcedColorAdjust
 color-scheme:                           org.w3c.css.properties.css3.CssColorScheme
 
@@ -449,12 +455,13 @@ handheld.background-clip:               org.w3c.css.properties.css3.CssBackgroun
 
 # CSS Inline
 baseline-shift:                         org.w3c.css.properties.css3.CssBaselineShift
+baseline-source:                        org.w3c.css.properties.css3.CssBaselineSource
 dominant-baseline:                      org.w3c.css.properties.css3.CssDominantBaseline
 alignment-baseline:                     org.w3c.css.properties.css3.CssAlignmentBaseline
 initial-letter:                         org.w3c.css.properties.css3.CssInitialLetter
 initial-letter-align:                   org.w3c.css.properties.css3.CssInitialLetterAlign
 initial-letter-wrap:                    org.w3c.css.properties.css3.CssInitialLetterWrap
-
+inline-sizing:                          org.w3c.css.properties.css3.CssInlineSizing
 
 # CSS Multi-column Layout Module
 # http://www.w3.org/TR/css3-multicol/

org/w3c/css/properties/CSS3SVGProperties.properties

@@ -58,5 +58,5 @@ enable-background:                      org.w3c.css.properties.svg.CssEnableBack
 baseline-shift:                         org.w3c.css.properties.svg.CssBaselineShift
 dominant-baseline:                      org.w3c.css.properties.svg.CssDominantBaseline
 
-# The SVG version handle SVG and CSS3+SVG
-alignment-baseline:                     org.w3c.css.properties.svg.CssAlignmentBaseline
+# The CSS3 version handle CSS3+SVG
+alignment-baseline:                     org.w3c.css.properties.css3.CssAlignmentBaseline

org/w3c/css/properties/css/CssBaselineSource.java

@@ -0,0 +1,113 @@
+//
+// 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;
+
+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;
+
+/**
+ * @since CSS3
+ */
+public class CssBaselineSource extends CssProperty {
+
+    /**
+     * Create a new CssBaselineSource
+     */
+    public CssBaselineSource() {
+    }
+
+    /**
+     * Creates a new CssBaselineSource
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssBaselineSource(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssBaselineSource(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 "baseline-source";
+    }
+
+    /**
+     * 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.cssBaselineSource != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssBaselineSource = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssBaselineSource &&
+                value.equals(((CssBaselineSource) 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).getBaselineSource();
+        } else {
+            return ((Css3Style) style).cssBaselineSource;
+        }
+    }
+}
+

org/w3c/css/properties/css/CssColumnRule.java

@@ -22,9 +22,9 @@ public class CssColumnRule extends CssProperty {
 
     private static final String propertyName = "column-rule";
 
-    CssColumnRuleWidth rule_width;
-    CssColumnRuleStyle rule_style;
-    CssColumnRuleColor rule_color;
+    public CssColumnRuleWidth rule_width;
+    public CssColumnRuleStyle rule_style;
+    public CssColumnRuleColor rule_color;
 
     /**
      * Create a new CssColumnRule
@@ -109,7 +109,6 @@ public Object get() {
      * Returns a string representation of the object
      */
     public String toString() {
-
         return value.toString();
     }
 }