Custom properties, conditional and property rules, CSS-wide keywords,…

… calc() and attr()
css4j · Oct 8, 2024 · 3788c12 · 3788c12
1 parent 06d8671
commit 3788c12
Show file tree

Hide file tree

Showing 159 changed files with 5,357 additions and 1,089 deletions.
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
@@ -49,6 +49,7 @@
   <suppress files="Test\.java$" checks="LineLength"/>
 
   <!-- Header -->
+  <suppress files="[\\/]PropertyDefinition\.java$" checks="RegexpHeader"/>
   <suppress files="[\\/]NodeXBL\.java$" checks="RegexpHeader"/>
   <suppress files="[\\/]OriginalEvent\.java$" checks="RegexpHeader"/>
   <suppress files="[\\/]ShadowTreeEvent\.java$" checks="RegexpHeader"/>

diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/AbstractSVGLength.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/AbstractSVGLength.java
@@ -242,12 +242,9 @@ public Element getElement() {
 			return getAssociatedElement();
 		}
 
-		/**
-		 * Returns the size of a px CSS unit in millimeters.
-		 */
 		@Override
-		public float getPixelUnitToMillimeter() {
-			return getAssociatedElement().getSVGContext().getPixelUnitToMillimeter();
+		public float getResolution() {
+			return getAssociatedElement().getSVGContext().getResolution();
 		}
 
 		/**

diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMAnimatedRect.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMAnimatedRect.java
@@ -18,17 +18,17 @@
  */
 package io.sf.carte.echosvg.anim.dom;
 
+import org.w3c.css.om.unit.CSSUnit;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.svg.SVGAnimatedRect;
 import org.w3c.dom.svg.SVGRect;
 
-import io.sf.carte.doc.style.css.CSSUnit;
+import io.sf.carte.doc.style.css.CSSExpressionValue;
+import io.sf.carte.doc.style.css.CSSTypedValue;
 import io.sf.carte.doc.style.css.CSSValue.CssType;
 import io.sf.carte.doc.style.css.property.Evaluator;
-import io.sf.carte.doc.style.css.property.ExpressionValue;
 import io.sf.carte.doc.style.css.property.StyleValue;
-import io.sf.carte.doc.style.css.property.TypedValue;
 import io.sf.carte.doc.style.css.property.ValueFactory;
 import io.sf.carte.doc.style.css.property.ValueList;
 import io.sf.carte.echosvg.anim.values.AnimatableRectValue;
@@ -286,16 +286,16 @@ private boolean computeRectangle(StyleValue value, float[] numbers) throws DOMEx
 				if (item.getCssValueType() != CssType.TYPED) {
 					return false;
 				}
-				TypedValue typed = (TypedValue) item;
+				CSSTypedValue typed = (CSSTypedValue) item;
 				switch (item.getPrimitiveType()) {
 				case NUMERIC:
 					if (typed.getUnitType() != CSSUnit.CSS_NUMBER) {
 						return false;
 					}
 					break;
 				case EXPRESSION:
-					Evaluator eval = new Evaluator();
-					typed = eval.evaluateExpression((ExpressionValue) typed);
+					Evaluator eval = new Evaluator(CSSUnit.CSS_NUMBER);
+					typed = eval.evaluateExpression((CSSExpressionValue) typed);
 					if (typed.getUnitType() != CSSUnit.CSS_NUMBER) {
 						return false;
 					}

diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMElement.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMElement.java
@@ -877,12 +877,9 @@ public Element getElement() {
 			return SVGOMElement.this;
 		}
 
-		/**
-		 * Returns the size of a px CSS unit in millimeters.
-		 */
 		@Override
-		public float getPixelUnitToMillimeter() {
-			return getSVGContext().getPixelUnitToMillimeter();
+		public float getResolution() {
+			return getSVGContext().getResolution();
 		}
 
 		/**

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/AbstractGraphicsNodeBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/AbstractGraphicsNodeBridge.java
@@ -490,12 +490,9 @@ protected void fireBBoxChangeEvent() {
 
 	// SVGContext implementation ///////////////////////////////////////////
 
-	/**
-	 * Returns the size of a px CSS unit in millimeters.
-	 */
 	@Override
-	public float getPixelUnitToMillimeter() {
-		return ctx.getUserAgent().getPixelUnitToMillimeter();
+	public float getResolution() {
+		return ctx.getUserAgent().getResolution();
 	}
 
 	protected SoftReference<Shape> bboxShape = null;

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/AnimatableGenericSVGBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/AnimatableGenericSVGBridge.java
@@ -59,12 +59,9 @@ public void handleElement(BridgeContext ctx, Element e) {
 
 	// SVGContext ////////////////////////////////////////////////////////////
 
-	/**
-	 * Returns the size of a px CSS unit in millimeters.
-	 */
 	@Override
-	public float getPixelUnitToMillimeter() {
-		return ctx.getUserAgent().getPixelUnitToMillimeter();
+	public float getResolution() {
+		return ctx.getUserAgent().getResolution();
 	}
 
 	/**

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/BridgeContext.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/BridgeContext.java
@@ -70,8 +70,8 @@
 import io.sf.carte.echosvg.dom.events.NodeEventTarget;
 import io.sf.carte.echosvg.dom.svg.SVGContext;
 import io.sf.carte.echosvg.dom.xbl.XBLManager;
-import io.sf.carte.echosvg.ext.awt.color.StandardColorSpaces;
 import io.sf.carte.echosvg.ext.awt.color.ColorContext;
+import io.sf.carte.echosvg.ext.awt.color.StandardColorSpaces;
 import io.sf.carte.echosvg.gvt.CompositeGraphicsNode;
 import io.sf.carte.echosvg.gvt.GraphicsNode;
 import io.sf.carte.echosvg.script.Interpreter;
@@ -1830,12 +1830,23 @@ public float getBolderFontWeight(float f) {
 
 	/**
 	 * Returns the size of a px CSS unit in millimeters.
+	 * 
+	 * @deprecated Use {@link #getResolution()}.
 	 */
+	@Deprecated
 	@Override
 	public float getPixelUnitToMillimeter() {
 		return userAgent.getPixelUnitToMillimeter();
 	}
 
+	/**
+	 * Returns the resolution in dpi.
+	 */
+	@Override
+	public float getResolution() {
+		return userAgent.getResolution();
+	}
+
 	/**
 	 * Returns the medium font size.
 	 */
@@ -1877,6 +1888,14 @@ public void checkLoadExternalResource(ParsedURL resourceURL, ParsedURL docURL) t
 		userAgent.checkLoadExternalResource(resourceURL, docURL);
 	}
 
+	/**
+	 * Get prefers-color-scheme.
+	 */
+	@Override
+	public String getPrefersColorScheme() {
+		return userAgent.getPrefersColorScheme();
+	}
+
 	/**
 	 * Tells whether the given SVG document is dynamic.
 	 */

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSFontFace.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSFontFace.java
@@ -21,8 +21,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import io.sf.carte.echosvg.css.dom.CSSValue.CssType;
-import io.sf.carte.echosvg.css.dom.CSSValue.Type;
+import io.sf.carte.doc.style.css.CSSValue.CssType;
+import io.sf.carte.doc.style.css.CSSValue.Type;
 import io.sf.carte.echosvg.css.engine.CSSEngine;
 import io.sf.carte.echosvg.css.engine.FontFaceRule;
 import io.sf.carte.echosvg.css.engine.SVGCSSEngine;

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSUtilities.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSUtilities.java
@@ -28,10 +28,10 @@
 
 import org.w3c.dom.Element;
 
+import io.sf.carte.doc.style.css.CSSValue.CssType;
+import io.sf.carte.doc.style.css.CSSValue.Type;
 import io.sf.carte.echosvg.anim.dom.SVGOMDocument;
 import io.sf.carte.echosvg.constants.XMLConstants;
-import io.sf.carte.echosvg.css.dom.CSSValue.CssType;
-import io.sf.carte.echosvg.css.dom.CSSValue.Type;
 import io.sf.carte.echosvg.css.engine.CSSEngine;
 import io.sf.carte.echosvg.css.engine.CSSStylableElement;
 import io.sf.carte.echosvg.css.engine.SVGCSSEngine;

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CursorManager.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CursorManager.java
@@ -40,8 +40,8 @@
 import org.w3c.dom.svg.SVGDocument;
 import org.w3c.dom.svg.SVGPreserveAspectRatio;
 
-import io.sf.carte.echosvg.css.dom.CSSValue.CssType;
-import io.sf.carte.echosvg.css.dom.CSSValue.Type;
+import io.sf.carte.doc.style.css.CSSValue.CssType;
+import io.sf.carte.doc.style.css.CSSValue.Type;
 import io.sf.carte.echosvg.css.engine.SVGCSSEngine;
 import io.sf.carte.echosvg.css.engine.value.Value;
 import io.sf.carte.echosvg.dom.AbstractNode;

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/PaintServer.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/PaintServer.java
@@ -32,8 +32,8 @@
 import org.w3c.css.om.unit.CSSUnit;
 import org.w3c.dom.Element;
 
-import io.sf.carte.echosvg.css.dom.CSSValue.CssType;
-import io.sf.carte.echosvg.css.dom.CSSValue.Type;
+import io.sf.carte.doc.style.css.CSSValue.CssType;
+import io.sf.carte.doc.style.css.CSSValue.Type;
 import io.sf.carte.echosvg.css.engine.SVGCSSEngine;
 import io.sf.carte.echosvg.css.engine.value.ColorFunction;
 import io.sf.carte.echosvg.css.engine.value.ColorValue;
@@ -305,7 +305,8 @@ public static Paint convertPaint(Element paintedElement, GraphicsNode paintedNod
 				break;
 			}
 		}
-		throw new IllegalArgumentException("Paint argument is not an appropriate CSS value");
+		throw new IllegalArgumentException(
+				"Paint argument is not an appropriate CSS value (" + paintDef.getCssText() + ").");
 	}
 
 	/**
@@ -652,7 +653,7 @@ private static Color convert3Color(ColorSpace space, ColorFunction c, float opac
 	 */
 	private static float resolveColorComponent(NumericValue item) {
 		float f;
-		switch (item.getCSSUnit()) {
+		switch (item.getUnitType()) {
 		case CSSUnit.CSS_NUMBER:
 			f = item.getFloatValue();
 			if (f < 0f) {
@@ -831,7 +832,7 @@ public static int convertStrokeLinejoin(Value v) {
 	 */
 	private static float resolveAlphaComponent(Value v) {
 		float f;
-		switch (v.getCSSUnit()) {
+		switch (v.getUnitType()) {
 		case CSSUnit.CSS_PERCENTAGE:
 			f = v.getFloatValue();
 			f = (f > 100f) ? 100f : (f < 0f) ? 0f : f;

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationElementBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationElementBridge.java
@@ -386,12 +386,9 @@ public void dispose() {
 
 	// SVGContext ///////////////////////////////////////////////////////////
 
-	/**
-	 * Returns the size of a px CSS unit in millimeters.
-	 */
 	@Override
-	public float getPixelUnitToMillimeter() {
-		return ctx.getUserAgent().getPixelUnitToMillimeter();
+	public float getResolution() {
+		return ctx.getUserAgent().getResolution();
 	}
 
 	@Override

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java
@@ -38,6 +38,8 @@
 import org.w3c.dom.svg.SVGLength;
 import org.w3c.dom.svg.SVGPreserveAspectRatio;
 
+import io.sf.carte.doc.style.css.CSSValue.CssType;
+import io.sf.carte.doc.style.css.CSSValue.Type;
 import io.sf.carte.doc.style.css.property.NumberValue;
 import io.sf.carte.echosvg.anim.AnimationEngine;
 import io.sf.carte.echosvg.anim.AnimationException;
@@ -67,8 +69,6 @@
 import io.sf.carte.echosvg.anim.values.AnimatableStringValue;
 import io.sf.carte.echosvg.anim.values.AnimatableValue;
 import io.sf.carte.echosvg.constants.XMLConstants;
-import io.sf.carte.echosvg.css.dom.CSSValue.CssType;
-import io.sf.carte.echosvg.css.dom.CSSValue.Type;
 import io.sf.carte.echosvg.css.engine.CSSEngine;
 import io.sf.carte.echosvg.css.engine.CSSStylableElement;
 import io.sf.carte.echosvg.css.engine.StyleMap;
@@ -1203,7 +1203,7 @@ public AnimatableValue createValue(AnimationTarget target, String ns, String ln,
 		 */
 		@Override
 		public AnimatableValue createValue(AnimationTarget target, String pn, Value v) {
-			switch (v.getCSSUnit()) {
+			switch (v.getUnitType()) {
 			case CSSUnit.CSS_PERCENTAGE:
 				return new AnimatableNumberOrPercentageValue(target, v.getFloatValue(), true);
 			case CSSUnit.CSS_NUMBER:
@@ -1767,7 +1767,7 @@ protected AnimatableValue createAnimatableValue(AnimationTarget target, String p
 				return new AnimatableLengthOrIdentValue(target, v.getIdentifierValue());
 			}
 			short pcInterp = target.getPercentageInterpretation(null, pn, true);
-			return new AnimatableLengthOrIdentValue(target, v.getCSSUnit(), v.getFloatValue(), pcInterp);
+			return new AnimatableLengthOrIdentValue(target, v.getUnitType(), v.getFloatValue(), pcInterp);
 		}
 
 	}
@@ -1805,7 +1805,7 @@ protected class AnimatableAngleValueFactory extends CSSValueFactory {
 		@Override
 		protected AnimatableValue createAnimatableValue(AnimationTarget target, String pn, Value v) {
 			short unit;
-			switch (v.getCSSUnit()) {
+			switch (v.getUnitType()) {
 			case CSSUnit.CSS_NUMBER:
 			case CSSUnit.CSS_DEG:
 				unit = SVGAngle.SVG_ANGLETYPE_DEG;
@@ -1818,7 +1818,7 @@ protected AnimatableValue createAnimatableValue(AnimationTarget target, String p
 				break;
 			default:
 				try {
-					float f = NumberValue.floatValueConversion(v.getFloatValue(), v.getCSSUnit(),
+					float f = NumberValue.floatValueConversion(v.getFloatValue(), v.getUnitType(),
 							CSSUnit.CSS_DEG);
 					return new AnimatableAngleOrIdentValue(target, f, SVGAngle.SVG_ANGLETYPE_DEG);
 				} catch (DOMException e) {
@@ -1842,7 +1842,7 @@ protected AnimatableValue createAnimatableValue(AnimationTarget target, String p
 				return new AnimatableAngleOrIdentValue(target, v.getIdentifierValue());
 			}
 			short unit;
-			switch (v.getCSSUnit()) {
+			switch (v.getUnitType()) {
 			case CSSUnit.CSS_NUMBER:
 			case CSSUnit.CSS_DEG:
 				unit = SVGAngle.SVG_ANGLETYPE_DEG;
@@ -1855,7 +1855,7 @@ protected AnimatableValue createAnimatableValue(AnimationTarget target, String p
 				break;
 			default:
 				try {
-					float f = NumberValue.floatValueConversion(v.getFloatValue(), v.getCSSUnit(),
+					float f = NumberValue.floatValueConversion(v.getFloatValue(), v.getUnitType(),
 							CSSUnit.CSS_DEG);
 					return new AnimatableAngleOrIdentValue(target, f, SVGAngle.SVG_ANGLETYPE_DEG);
 				} catch (DOMException e) {

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGDescriptiveElementBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGDescriptiveElementBridge.java
@@ -117,12 +117,9 @@ public void handleOtherAnimationChanged(String type) {
 
 	// SVGContext implementation ///////////////////////////////////////////
 
-	/**
-	 * Returns the size of a px CSS unit in millimeters.
-	 */
 	@Override
-	public float getPixelUnitToMillimeter() {
-		return theCtx.getUserAgent().getPixelUnitToMillimeter();
+	public float getResolution() {
+		return theCtx.getUserAgent().getResolution();
 	}
 
 	@Override

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGDocumentBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGDocumentBridge.java
@@ -203,12 +203,9 @@ public void dispose() {
 
 	// SVGContext //////////////////////////////////////////////////////////
 
-	/**
-	 * Returns the size of a px CSS unit in millimeters.
-	 */
 	@Override
-	public float getPixelUnitToMillimeter() {
-		return ctx.getUserAgent().getPixelUnitToMillimeter();
+	public float getResolution() {
+		return ctx.getUserAgent().getResolution();
 	}
 
 	@Override