Merge pull request #497 from w3c/layer

@​layer support

Author: ylafon

org/w3c/css/atrules/css/AtRuleImport.java

@@ -21,6 +21,7 @@ public class AtRuleImport extends AtRule {
 
     boolean is_url = false;
     String linkname = null;
+    AtRuleLayer layer = null;
     AtRuleMedia media = null;
 
     public String keyword() {
@@ -64,6 +65,10 @@ public String toString() {
             ret.append(linkname);
             ret.append('\"');
         }
+        if (layer != null) {
+            ret.append(' ');
+            ret.append(layer.getNameString());
+        }
         if (media != null && !media.isEmpty()) {
             ret.append(' ');
             ret.append(media.getValueString());
@@ -72,10 +77,12 @@ public String toString() {
         return ret.toString();
     }
 
-    public AtRuleImport(String linkname, boolean is_url, AtRuleMedia media) {
-        this.media = media;
+    public AtRuleImport(String linkname, boolean is_url,
+                        AtRuleLayer layer, AtRuleMedia media) {
         this.linkname = linkname;
         this.is_url = is_url;
+        this.layer = layer;
+        this.media = media;
     }
 
 	public String getLinkname() {

org/w3c/css/atrules/css/AtRuleLayer.java

@@ -0,0 +1,96 @@
+//
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT W3C, 2025.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.atrules.css;
+
+import org.w3c.css.parser.AtRule;
+
+import java.util.ArrayList;
+
+public class AtRuleLayer extends AtRule {
+
+    String name = null;
+    ArrayList<String> layernames = null;
+
+    public String keyword() {
+        return "layer";
+    }
+
+    public boolean isEmpty() {
+        return false;
+    }
+
+    /**
+     * The second must be exactly the same of this one
+     */
+    public boolean canApply(AtRule atRule) {
+        return false;
+    }
+
+    /**
+     * The second must only match this one
+     */
+    public boolean canMatch(AtRule atRule) {
+        return false;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void addLayerName(String name) {
+        if (layernames == null) {
+            layernames = new ArrayList<>();
+        }
+        layernames.add(name);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        StringBuilder ret = new StringBuilder();
+
+        ret.append('@');
+        ret.append(keyword());
+        ret.append(' ');
+        if (name != null) {
+            ret.append(name);
+        } else if (layernames != null) {
+            boolean first = true;
+            for (String layer_name : layernames) {
+                if (!first) {
+                    ret.append(", ");
+                } else {
+                    first = false;
+                }
+                ret.append(layer_name);
+            }
+        }
+        return ret.toString();
+    }
+
+    public String getNameString() {
+        StringBuilder ret = new StringBuilder();
+        if (name != null) {
+            return "layer";
+        } else {
+            ret.append("layer(").append(name).append(")");
+            return ret.toString();
+        }
+    }
+
+    public String lookupPrefix() {
+        return "";
+    }
+
+    public AtRuleLayer(String name) {
+        this.name = name;
+    }
+
+    public AtRuleLayer() {
+    }
+}
+

org/w3c/css/parser/CssFouffa.java

@@ -11,6 +11,7 @@
 package org.w3c.css.parser;
 
 import org.w3c.css.atrules.css.AtRuleImport;
+import org.w3c.css.atrules.css.AtRuleLayer;
 import org.w3c.css.atrules.css.AtRuleMedia;
 import org.w3c.css.atrules.css.AtRuleNamespace;
 import org.w3c.css.atrules.css.media.MediaFeature;
@@ -422,9 +423,9 @@ public void handleNamespaceDeclaration(URL url, String prefix,
      * @param file the file name in the import statement
      */
     public void handleImport(URL url, String file, boolean is_url,
-                             AtRuleMedia media) {
+                             AtRuleLayer layer, AtRuleMedia media) {
         // CssError cssError = null;
-        AtRuleImport importrule = new AtRuleImport(file, is_url, media);
+        AtRuleImport importrule = new AtRuleImport(file, is_url, layer, media);
         newAtRule(importrule);
         endOfAtRule();